From 0d9b6c788a591e2c3cf37d9bb98e8b1a550784f9 Mon Sep 17 00:00:00 2001
From: hecht <hecht@9a2b23b2-43f4-4935-bed2-871a584d7cab>
Date: Sat, 23 Sep 2017 13:35:16 +0000
Subject: [PATCH] minor fixes on npcs

---
 ag/gm/include/npc.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ag/gm/include/npc.inc.php b/ag/gm/include/npc.inc.php
index 5f1e72e..c419511 100644
--- a/ag/gm/include/npc.inc.php
+++ b/ag/gm/include/npc.inc.php
@@ -148,7 +148,7 @@ function displayNPCInfo($action, $task, $charid) {
 	
 	//initialisierung der Variablen für Inhalt
 	$d_select_array = array($race_ids, array(300, 1200, 3600));
-	$d_array = array('charakter', 'name', 'type', 'hp', 'mp', 'starke', 'verteidigung', 'speed',
+	$d_array = array('charakter', 'name', 'rasse', 'hp', 'mp', 'starke', 'verteidigung', 'speed',
 		'ausdauer', 'glueck', 'zeit_rec', 'level', 'lvlmin', 'lvlmax', 'bild');
 	$desc_select_array = array($race_names, array('5min', '20min', '60min'));
 	$desc_array = array('ID', 'Name', 'Type', 'HP', 'MP', 'Stärke', 'Verteidigung', 'Geschwindigkeit',
@@ -244,7 +244,7 @@ function editNPC($charid, $data, $att_ids) {
 	$attset = buildAttackSet($charid, $att_ids);
 	$error = validateAttackSet($attset);
 
-	$d_array = array('name', 'type', 'hp', 'mp', 'starke', 'verteidigung', 'speed',
+	$d_array = array('name', 'rasse', 'hp', 'mp', 'starke', 'verteidigung', 'speed',
 					'ausdauer', 'glueck', 'level', 'bild');
 
 	$sql = 'UPDATE chars c INNER JOIN kampf_list kl ON c.id=kl.charakter INNER JOIN npc_item n ON c.id=n.charakter SET c.';
@@ -310,8 +310,8 @@ function createNPC($data, $att_ids) {
 	}
 
 	//Char erstellen, wichtig für die restlichen Sachen
-	$success = erstelleChar(getNPCUser(), $data['type'], $data['name'], $data['bild'], $data['level'], 0, $data['hp'], $data['mp'], $data['starke'], $data['verteidigung'], $data['speed'],
-	$data['ausdauer'], $data['glueck'], $data['type']);
+	$success = erstelleChar(getNPCUser(), $data['rasse'], $data['name'], $data['bild'], $data['level'], 0, $data['hp'], $data['mp'], $data['starke'], $data['verteidigung'], $data['speed'],
+	$data['ausdauer'], $data['glueck'], $data['rasse']);
 
 	if($success) {
 		//Char ID holen