Implemented Reborn and scheduling of it!

ag/include/kampf/reborn.php

@@ -7,17 +7,13 @@
  *
  */
 
+if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
 	################### 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'];
+			$reborn_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;
@@ -31,12 +27,8 @@ if ($technick1['type'] == 'reborn') {
 	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'];
+			$reborn_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;
@@ -44,3 +36,16 @@ if ($technick2['type'] == 'reborn') {
 
 		$aktion_AV2[$x] = 'nein';
 	}
+}
+
+if(isset($reborn_hp[0]) && $k_hp[0] <= 0) {
+	$k_hp[0] = $reborn_hp[0];
+	unset($reborn_hp[0]);
+	$schaden_1 .= '<br>Reborn!';
+}
+
+if(isset($reborn_hp[1]) && $k_hp[0] <= 0) {
+	$k_hp[0] = $reborn_hp[1];
+	unset($reborn_hp[1]);
+	$schaden_2 .= '<br>Reborn!';
+}

ag/include/kampf_wrapper.inc.php

@@ -208,9 +208,9 @@ function calculateFight(array $char1, array $char2) {
 			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/reborn.php');
 
 		#####################################KAMPF SYSTEM
 		include (ROOT_PATH . '/include/kampf/kampf_rechnung.php');

ag/include/schatz.inc.php

@@ -252,9 +252,9 @@ 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 (ROOT_PATH . '/include/kampf/reborn.php');
 				}
 				include (ROOT_PATH . '/include/kampf/heilung.php');
+				include (ROOT_PATH . '/include/kampf/reborn.php');
 
 				#####################################KAMPF SYSTEM
 				include (ROOT_PATH . '/include/kampf/kampf_rechnung.php');

ag/kampf2.php

@@ -209,9 +209,9 @@ while ($k_hp[0] > $k_aufgabe[0] AND $k_hp[1] > $k_aufgabe[1] AND $x < 10) {
 		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/reborn.php');
 
 	#####################################KAMPF SYSTEM
 	include (ROOT_PATH . '/include/kampf/kampf_rechnung.php');

ag/kampf_clan.php

@@ -199,9 +199,9 @@ while ($k_hp[0] > $k_aufgabe[0] AND $k_hp[1] > $k_aufgabe[1] AND $x < 10) {
 		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/reborn.php');
 
 	#####################################KAMPF SYSTEM
 	include (ROOT_PATH . '//include/kampf/kampf_rechnung.php');

cronjob/kampf_include.php

@@ -50,7 +50,7 @@ if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
 	include ('include/kampf/konter_heal.php');
 	//Nach Konterheal, damit überstehende HP bleibt
 	include ('include/kampf/tausch.php');
-	include ('include/kampf/reborn.php');
 }
 include ('include/kampf/heilung.php');
+include ('include/kampf/reborn.php');