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

---
 cronjob/kampf/reborn.php  | 46 +++++++++++++++++++++++++++++++++++++++
 cronjob/kampf_include.php | 20 +++++++++--------
 2 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 cronjob/kampf/reborn.php

diff --git a/cronjob/kampf/reborn.php b/cronjob/kampf/reborn.php
new file mode 100644
index 0000000..3fa5ce1
--- /dev/null
+++ b/cronjob/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/cronjob/kampf_include.php b/cronjob/kampf_include.php
index a12f6c2..75ecb4f 100644
--- a/cronjob/kampf_include.php
+++ b/cronjob/kampf_include.php
@@ -19,11 +19,10 @@ $tmp_hp[1] = 0;
 $tmp_hp[2] = false;
 $tmp_hp[3] = false;
 ##################################MP, SSJ Verwandlungen, HP, Koerper Tausch Technicken
-include ('kampf/majin.php');
-include ('kampf/generic_technik.php');
-include ('kampf/generic_rechnung.php');
+include ('/kampf/majin.php');
 
 if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
+	include ('kampf/atk_wert.php');
 	include ('kampf/tausch2.php'); //////////////////Muss ganz oben sein wegen technik Tauschen
 	include ('kampf/gift.php');
 	include ('kampf/frucht.php');
@@ -40,18 +39,21 @@ if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
 	include ('kampf/ausdauer.php');
 	include ('kampf/mpv.php');
 	include ('kampf/hpmp.php');
+	include ('kampf/generic_technik.php');
+}
+
+include ('kampf/generic_rechnung.php');
+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 ('kampf/konter_heal.php');
 	//Nach Konterheal, damit überstehende HP bleibt
 	include ('kampf/tausch.php');
-	//include "kampf/summon.php";
+	include ('kampf/reborn.php');
 }
-
 include ('kampf/heilung.php');
-include ('kampf/atk_wert.php');
-if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
-	include ('kampf/schatten.php');
-}
+