From 5bc8fc98f6db93364ef7a462b2283422e6b730d9 Mon Sep 17 00:00:00 2001 From: radiskull Date: Tue, 20 Mar 2012 21:31:48 +0000 Subject: [PATCH] Schatzsuche-Kampfauswertungsbug gefixt --- ag/include/schatz.inc.php | 14 +++++++------- ag/kampf2.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ag/include/schatz.inc.php b/ag/include/schatz.inc.php index 6ddfcab..89631a1 100644 --- a/ag/include/schatz.inc.php +++ b/ag/include/schatz.inc.php @@ -90,6 +90,7 @@ function monsterfight_neu($chara_1, $fight_monster, $std, $ort){ $in_hp_max = explode(',', $chara_1['hp']); $in_mp_max = explode(',', $chara_1['mp']); + $k_hp2[1] = $in_hp_max[1]; $k_hp[0] = $in_hp_max[0]; $k_mp[0] = $in_mp_max[0]; $in_hp_max = $in_hp_max[1] + $char1_buffs['hp']; @@ -193,17 +194,17 @@ function monsterfight_neu($chara_1, $fight_monster, $std, $ort){ $speeds_char2 = $k_speed[1]; $aussetzten_runde = ""; ////// MUSS SO BLEIBEN WICHTIG - ##################################MP, SSJ Verwandlungen, HP, Koerper Tausch Technicken $tmp_hp[0] = 0; $tmp_hp[1] = 0; ##################################MP, SSJ Verwandlungen, HP, Koerper Tausch Technicken include (ROOT_PATH . '/include/kampf/majin.php'); - - if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN + + if (!$aussetzten_runde) { /////DAS FueR MAJIN ATTACKEN include (ROOT_PATH . '/include/kampf/atk_wert.php'); include (ROOT_PATH . '/include/kampf/tausch2.php'); //////////////////Muss ganz oben sein wegen technik Tauschen include (ROOT_PATH . '/include/kampf/gift.php'); include (ROOT_PATH . '/include/kampf/frucht.php'); + include (ROOT_PATH . '/include/kampf/runde.php'); include (ROOT_PATH . '/include/kampf/mp.php'); include (ROOT_PATH . '/include/kampf/hp.php'); include (ROOT_PATH . '/include/kampf/hp2.php'); @@ -220,16 +221,15 @@ function monsterfight_neu($chara_1, $fight_monster, $std, $ort){ include (ROOT_PATH . '/include/kampf/konter_heal.php'); //Nach Konterheal, damit überstehende HP bleibt include (ROOT_PATH . '/include/kampf/tausch.php'); - //include "kampf/summon.php"; - } + } include (ROOT_PATH . '/include/kampf/atk_wert.php'); - if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN + if (!$aussetzten_runde) { /////DAS FueR MAJIN ATTACKEN include (ROOT_PATH . '/include/kampf/schatten.php'); - include (ROOT_PATH . '/include/kampf/runde.php'); } #####################################KAMPF SYSTEM include (ROOT_PATH . '/include/kampf/kampf_rechnung.php'); + echo '(aussen)Runde '.$x.' Schaden1: '.$schaden_1.' Schaden2: '.$schaden_2.'
'; // schaden1='$db_query[schaden1],$schaden_1', schaden2='$db_query[schaden2],$schaden_2', attacke1='$db_query[attacke1],$technick1[name]', attacke2='$db_query[attacke2],$technick2[name]' $x++; $sql = 'Insert into quest_rounds(charid, fightnr, roundnr, c_attack, c_dmg, m_attack, m_dmg, c_st, c_sp, c_ver, c_hp, c_mp, c_aus, c_gl, m_st, m_sp, m_ver, m_hp, m_mp, m_aus, m_gl) values(' . diff --git a/ag/kampf2.php b/ag/kampf2.php index 7fe164b..a230464 100644 --- a/ag/kampf2.php +++ b/ag/kampf2.php @@ -162,6 +162,7 @@ while ($k_hp[0] > $k_aufgabe[0] AND $k_hp[1] > $k_aufgabe[1] AND $x < 10) { include (ROOT_PATH . '/include/kampf/tausch2.php'); //////////////////Muss ganz oben sein wegen technik Tauschen include (ROOT_PATH . '/include/kampf/gift.php'); include (ROOT_PATH . '/include/kampf/frucht.php'); + include (ROOT_PATH . '/include/kampf/runde.php'); include (ROOT_PATH . '/include/kampf/mp.php'); include (ROOT_PATH . '/include/kampf/hp.php'); include (ROOT_PATH . '/include/kampf/hp2.php'); @@ -183,7 +184,6 @@ while ($k_hp[0] > $k_aufgabe[0] AND $k_hp[1] > $k_aufgabe[1] AND $x < 10) { include (ROOT_PATH . '/include/kampf/atk_wert.php'); if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN include (ROOT_PATH . '/include/kampf/schatten.php'); - include (ROOT_PATH . '/include/kampf/runde.php'); } #####################################KAMPF SYSTEM