Und ein weiterer Versuch reborn ans laufen zu bekommen.

ag/gm/gm_seite.php

@@ -31,6 +31,7 @@ include_once(ROOT_PATH.'/include/usergroup.inc.php');
 include_once(ROOT_PATH.'/gm/include/attacken.inc.php');
 include_once(ROOT_PATH.'/gm/include/bilderschau.inc.php');
 include_once(ROOT_PATH.'/gm/include/clan.inc.php');
+include_once(ROOT_PATH.'/gm/include/geheim.inc.php');
 include_once(ROOT_PATH.'/gm/include/info.inc.php');
 include_once(ROOT_PATH.'/gm/include/item.inc.php');
 include_once(ROOT_PATH.'/gm/include/monster.inc.php');
@@ -111,6 +112,9 @@ function displayLogin(){
 }
 
 function displayOptions(){
+	// FIXME: Hinzufuegen der Includes und der Entry Funktion im Array und wir brauchen
+	// in dieser Datei deutlich weniger Copy&Paste!
+	
 	$entries = array("bilder" => "Bilderschau",
 			"faq" => "FAQ bearbeiten",
 			"rassen" => "Rassen bearbeiten",

ag/gm/include/geheim.inc.php

@@ -14,17 +14,19 @@ defineIfNotDefined('GEHEIM_CHANCE_NIETE', 0.5);
 function displayGeheim($request) {
 	
 	?>
+	<form action="" method="POST">
+	<input name="choose" value="clan" type="hidden"></input>
+	<input name="action" value="<?php echo $action; ?>" type="hidden"></input>
+
 	<table>
 		<tr>
-					<th colspan="4">
+			<th colspan="4">Geheim Übersicht</th>
-						Geheim Übersicht
-					</th>
 		</tr>
 		<tr>
-					<td>
+			<td><a href="<?php echo $_SERVER['PHP_SELF']; ?>">Zum Hauptmenu</a>
-						<a href="<?php echo $_SERVER['PHP_SELF']; ?>">Zum Hauptmenu</a>
 			</td>
 		</tr>
 	</table>
+</form>
 <?php 
 }

ag/include/kampf/kampf_rechnung.php

@@ -87,7 +87,19 @@ if(!$technick2['name']) {
 	$technick2['name'] = 'Normaler Kick';
 }
 
+// Nun kommt reborn an die reihe!
 
+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[1] <= 0) {
+	$k_hp[1] = $reborn_hp[1];
+	unset($reborn_hp[1]);
+	$schaden_2 .= '<br>Reborn!';
+}
 
 if($k_hp[0]<0) {
 	$k_hp7[0] = 0;

ag/include/kampf/reborn.php

@@ -7,8 +7,6 @@
  *
  */
 
-if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
-	
 ################### Spieler 1
 if ($technick1['type'] == 'reborn') {
 	$k_mp[0] = $k_mp[0] - $technick1['mp'];
@@ -37,16 +35,4 @@ if (!$aussetzten_runde) { /////DAS FUER MAJIN ATTACKEN
 
 	$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[1] <= 0) {
-	$k_hp[1] = $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');