From 5b9834139ba2a6576e0261f0a7ac2ef067fe7f95 Mon Sep 17 00:00:00 2001 From: radiskull Date: Fri, 1 Feb 2013 17:08:40 +0000 Subject: [PATCH] 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 | 18 +++++----- cronjob/kampf/hpmp.php | 42 ++++++++++++---------- cronjob/kampf/konter_heal.php | 16 +++++---- cronjob/kampf/lose2.php | 65 +++++++++++++++++++---------------- 4 files changed, 80 insertions(+), 61 deletions(-) diff --git a/cronjob/kampf/hp2.php b/cronjob/kampf/hp2.php index 4a30f29..1728a59 100644 --- a/cronjob/kampf/hp2.php +++ b/cronjob/kampf/hp2.php @@ -7,29 +7,31 @@ */ -####################KAMPF HP SPIELER 1 +####################KAMPF HP SPIELER 1 if ($technick1['type'] == "hp") { - $k_mp[0] = $k_mp[0] - $technick1['mp']; + $k_mp[0] = $k_mp[0] - $technick1['mp']; if ($k_mp[0] < 0) { $k_mp[0] = 0; $schaden_1 = 'Keine MP'; $aktion_AV1[$x] = 'nein'; - } else { - $tmp_hp[0] = (($k_hp1[1] / 100) * $technick1['hp']); + } else { + $tmp_hp[0] = (($k_hp1[1] / 100) * $technick1['hp']); + $tmp_hp[3] = true; $schaden_1 = '+' . $technick1['hp'] .'% HP'; $aktion_AV1[$x] = 'nein'; } } -####################KAMPF HP SPIELER 2 +####################KAMPF HP SPIELER 2 if ($technick2['type'] == 'hp') { - $k_mp[1] = $k_mp[1] - $technick2['mp']; + $k_mp[1] = $k_mp[1] - $technick2['mp']; if ($k_mp[1] < 0) { $k_mp[1] = 0; $schaden_2 = 'Keine MP'; $aktion_AV2[$x] = 'nein'; - } else { - $tmp_hp[1] = (($k_hp2[1] / 100) * $technick2['hp']); + } else { + $tmp_hp[1] = (($k_hp2[1] / 100) * $technick2['hp']); + $tmp_hp[2] = true; $schaden_2 = '+' . $technick2['hp'] .'% HP'; $aktion_AV2[$x] = 'nein'; } diff --git a/cronjob/kampf/hpmp.php b/cronjob/kampf/hpmp.php index e3eba2e..94d4c42 100644 --- a/cronjob/kampf/hpmp.php +++ b/cronjob/kampf/hpmp.php @@ -9,15 +9,18 @@ ####################KAMPF HPMP SPIELER 1 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']); -$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]; } - -$schaden_1 = "+ $technick1[hp]% HP/ $technick1[mp]% MP"; -$aktion_AV1[$x] = "nein"; + //$k_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]; + } + + $schaden_1 = "+ $technick1[hp]% HP/ $technick1[mp]% MP"; + $aktion_AV1[$x] = "nein"; } @@ -25,15 +28,18 @@ $aktion_AV1[$x] = "nein"; ####################KAMPF HPMP SPIELER 2 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']); -$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]; } - -$schaden_2 = "+ $technick2[hp]% HP/ $technick2[mp]% MP"; -$aktion_AV2[$x] = "nein"; + //$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]; + } + + $schaden_2 = "+ $technick2[hp]% HP/ $technick2[mp]% MP"; + $aktion_AV2[$x] = "nein"; } ?> diff --git a/cronjob/kampf/konter_heal.php b/cronjob/kampf/konter_heal.php index 5136e95..99e03da 100644 --- a/cronjob/kampf/konter_heal.php +++ b/cronjob/kampf/konter_heal.php @@ -23,9 +23,11 @@ if ($technick1['type'] == "konterhp") { $aktion_AV1[$x] = "nein"; } } else { - $k_hp[1] = $k_hp[1] + $tmp_hp[1]; - if ($k_hp2[1] < $k_hp[1]) { - $k_hp[1] = $k_hp2[1]; + 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]; + } } } @@ -46,9 +48,11 @@ if ($technick2['type'] == "konterhp") { $aktion_AV2[$x] = "nein"; } } else { - $k_hp[0] = $k_hp[0] + $tmp_hp[0]; - if ($k_hp1[1] < $k_hp[0]) { - $k_hp[0] = $k_hp1[1]; + 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]; + } } } diff --git a/cronjob/kampf/lose2.php b/cronjob/kampf/lose2.php index 55ce544..fb262f9 100644 --- a/cronjob/kampf/lose2.php +++ b/cronjob/kampf/lose2.php @@ -1,44 +1,51 @@ = mt_rand(1,100)) { -$schaden_1 = "Schwächen"; -$k_mp[1] = ($k_mp2[1] / 100) * 20; -} else { -$schaden_1 = "Schwächen fehlgeschlagen"; -} -} -$aktion_AV1[$x] = "nein"; +if($technick1['type'] == 'lose2') { + $k_mp[0] = $k_mp[0] - $technick1['mp']; + if($k_mp[0] < 0) { + $schaden_1 = 'Schwächen fehlgeschlagen'; + $k_mp[0] = 0; + } else { + if($technick1['starke'] >= mt_rand(1,100)) { + $schaden_1 = 'Schwächen'; + $k_mp[1] -= $k_mp2[1] * 0.8; + if($k_mp[1] < 0) { + $k_mp[1] = 0; + } + } else { + $schaden_1 = 'Schwächen fehlgeschlagen'; + } + } + $aktion_AV1[$x] = 'nein'; } ####################KAIOKEN-LOSE SPIELER 2 -if($technick2[type] == "lose2") { -$k_mp[1] = $k_mp[1] - $technick2[mp]; -if($k_mp[1] < 0) { -$schaden_2 = "Schwächen fehlgeschlagen"; -$k_mp[1] = 0; -} else { +if($technick2['type'] == 'lose2') { + $k_mp[1] = $k_mp[1] - $technick2['mp']; + if($k_mp[1] < 0) { + $schaden_2 = 'Schwächen fehlgeschlagen'; + $k_mp[1] = 0; + } else { -if($technick2[starke] >= mt_rand(1,100)) { -$schaden_2 = "Schwächen"; -$k_mp[0] = ($k_mp1[1] / 100) * 20; -} else { -$schaden_2 = "Schwächen fehlgeschlagen"; + if($technick2['starke'] >= mt_rand(1,100)) { + $schaden_2 = 'Schwächen'; + $k_mp[0] -= $k_mp1[1] * 0.8; + if($k_mp[0] < 0) { + $k_mp[0] = 0; + } + } else { + $schaden_2 = 'Schwächen fehlgeschlagen'; -} -} -$aktion_AV2[$x] = "nein"; + } + } + $aktion_AV2[$x] = 'nein'; } ?>