From 0d7d449885e0a351cb473a33ae2523067fcb2bc8 Mon Sep 17 00:00:00 2001
From: radiskull <radiskull@9a2b23b2-43f4-4935-bed2-871a584d7cab>
Date: Sat, 17 Mar 2012 13:46:13 +0000
Subject: [PATCH] Konterheal eingebaut, hpmp-bug behoben

---
 cronjob/kampf/konter_heal.php |  4 +--
 cronjob/kampf_include.php     | 54 +++++++++++++++++++----------------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/cronjob/kampf/konter_heal.php b/cronjob/kampf/konter_heal.php
index 066583b..5136e95 100644
--- a/cronjob/kampf/konter_heal.php
+++ b/cronjob/kampf/konter_heal.php
@@ -15,7 +15,7 @@ if ($technick1['type'] == "konterhp") {
 		$schaden_1 = "Keine MP";
 		$aktion_AV1[$x] = "nein";
 	} else {
-		$k_hp[1] = $k_hp[1] - $tmp_hp[1];
+		$k_hp[1] -= $tmp_hp[1];
 		$schaden_1 = "$tmp_hp[1]";
 		if($tmp_hp[1] > 0) {
 			$schaden_2 = "Konter!";
@@ -38,7 +38,7 @@ if ($technick2['type'] == "konterhp") {
 		$schaden_2 = "Keine MP";
 		$aktion_AV2[$x] = "nein";
 	} else {
-		$k_hp[0] = $k_hp[0] - $tmp_hp[0];
+		$k_hp[0] -= $tmp_hp[0];
 		$schaden_2 = "$tmp_hp[0]";
 		if($tmp_hp[0] > 0) {
 			$schaden_1 = "Konter!";
diff --git a/cronjob/kampf_include.php b/cronjob/kampf_include.php
index e14df9a..224ac13 100644
--- a/cronjob/kampf_include.php
+++ b/cronjob/kampf_include.php
@@ -5,34 +5,40 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public Licence
  *
  */
-$aussetzten_runde = "";	////// MUSS SO BLEIBEN WICHTIG
+////// MUSS SO BLEIBEN WICHTIG
+$aussetzten_runde = "";
+$tmp_hp[0] = 0;
+$tmp_hp[1] = 0;
 ##################################MP, SSJ Verwandlungen, HP, Koerper Tausch Technicken
-include "kampf/majin.php";
+include (ROOT_PATH . 'kampf/majin.php');
 
-if(!$aussetzten_runde) {
-include "kampf/tausch2.php";	//////////////////Muss ganz oben sein wegen technik Tauschen
-//include "kampf/summon.php";
-include "kampf/gift.php";
-include "kampf/frucht.php";
-include "kampf/mp.php";
-include "kampf/hp.php";
-include "kampf/hp2.php";
-include "kampf/SSJ.php";
-include "kampf/kaioken.php";
-include "kampf/kaioken2.php";
-include "kampf/copy.php";
-include "kampf/lose.php";
-include "kampf/lose2.php";
-include "kampf/ausdauer.php";
-include "kampf/mpv.php";
-include "kampf/tausch.php";
-include "kampf/hpmp.php";
+if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
+	include (ROOT_PATH . 'kampf/tausch2.php'); //////////////////Muss ganz oben sein wegen technik Tauschen
+	include (ROOT_PATH . 'kampf/gift.php');
+	include (ROOT_PATH . 'kampf/frucht.php');
+	include (ROOT_PATH . 'kampf/mp.php');
+	include (ROOT_PATH . 'kampf/hp.php');
+	include (ROOT_PATH . 'kampf/hp2.php');
+	include (ROOT_PATH . 'kampf/SSJ.php');
+	include (ROOT_PATH . 'kampf/kaioken.php');
+	include (ROOT_PATH . 'kampf/kaioken2.php');
+	include (ROOT_PATH . 'kampf/copy.php');
+	include (ROOT_PATH . 'kampf/lose.php');
+	include (ROOT_PATH . 'kampf/lose2.php');
+	include (ROOT_PATH . 'kampf/ausdauer.php');
+	include (ROOT_PATH . 'kampf/mpv.php');
+	include (ROOT_PATH . 'kampf/hpmp.php');
+	//Als letztes um alle HP-Attacken zu kontern (in $tmp_hp gespeichert)
+	include (ROOT_PATH . 'kampf/konter_heal.php');
+	//Nach Konterheal, damit überstehende HP bleibt
+	include (ROOT_PATH . 'kampf/tausch.php');
+	//include "kampf/summon.php";
 }
 
-include "kampf/atk_wert.php";
-if(!$aussetzten_runde) {  	/////DAS FueR MAJIN ATTACKEN
-include "kampf/schatten.php";
-include "kampf/runde.php";
+include (ROOT_PATH . 'kampf/atk_wert.php');
+if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
+	include (ROOT_PATH . 'kampf/schatten.php');
+	include (ROOT_PATH . 'kampf/runde.php');
 }