From 2b967d93a25f6a833a7124ec8436801abd01bc51 Mon Sep 17 00:00:00 2001
From: radiskull <radiskull@9a2b23b2-43f4-4935-bed2-871a584d7cab>
Date: Mon, 11 Aug 2014 15:56:55 +0000
Subject: [PATCH] #129 eingebaut formatierungen gesetzt, debugs entfernt

---
 ag/gm/include/attacken.inc.php        |  2 +-
 ag/include/kampf/frucht.php           | 70 +++++++++++++--------------
 ag/include/kampf/generic_rechnung.php |  4 +-
 ag/include/kampf/reborn.php           | 46 ++++++++++++++++++
 ag/include/kampf/schatten.php         | 48 +++++++++---------
 ag/include/kampf_wrapper.inc.php      | 18 +++----
 ag/include/schatz.inc.php             | 19 ++++----
 ag/kampf2.php                         | 37 +++++++-------
 ag/kampf_clan.php                     | 21 ++++----
 9 files changed, 157 insertions(+), 108 deletions(-)
 create mode 100644 ag/include/kampf/reborn.php

diff --git a/ag/gm/include/attacken.inc.php b/ag/gm/include/attacken.inc.php
index 0f4582e..24c000d 100644
--- a/ag/gm/include/attacken.inc.php
+++ b/ag/gm/include/attacken.inc.php
@@ -217,7 +217,7 @@ function createOrEditAttack($action, $attackid) {
 			<td>Type:</td>
 			<td><select name="type">
 			<?php
-			$types = array('normal', 'kaioken', 'kaioken2', 'SSJ', 'lose', 'lose2', 'hpmp', 'hp', 'tausch', 'tausch2', 'majin', 'copy', 'runde', 'frucht', 'konterhp', 'generic');
+			$types = array('normal', 'kaioken', 'kaioken2', 'SSJ', 'lose', 'lose2', 'hpmp', 'hp', 'tausch', 'tausch2', 'majin', 'copy', 'runde', 'frucht', 'konterhp', 'reborn', 'generic');
 			foreach ($types as $type) {
 				if($row['type'] == $type){
 					echo '<option value="'.$type.'" selected="selected">'.$type.'</option>';
diff --git a/ag/include/kampf/frucht.php b/ag/include/kampf/frucht.php
index cad8b45..cacb997 100644
--- a/ag/include/kampf/frucht.php
+++ b/ag/include/kampf/frucht.php
@@ -9,41 +9,41 @@
 ####################KAIOKEN SPIELER 1
 
 if($technick1['type'] == 'frucht') {
-$frucht_stats1 = mysql_fetch_array(mysql_query("SELECT starke, ver, speed, ausdauer, glueck FROM wochen_markt WHERE item='$chara_1[frucht]' LIMIT 1"));
-$k_mp[0] = $k_mp[0] - $technick1['mp'];
-$k_hp[0] = $k_hp[0] - $technick1['hp'];
-if($k_mp[0] < 0) { 
-$schaden_1 = 'Technik fehlgeschlagen';
-$aktion_AV1[$x] = 'nein';
-$k_mp[0] = 0; 
-} else {
+	$frucht_stats1 = mysql_fetch_array(mysql_query("SELECT starke, ver, speed, ausdauer, glueck FROM wochen_markt WHERE item='$chara_1[frucht]' LIMIT 1"));
+	$k_mp[0] = $k_mp[0] - $technick1['mp'];
+	$k_hp[0] = $k_hp[0] - $technick1['hp'];
+	if($k_mp[0] < 0) {
+		$schaden_1 = 'Technik fehlgeschlagen';
+		$aktion_AV1[$x] = 'nein';
+		$k_mp[0] = 0;
+	} else {
 
-$schaden_1 = 'Zauber Frucht';
-$k_ausdauer[0] = $k_ausdauer[0] + $frucht_stats1['ausdauer'];
-$k_starke[0] = $k_starke[0] + ($frucht_stats1['starke']*$technick1['starke']);
-$k_speed[0] = $k_speed[0] + ($frucht_stats1['speed']*$technick1['speed']);
-$k_ver[0] = $k_ver[0] + ($frucht_stats1['ver']*$technick1['verteidigung']);
-$k_glueck[0] = $k_glueck[0] + $frucht_stats1['glueck'];
-$aktion_AV1[$x] = 'nein';
-}}
-####################KAIOKEN SPIELER 2
+		$schaden_1 = 'Zauber Frucht';
+		$k_ausdauer[0] = $k_ausdauer[0] + $frucht_stats1['ausdauer'];
+		$k_starke[0] = $k_starke[0] + ($frucht_stats1['starke']*$technick1['starke']);
+		$k_speed[0] = $k_speed[0] + ($frucht_stats1['speed']*$technick1['speed']);
+		$k_ver[0] = $k_ver[0] + ($frucht_stats1['ver']*$technick1['verteidigung']);
+		$k_glueck[0] = $k_glueck[0] + $frucht_stats1['glueck'];
+		$aktion_AV1[$x] = 'nein';
+	}}
+	####################KAIOKEN SPIELER 2
 
-if($technick2['type'] == 'frucht') {
-$frucht_stats2 = mysql_fetch_array(mysql_query("SELECT starke, ver, speed, ausdauer, glueck FROM wochen_markt WHERE item='$chara_2[frucht]' LIMIT 1"));
-$k_mp[1] = $k_mp[1] - $technick2['mp'];
-$k_hp[1] = $k_hp[1] - $technick2['hp'];
-if($k_mp[1] < 0) { 
-$schaden_2 = 'Technik fehlgeschlagen';
-$aktion_AV2[$x] = 'nein';
-$k_mp[1] = 0; 
-} else {
+	if($technick2['type'] == 'frucht') {
+		$frucht_stats2 = mysql_fetch_array(mysql_query("SELECT starke, ver, speed, ausdauer, glueck FROM wochen_markt WHERE item='$chara_2[frucht]' LIMIT 1"));
+		$k_mp[1] = $k_mp[1] - $technick2['mp'];
+		$k_hp[1] = $k_hp[1] - $technick2['hp'];
+		if($k_mp[1] < 0) {
+			$schaden_2 = 'Technik fehlgeschlagen';
+			$aktion_AV2[$x] = 'nein';
+			$k_mp[1] = 0;
+		} else {
 
-$schaden_2 = 'Zauber Frucht';
-$k_ausdauer[1] = $k_ausdauer[1] + $frucht_stats2['ausdauer'];
-$k_starke[1] = $k_starke[1] + ($frucht_stats2['starke']*$technick2['starke']);
-$k_speed[1] = $k_speed[1] + ($frucht_stats2['speed']*$technick2['speed']);
-$k_ver[1] = $k_ver[1] + ($frucht_stats2[ver]*$technick2['verteidigung']);
-$k_glueck[1] = $k_glueck[1] + $frucht_stats2['glueck'];
-$aktion_AV2[$x] = 'nein';
-}}
-?>
\ No newline at end of file
+			$schaden_2 = 'Zauber Frucht';
+			$k_ausdauer[1] = $k_ausdauer[1] + $frucht_stats2['ausdauer'];
+			$k_starke[1] = $k_starke[1] + ($frucht_stats2['starke']*$technick2['starke']);
+			$k_speed[1] = $k_speed[1] + ($frucht_stats2['speed']*$technick2['speed']);
+			$k_ver[1] = $k_ver[1] + ($frucht_stats2[ver]*$technick2['verteidigung']);
+			$k_glueck[1] = $k_glueck[1] + $frucht_stats2['glueck'];
+			$aktion_AV2[$x] = 'nein';
+		}}
+		?>
\ No newline at end of file
diff --git a/ag/include/kampf/generic_rechnung.php b/ag/include/kampf/generic_rechnung.php
index e636d2f..ecf87b1 100644
--- a/ag/include/kampf/generic_rechnung.php
+++ b/ag/include/kampf/generic_rechnung.php
@@ -93,7 +93,7 @@ if (!function_exists('processStatChanges')) {
 			$statsCounter = 0;
 			foreach ($attacke as $attKey => &$stat) {
 				if(is_array($stat)) {
-					echo '<br>'.print_r($stat);
+					//echo '<br>'.print_r($stat);
 					//echo '<br>dauer: '.$stat['dauer'].'/'.$stat['maxdauer'];
 					//echo '<br>wert: '.$stat['dauer'];
 					//echo '<br>operator: ';
@@ -110,7 +110,7 @@ if (!function_exists('processStatChanges')) {
 					} else {
 						$zAttributWert = &$attributWert;
 					}
-					echo '<br>operator: "'.$stat['operator'].'"';
+					//echo '<br>operator: "'.$stat['operator'].'"';
 					if(($stat['wirkung'] == 'always' || $stat['dauer'] == $stat['maxdauer']) && ($stat['unblockbar'] || !$GLOBALS['kampf']['aussetzen'])) {
 						switch ($stat['operator']) {
 							case '+':
diff --git a/ag/include/kampf/reborn.php b/ag/include/kampf/reborn.php
new file mode 100644
index 0000000..3fa5ce1
--- /dev/null
+++ b/ag/include/kampf/reborn.php
@@ -0,0 +1,46 @@
+<?php
+/*
+ * Created on 07.03.2009
+ *
+ * @copyright (c) 2009 animegame.eu
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public Licence
+ *
+ */
+
+################### Spieler 1
+
+if ($technick1['type'] == 'reborn') {
+	$k_mp[0] = $k_mp[0] - $technick1['mp'];
+	if ($k_mp[0] >= 0) {
+		if($k_hp[0] <= 0) {
+			$k_hp[0] = ($k_hp1[1] / 100) * $technick1['hp'];
+			$schaden_1 = 'Reborn!';
+		} else {
+			$schaden_1 = 'Technik fehlgeschlagen';
+		}
+	} else {
+		$schaden_1 = 'Technik fehlgeschlagen';
+		$k_mp[0] = 0;
+	}
+
+	$aktion_AV1[$x] = 'nein';
+}
+
+################### Spieler 2
+
+if ($technick2['type'] == 'reborn') {
+	$k_mp[1] = $k_mp[1] - $technick2['mp'];
+	if ($k_mp[1] >= 0) {
+		if($k_hp[1] <= 0) {
+			$k_hp[1] = ($k_hp2[1] / 100) * $technick2['hp'];
+			$schaden_2 = 'Reborn!';
+		} else {
+			$schaden_2 = 'Technik fehlgeschlagen';
+		}
+	} else {
+		$schaden_2 = 'Technik fehlgeschlagen';
+		$k_mp[0] = 0;
+	}
+
+	$aktion_AV2[$x] = 'nein';
+}
diff --git a/ag/include/kampf/schatten.php b/ag/include/kampf/schatten.php
index 9dd3cc5..eb91783 100644
--- a/ag/include/kampf/schatten.php
+++ b/ag/include/kampf/schatten.php
@@ -9,32 +9,32 @@
 ####################KAIOKEN SPIELER 1
 
 if($technick1['type'] == 'schatten') {
-$k_mp[0] = $k_mp[0] - $technick1['mp'];
-$k_hp[0] = $k_hp[0] - $technick1['hp'];
-if($k_mp[0] < 0) {
-$schaden_2 = 'Keinen Schaden';
-$schaden_1 = 'Keine Kraft';
-$aktion_AV1[$x] = 'nein';
-$k_mp[0] = 0;
-} else {
-///////////////////die rechnung sozusagen.
-$play1_ausweich=$technick1['speed'];
+	$k_mp[0] = $k_mp[0] - $technick1['mp'];
+	$k_hp[0] = $k_hp[0] - $technick1['hp'];
+	if($k_mp[0] < 0) {
+		$schaden_2 = 'Keinen Schaden';
+		$schaden_1 = 'Keine Kraft';
+		$aktion_AV1[$x] = 'nein';
+		$k_mp[0] = 0;
+	} else {
+		///////////////////die rechnung sozusagen.
+		$play1_ausweich=$technick1['speed'];
 
-}}
-####################KAIOKEN SPIELER 2
+	}}
+	####################KAIOKEN SPIELER 2
 
-if($technick2['type'] == 'schatten') {
-$k_mp[1] = $k_mp[1] - $technick2['mp'];
-$k_hp[1] = $k_hp[1] - $technick2['hp'];
-if($k_mp[1] < 0) {
-$schaden_1 = 'Keinen Schaden';
-$schaden_2 = 'Keine Kraft';
-$aktion_AV2[$x] = 'nein';
-$k_mp[1] = 0;
-} else {
+	if($technick2['type'] == 'schatten') {
+		$k_mp[1] = $k_mp[1] - $technick2['mp'];
+		$k_hp[1] = $k_hp[1] - $technick2['hp'];
+		if($k_mp[1] < 0) {
+			$schaden_1 = 'Keinen Schaden';
+			$schaden_2 = 'Keine Kraft';
+			$aktion_AV2[$x] = 'nein';
+			$k_mp[1] = 0;
+		} else {
 
-$play2_ausweich=$technick2['speed'];
+			$play2_ausweich=$technick2['speed'];
 
-}}
+		}}
 
-?>
\ No newline at end of file
+		?>
\ No newline at end of file
diff --git a/ag/include/kampf_wrapper.inc.php b/ag/include/kampf_wrapper.inc.php
index c6c3de6..0d63797 100644
--- a/ag/include/kampf_wrapper.inc.php
+++ b/ag/include/kampf_wrapper.inc.php
@@ -179,14 +179,12 @@ function calculateFight(array $char1, array $char2) {
 		##################################MP, SSJ Verwandlungen, HP, Koerper Tausch Technicken
 		include (ROOT_PATH . '/include/kampf/majin.php');
 
-		include (ROOT_PATH . '/include/kampf/generic_technik.php');
-		include (ROOT_PATH . '/include/kampf/generic_rechnung.php');
-
 		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');
@@ -199,18 +197,20 @@ function calculateFight(array $char1, array $char2) {
 			include (ROOT_PATH . '/include/kampf/ausdauer.php');
 			include (ROOT_PATH . '/include/kampf/mpv.php');
 			include (ROOT_PATH . '/include/kampf/hpmp.php');
+			include (ROOT_PATH . '/include/kampf/generic_technik.php');
+		}
+
+		include (ROOT_PATH . '/include/kampf/generic_rechnung.php');
+		include (ROOT_PATH . '/include/kampf/atk_wert.php');
+
+		if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
 			//Als letztes um alle HP-Attacken zu kontern (in $tmp_hp gespeichert)
 			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/reborn.php');
 		}
 		include (ROOT_PATH . '/include/kampf/heilung.php');
-		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
 		include (ROOT_PATH . '/include/kampf/kampf_rechnung.php');
diff --git a/ag/include/schatz.inc.php b/ag/include/schatz.inc.php
index 79ba270..bc5c70d 100644
--- a/ag/include/schatz.inc.php
+++ b/ag/include/schatz.inc.php
@@ -178,7 +178,7 @@ function monsterfight_neu($chara_1, $fight_monster, $std, $ort){
 					')';
 			//			echo 'Debug Message: '.$sql.'<br>';
 			mysql_query($sql);
-				
+
 			$statChange_Char1 = array();
 			$statChange_Char2 = array();
 			$tmp_hp = array();
@@ -223,10 +223,7 @@ function monsterfight_neu($chara_1, $fight_monster, $std, $ort){
 				##################################MP, SSJ Verwandlungen, HP, Koerper Tausch Technicken
 				include (ROOT_PATH . '/include/kampf/majin.php');
 
-				include (ROOT_PATH . '/include/kampf/generic_technik.php');
-				include (ROOT_PATH . '/include/kampf/generic_rechnung.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');
@@ -244,16 +241,20 @@ function monsterfight_neu($chara_1, $fight_monster, $std, $ort){
 					include (ROOT_PATH . '/include/kampf/ausdauer.php');
 					include (ROOT_PATH . '/include/kampf/mpv.php');
 					include (ROOT_PATH . '/include/kampf/hpmp.php');
+					include (ROOT_PATH . '/include/kampf/generic_technik.php');
+				}
+
+				include (ROOT_PATH . '/include/kampf/generic_rechnung.php');
+				include (ROOT_PATH . '/include/kampf/atk_wert.php');
+
+				if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
 					//Als letztes um alle HP-Attacken zu kontern (in $tmp_hp gespeichert)
 					include (ROOT_PATH . '/include/kampf/konter_heal.php');
 					//Nach Konterheal, damit überstehende HP bleibt
 					include (ROOT_PATH . '/include/kampf/tausch.php');
+					include (ROOT_PATH . '/include/kampf/reborn.php');
 				}
 				include (ROOT_PATH . '/include/kampf/heilung.php');
-				include (ROOT_PATH . '/include/kampf/atk_wert.php');
-				if (!$aussetzten_runde) { /////DAS FueR MAJIN ATTACKEN
-					include (ROOT_PATH . '/include/kampf/schatten.php');
-				}
 
 				#####################################KAMPF SYSTEM
 				include (ROOT_PATH . '/include/kampf/kampf_rechnung.php');
diff --git a/ag/kampf2.php b/ag/kampf2.php
index fcd9a47..b622b04 100644
--- a/ag/kampf2.php
+++ b/ag/kampf2.php
@@ -101,7 +101,7 @@ $runden_gif_technik2 = "";
 if ($k_hp[0] > $k_aufgabe[0] AND $k_hp[1] > $k_aufgabe[1] AND $x < 10) {
 	$sql = "INSERT kampf SET hp1='$k_hp[0]', hp2='$k_hp[1]', mp1='$k_mp[0]', mp2='$k_mp[1]', schaden1='$schaden_1', schaden2='$schaden_2', attacke1='$technick1[name]', attacke2='$technick2[name]', char1='$chara_1[id]', char2='$chara_2[id]', starke1='$k_starke[0]', starke2='$k_starke[1]', ver1='$k_ver[0]', ver2='$k_ver[1]', speed1='$k_speed[0]', speed2='$k_speed[1]', ausdauer1='$k_ausdauer[0]', ausdauer2='$k_ausdauer[1]', glueck1='$k_glueck[0]', glueck2='$k_glueck[1]'";
 	mysql_query($sql);
-//	echo $sql . '<br>';
+	//	echo $sql . '<br>';
 	if (mysql_affected_rows() == 0) {
 		echo '"' . $sql . '" konnte nicht ausgef&uuml;rt werden!<br>';
 	}
@@ -169,20 +169,17 @@ while ($k_hp[0] > $k_aufgabe[0] AND $k_hp[1] > $k_aufgabe[1] AND $x < 10) {
 
 	////// MUSS SO BLEIBEN WICHTIG
 	$aussetzten_runde = "";
-	//Diese Variablen speichern den Wert um wieviel HP geheilt wird damit wir falls nötig diesen durch Healkonter 
+	//Diese Variablen speichern den Wert um wieviel HP geheilt wird damit wir falls nötig diesen durch Healkonter
 	//in Schaden umwandeln können
 	$tmp_hp[0] = 0;
 	$tmp_hp[1] = 0;
 	//Diese Werte sind wichtig, damit wir wissen ob eine Heal-Attacke eingesetzt wurde und wir die HP falls sie das
-	//Maximum überschreiten zurücksetzen müssen 
+	//Maximum überschreiten zurücksetzen müssen
 	$tmp_hp[2] = false;
 	$tmp_hp[3] = false;
 	##################################MP, SSJ Verwandlungen, HP, Koerper Tausch Technicken
 	include (ROOT_PATH . '/include/kampf/majin.php');
-	
-	include (ROOT_PATH . '/include/kampf/generic_technik.php');
-	include (ROOT_PATH . '/include/kampf/generic_rechnung.php');
-	
+
 	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
@@ -201,22 +198,24 @@ while ($k_hp[0] > $k_aufgabe[0] AND $k_hp[1] > $k_aufgabe[1] AND $x < 10) {
 		include (ROOT_PATH . '/include/kampf/ausdauer.php');
 		include (ROOT_PATH . '/include/kampf/mpv.php');
 		include (ROOT_PATH . '/include/kampf/hpmp.php');
+		include (ROOT_PATH . '/include/kampf/generic_technik.php');
+	}
+
+	include (ROOT_PATH . '/include/kampf/generic_rechnung.php');
+	include (ROOT_PATH . '/include/kampf/atk_wert.php');
+
+	if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
 		//Als letztes um alle HP-Attacken zu kontern (in $tmp_hp gespeichert)
 		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/reborn.php');
 	}
-	
 	include (ROOT_PATH . '/include/kampf/heilung.php');
-	include (ROOT_PATH . '/include/kampf/atk_wert.php');
-	if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
-		include (ROOT_PATH . '/include/kampf/schatten.php');
-	}
-	
+
 	#####################################KAMPF SYSTEM
 	include (ROOT_PATH . '/include/kampf/kampf_rechnung.php');
-	
+
 	$db_query = mysql_fetch_array(mysql_query("SELECT * FROM kampf WHERE (char1='$chara_1[id]' OR char1='$chara_2[id]') AND dauer='0' order by id DESC LIMIT 1"));
 
 	mysql_query("UPDATE kampf SET hp1='$db_query[hp1],$k_hp7[0]', hp2='$db_query[hp2],$k_hp7[1]', mp1='$db_query[mp1],$k_mp7[0]', mp2='$db_query[mp2],$k_mp7[1]', schaden1='$db_query[schaden1],$schaden_1', schaden2='$db_query[schaden2],$schaden_2', attacke1='$db_query[attacke1],$technick1[name]', attacke2='$db_query[attacke2],$technick2[name]', starke1='$db_query[starke1],$k_starke[0]', starke2='$db_query[starke2],$k_starke[1]', ver1='$db_query[ver1],$k_ver[0]', ver2='$db_query[ver2],$k_ver[1]', speed1='$db_query[speed1],$k_speed[0]', speed2='$db_query[speed2],$k_speed[1]', ausdauer1='$db_query[ausdauer1],$k_ausdauer[0]', ausdauer2='$db_query[ausdauer2],$k_ausdauer[1]', glueck1='$db_query[glueck1],$k_glueck[0]', glueck2='$db_query[glueck2],$k_glueck[1]' WHERE id='$db_query[id]'");
@@ -327,9 +326,9 @@ mysql_query('Update arena set einnahmen = einnahmen + '.$k_geld[0].' WHERE besit
 mysql_query('Update arena set einnahmen = einnahmen + '.$k_geld[1].' WHERE besitzer = '.$chara_2['besitzer']);
 
 /*
-// Das ist der Teil, der an das Heim-Team geht und versteuert werden muss! 10%
-$arena_geld = round($arena_data['geld']*0.1);
-*/
+ // Das ist der Teil, der an das Heim-Team geht und versteuert werden muss! 10%
+ $arena_geld = round($arena_data['geld']*0.1);
+ */
 $arena_geld = 0;
 
 $dauer_Z = time() + ($kampf_info[zeit_rec]);
@@ -347,7 +346,7 @@ if ($kampf_info['rasse'] != "NPC") {
 
 	$sql = "INSERT kampf SET preis='$nw_preis', art='$kampf_info[art]', art2='$kampf_info[rasse]', hp1='$db_query2[hp1]', hp2='$db_query2[hp2]', mp1='$db_query2[mp1]', mp2='$db_query2[mp2]', attacke1='$db_query2[attacke1]', attacke2='$db_query2[attacke2]', schaden1='$db_query2[schaden1]', schaden2='$db_query2[schaden2]', char1='$db_query2[char1]', char2='$db_query2[char2]', starke1='$db_query2[starke1]', starke2='$db_query2[starke2]', ver1='$db_query2[ver1]', ver2='$db_query2[ver2]', speed1='$db_query2[speed1]',speed2='$db_query2[speed2]', ausdauer1='$db_query2[ausdauer1]', ausdauer2='$db_query2[ausdauer2]', glueck1='$db_query2[glueck1]', glueck2='$db_query2[glueck2]', exp1='$db_query2[exp1]', exp2='$db_query2[exp2]', geld1='$db_query2[geld1]', geld2='$db_query2[geld2]', loge='$db_query2[loge]', sitz=$db_query2[sitz], steh=$db_query2[steh], win='$db_query2[win]', lose='$db_query2[lose]', dauer='$dauer_Z', db_satz ='$chara_2[id]', arena_name='$db_query2[arena_name]', arena_exp=$arena_exp_new, arena_geld='$db_query2[arena_geld]'";
 	mysql_query($sql);
-//	echo $sql . '<br>';
+	//	echo $sql . '<br>';
 	if (mysql_affected_rows() == 0) {
 		echo '"' . $sql . '" konnte nicht ausgef&uuml;rt werden!<br>';
 	}
diff --git a/ag/kampf_clan.php b/ag/kampf_clan.php
index 842aabd..ab71bff 100644
--- a/ag/kampf_clan.php
+++ b/ag/kampf_clan.php
@@ -118,7 +118,7 @@ $GLOBALS['kampf']['aussetzen'] = &$aussetzten_runde;
 if ($k_hp[0] > $k_aufgabe[0] AND $k_hp[1] > $k_aufgabe[1] AND $x < 10) {
 	$sql = "INSERT clan_fights SET hp1='$k_hp[0]', hp2='$k_hp[1]', mp1='$k_mp[0]', mp2='$k_mp[1]', schaden1='$schaden_1', schaden2='$schaden_2', attacke1='$technick1[name]', attacke2='$technick2[name]', char1='$chara_1[id]', char2='$chara_2[id]', starke1='$k_starke[0]', starke2='$k_starke[1]', ver1='$k_ver[0]', ver2='$k_ver[1]', speed1='$k_speed[0]', speed2='$k_speed[1]', ausdauer1='$k_ausdauer[0]', ausdauer2='$k_ausdauer[1]', clanfight_id='$clanfight_id', runde='$runde', kampf='$kampf'";
 	mysql_query($sql);
-//	echo $sql . '<br>';
+	//	echo $sql . '<br>';
 	if (mysql_affected_rows() == 0) {
 		echo '"' . $sql . '" konnte nicht ausgef&uuml;rt werden!<br>';
 	}
@@ -169,15 +169,13 @@ while ($k_hp[0] > $k_aufgabe[0] AND $k_hp[1] > $k_aufgabe[1] AND $x < 10) {
 	$aussetzten_runde = ""; ////// MUSS SO BLEIBEN WICHTIG
 	##################################MP, SSJ Verwandlungen, HP, Koerper Tausch Technicken
 	include (ROOT_PATH . '//include/kampf/majin.php');
-	
-	include (ROOT_PATH . '/include/kampf/generic_technik.php');
-	include (ROOT_PATH . '/include/kampf/generic_rechnung.php');
 
 	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');
@@ -189,16 +187,21 @@ while ($k_hp[0] > $k_aufgabe[0] AND $k_hp[1] > $k_aufgabe[1] AND $x < 10) {
 		include (ROOT_PATH . '//include/kampf/lose2.php');
 		include (ROOT_PATH . '//include/kampf/ausdauer.php');
 		include (ROOT_PATH . '//include/kampf/mpv.php');
-		include (ROOT_PATH . '//include/kampf/tausch.php');
 		include (ROOT_PATH . '//include/kampf/hpmp.php');
-		//include "kampf/summon.php";
+		include (ROOT_PATH . '//include/kampf/generic_technik.php');
 	}
-	include (ROOT_PATH . '/include/kampf/heilung.php');
+
+	include (ROOT_PATH . '//include/kampf/generic_rechnung.php');
 	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');
+		//Als letztes um alle HP-Attacken zu kontern (in $tmp_hp gespeichert)
+		include (ROOT_PATH . '//include/kampf/konter_heal.php');
+		//Nach Konterheal, damit überstehende HP bleibt
+		include (ROOT_PATH . '//include/kampf/tausch.php');
+		include (ROOT_PATH . '//include/kampf/reborn.php');
 	}
+	include (ROOT_PATH . '//include/kampf/heilung.php');
 
 	#####################################KAMPF SYSTEM
 	include (ROOT_PATH . '//include/kampf/kampf_rechnung.php');