Fixed #125

Fixed Lose2 now the same as in normal fights (mp won't be set to 20%)
Fixed hpmp and heals properly

cronjob/kampf/hp2.php

@@ -16,6 +16,7 @@ if ($technick1['type'] == "hp") {
 		$aktion_AV1[$x] = 'nein';
 	} else {
 		$tmp_hp[0] = (($k_hp1[1] / 100) * $technick1['hp']);
+		$tmp_hp[3] = true;
 		$schaden_1 = '+' . $technick1['hp'] .'% HP';
 		$aktion_AV1[$x] = 'nein';
 	}
@@ -30,6 +31,7 @@ if ($technick2['type'] == 'hp') {
 		$aktion_AV2[$x] = 'nein';
 	} else {
 		$tmp_hp[1] = (($k_hp2[1] / 100) * $technick2['hp']);
+		$tmp_hp[2] = true;
 		$schaden_2 = '+' . $technick2['hp'] .'% HP';
 		$aktion_AV2[$x] = 'nein';
 	}

cronjob/kampf/hpmp.php

@@ -10,11 +10,14 @@
 if($technick1['type'] == "hpmp") {
 
 	//$k_hp[0] = $k_hp[0] + (($k_hp1[1] / 100) * $technick1[hp]);
-$tmp_hp[0] = $k_hp[0] + (($k_hp1[1] / 100) * $technick1['hp']);
+	$tmp_hp[0] = (($k_hp1[1] / 100) * $technick1['hp']);
+	$tmp_hp[3] = true;
 	$k_mp[0] = $k_mp[0] + (($k_mp1[1] / 100) * $technick1['mp']);
 
 	//if($k_hp1[1] < $k_hp[0]) { $k_hp[0] = $k_hp1[1]; }
-if($k_mp1[1] < $k_mp[0]) { $k_mp[0] = $k_mp1[1]; } 
+	if($k_mp1[1] < $k_mp[0]) {
+		$k_mp[0] = $k_mp1[1];
+	}
 
 	$schaden_1 = "+ $technick1[hp]% HP/ $technick1[mp]% MP";
 	$aktion_AV1[$x] = "nein";
@@ -27,10 +30,13 @@ $aktion_AV1[$x] = "nein";
 if($technick2['type'] == "hpmp") {
 	//$k_hp[1] = $k_hp[1] + (($k_hp2[1] / 100) * $technick2[hp]);
 	$tmp_hp[1] = (($k_hp2[1] / 100) * $technick2['hp']);
+	$tmp_hp[2] = true;
 	$k_mp[1] = $k_mp[1] + (($k_mp2[1] / 100) * $technick2['mp']);
 
 	//if($k_hp2[1] < $k_hp[1]) { $k_hp[1] = $k_hp2[1]; }
-if($k_mp2[1] < $k_mp[1]) { $k_mp[1] = $k_mp2[1]; } 
+	if($k_mp2[1] < $k_mp[1]) {
+		$k_mp[1] = $k_mp2[1];
+	}
 
 	$schaden_2 = "+ $technick2[hp]% HP/ $technick2[mp]% MP";
 	$aktion_AV2[$x] = "nein";

cronjob/kampf/konter_heal.php

@@ -23,11 +23,13 @@ if ($technick1['type'] == "konterhp") {
 		$aktion_AV1[$x] = "nein";
 	}
 } else {
+	if($tmp_hp[2] == true) {
 		$k_hp[1] = $k_hp[1] + $tmp_hp[1];
 		if ($k_hp2[1] < $k_hp[1]) {
 			$k_hp[1] = $k_hp2[1];
 		}
 	}
+}
 
 ####################KAMPF HP SPIELER 2
 
@@ -46,10 +48,12 @@ if ($technick2['type'] == "konterhp") {
 		$aktion_AV2[$x] = "nein";
 	}
 } else {
+	if($tmp_hp[3] == true) {
 		$k_hp[0] = $k_hp[0] + $tmp_hp[0];
 		if ($k_hp1[1] < $k_hp[0]) {
 			$k_hp[0] = $k_hp1[1];
 		}
 	}
+}
 
 ?>

cronjob/kampf/lose2.php

@@ -1,44 +1,51 @@
 <?php
 /*
  *
- * @copyright (c) 2010 animegame.eu
+ * @copyright (c) 2009 animegame.eu
  * @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public Licence
  *
  */
+
 ####################KAIOKEN-LOSE SPIELER 1
 
-if($technick1[type] == "lose2") {
-$k_mp[0] = $k_mp[0] - $technick1[mp];
+if($technick1['type'] == 'lose2') {
+	$k_mp[0] = $k_mp[0] - $technick1['mp'];
 	if($k_mp[0] < 0) {
-$schaden_1 = "Schw&auml;chen fehlgeschlagen";
+		$schaden_1 = 'Schw&auml;chen fehlgeschlagen';
 		$k_mp[0] = 0;
 	} else {
-if($technick1[starke] >= mt_rand(1,100)) {
-$schaden_1 = "Schw&auml;chen";
-$k_mp[1] = ($k_mp2[1] / 100) * 20; 
+		if($technick1['starke'] >= mt_rand(1,100)) {
+			$schaden_1 = 'Schw&auml;chen';
+			$k_mp[1] -= $k_mp2[1] * 0.8;
+			if($k_mp[1] < 0) {
+				$k_mp[1] = 0;
+			}
 		} else {
-$schaden_1 = "Schw&auml;chen fehlgeschlagen";
+			$schaden_1 = 'Schw&auml;chen fehlgeschlagen';
 		}
 	}
-$aktion_AV1[$x] = "nein";
+	$aktion_AV1[$x] = 'nein';
 }
 ####################KAIOKEN-LOSE SPIELER 2
 
-if($technick2[type] == "lose2") {
-$k_mp[1] = $k_mp[1] - $technick2[mp];
+if($technick2['type'] == 'lose2') {
+	$k_mp[1] = $k_mp[1] - $technick2['mp'];
 	if($k_mp[1] < 0) {
-$schaden_2 = "Schw&auml;chen fehlgeschlagen";
+		$schaden_2 = 'Schw&auml;chen fehlgeschlagen';
 		$k_mp[1] = 0;
 	} else {
 
-if($technick2[starke] >= mt_rand(1,100)) {
-$schaden_2 = "Schw&auml;chen";
-$k_mp[0] = ($k_mp1[1] / 100) * 20; 
+		if($technick2['starke'] >= mt_rand(1,100)) {
+			$schaden_2 = 'Schw&auml;chen';
+			$k_mp[0] -= $k_mp1[1] * 0.8;
+			if($k_mp[0] < 0) {
+				$k_mp[0] = 0;
+			}
 		} else {
-$schaden_2 = "Schw&auml;chen fehlgeschlagen";
+			$schaden_2 = 'Schw&auml;chen fehlgeschlagen';
 
 		}
 	}
-$aktion_AV2[$x] = "nein";
+	$aktion_AV2[$x] = 'nein';
 }
 ?>