diff --git a/ag/include/kampf/reborn.php b/ag/include/kampf/reborn.php
index 3fa5ce1..516393c 100644
--- a/ag/include/kampf/reborn.php
+++ b/ag/include/kampf/reborn.php
@@ -7,40 +7,45 @@
*
*/
-################### 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'];
+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) {
+ $reborn_hp[0] = ($k_hp1[1] / 100) * $technick1['hp'];
$schaden_1 = 'Reborn!';
} else {
$schaden_1 = 'Technik fehlgeschlagen';
+ $k_mp[0] = 0;
}
- } else {
- $schaden_1 = 'Technik fehlgeschlagen';
- $k_mp[0] = 0;
- }
- $aktion_AV1[$x] = 'nein';
-}
+ $aktion_AV1[$x] = 'nein';
+ }
-################### Spieler 2
+ ################### 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'];
+ if ($technick2['type'] == 'reborn') {
+ $k_mp[1] = $k_mp[1] - $technick2['mp'];
+ if ($k_mp[1] >= 0) {
+ $reborn_hp[1] = ($k_hp2[1] / 100) * $technick2['hp'];
$schaden_2 = 'Reborn!';
} else {
$schaden_2 = 'Technik fehlgeschlagen';
+ $k_mp[0] = 0;
}
- } else {
- $schaden_2 = 'Technik fehlgeschlagen';
- $k_mp[0] = 0;
+
+ $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 .= '
Reborn!';
+}
- $aktion_AV2[$x] = 'nein';
+if(isset($reborn_hp[1]) && $k_hp[0] <= 0) {
+ $k_hp[0] = $reborn_hp[1];
+ unset($reborn_hp[1]);
+ $schaden_2 .= '
Reborn!';
}
diff --git a/ag/include/kampf_wrapper.inc.php b/ag/include/kampf_wrapper.inc.php
index 0d63797..50841d3 100644
--- a/ag/include/kampf_wrapper.inc.php
+++ b/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');
diff --git a/ag/include/schatz.inc.php b/ag/include/schatz.inc.php
index bc5c70d..bb25f92 100644
--- a/ag/include/schatz.inc.php
+++ b/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');
diff --git a/ag/kampf2.php b/ag/kampf2.php
index b622b04..b20dbf2 100644
--- a/ag/kampf2.php
+++ b/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');
diff --git a/ag/kampf_clan.php b/ag/kampf_clan.php
index ab71bff..7aab932 100644
--- a/ag/kampf_clan.php
+++ b/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');
diff --git a/cronjob/kampf_include.php b/cronjob/kampf_include.php
index e57a67c..8f20f4e 100644
--- a/cronjob/kampf_include.php
+++ b/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');