Monster bearbeiten
@@ -242,9 +249,10 @@ if(checkLoginData($_SESSION['user'],$_SESSION['password'])){
} else if($_REQUEST['choose'] == 'shop'){
displayShop($_REQUEST['action'], $_REQUEST['s_id'],$_REQUEST['info'], $_REQUEST['s_name'] , $_REQUEST['s2_name'], $_REQUEST['s3_name'], $_REQUEST['s_typ'], $_REQUEST['preis'], $_REQUEST['frei'], $_REQUEST['anzahl']);
} else if($_REQUEST['choose'] == 'usergroups'){
- //displayUserGroups($_REQUEST['action'], $_REQUEST['uname']);
displayUserGroups($_REQUEST['action'] ,$_REQUEST['uname'] ,$_REQUEST['ugname'], $_REQUEST['delete'], $_REQUEST['add']);
- } else {
+ } else if($_REQUEST['choose'] == 'tournament'){
+ displayTournamentOptions($_REQUEST['action']);
+ }else {
displayOptions();
}
} else if(isset($_POST['user'])){
diff --git a/ag/gm/include/npc.inc.php b/ag/gm/include/npc.inc.php
index f56cae2..6c796fd 100644
--- a/ag/gm/include/npc.inc.php
+++ b/ag/gm/include/npc.inc.php
@@ -14,8 +14,10 @@ function displayNPC($action, $task, $charid, $table, $page, $data){
echo "\t".''."\n";
echo "\t".''."\n";
if($action == 'edit'){
- $d_array = array('charakter', 'name', 'zeit_rec', 'lvlmin', 'lvlmax');
- $desc_array = array('ID', 'Name', 'Kampfdauer in Sekunden', 'Min-Level', 'Max-Level');
+ $d_array = array('charakter', 'name', 'type', 'hp', 'mp', 'starke', 'verteidigung', 'speed',
+ 'ausdauer', 'glueck', 'zeit_rec', 'lvlmin', 'lvlmax');
+ $desc_array = array('ID', 'Name', 'Type', 'HP', 'MP', 'Stärke', 'Verteidigung', 'Geschwindigkeit',
+ 'Ausdauer', 'Glück', 'Kampfdauer in Sekunden', 'Min-Level', 'Max-Level');
$sql = 'SELECT * FROM chars c inner join npc_item ni on ni.charakter = c.id inner join kampf_list kl on ni.charakter = kl.charakter WHERE c.id ='.$charid;
$qry = mysql_query($sql);
diff --git a/ag/gm/include/tournament.inc.php b/ag/gm/include/tournament.inc.php
new file mode 100644
index 0000000..ed5c693
--- /dev/null
+++ b/ag/gm/include/tournament.inc.php
@@ -0,0 +1,123 @@
+
+';
+ echo 'Zurück';
+ }
+ } else {*/
+ ?>
+
+
+
+
\ No newline at end of file
diff --git a/ag/item.php b/ag/item.php
index 0c6bfd9..5a8912d 100644
--- a/ag/item.php
+++ b/ag/item.php
@@ -138,13 +138,10 @@ if ($charm == 6) {
exit;
}
- if ($char_id1['status'] != 'frei') {
+ if ($char_id1['status'] != 'Frei') {
displayErrorMessage(NULL,'Dieser Charakter ist nicht frei!', displayHistoryBackLink());
exit;
- }
-
- echo 'vars:';
- print_r($char_id1);
+ }
$hp1 = explode(",", $char_id1['hp']);
$mp1 = explode(",", $char_id1['mp']);
diff --git a/ag/profil.php b/ag/profil.php
index a663fb9..bd9056a 100644
--- a/ag/profil.php
+++ b/ag/profil.php
@@ -93,7 +93,6 @@ function changeProfil($user, $usergroups, $new_pw, $new_nick, $new_nick2, $alt_p
removeUserFromGroup($user['nickname'], Werbung_an);
}
}
- echo 'Accountdelete: '.$acc_delete;
if($acc_delete == 1) {
if(!isUserInGroup($usergroups, aktiv_loeschschutz)) {
addUserToGroup($user['nickname'], aktiv_loeschschutz);
diff --git a/ag/turnier.php b/ag/turnier.php
index bf9b432..4e8c31f 100644
--- a/ag/turnier.php
+++ b/ag/turnier.php
@@ -40,12 +40,12 @@ function anmelden($user, $charid, $art){
if($art == 'klein'){
// Char darf max lvl 25 haben und keine Fusion sein
- $special_clue = 'AND level<=25 AND fusion =\'nein\' AND char_type = \'\' ';
+ $special_clue = 'AND level<=25 AND fusion =\'nein\' AND char_type = \'\' AND id not in (SELECT c.id FROM chars c RIGHT JOIN wochen_markt wm on c.frucht=wm.item where c.id = \''.$charid.'\')';
$anzahl = 32;
} else{
$anzahl = 64;
}
- // sehr speziell und deswegen nicht getChar();
+ // sehr speziell und deswegen nicht getChar();
$PRUEF = mysql_num_rows(mysql_query('SELECT id FROM chars WHERE id=\''.$charid.'\' '.$special_clue.' AND besitzer=\''.$user['id'].'\' LIMIT 1'));
if(!$PRUEF) {
displayErrorMessage(NULL,'Charakter erfüllt die Bestimungen nicht!','weiter...');
|