diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 21b8eac3..22f22c99 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -963,7 +963,8 @@ class Automation { if($enforce['u'.$i]>'0'){ $database->modifyEnforce($enforce['id'],$i,round($battlepart[2]*$enforce['u'.$i]),0); $dead[$i]+=round($battlepart[2]*$enforce['u'.$i]); - if($dead[$i]!=$enforce['u'.$i]){ + $checkpoint=round($battlepart[2]*$enforce['u'.$i]); + if($checkpoint!=$enforce['u'.$i]){ $wrong='1'; } } else { diff --git a/GameEngine/Battle.php b/GameEngine/Battle.php index 3cdcb5a9..d714fa8d 100644 --- a/GameEngine/Battle.php +++ b/GameEngine/Battle.php @@ -430,12 +430,13 @@ class Battle { $moralbonus = 1.0; } - if($involve >= 1000) { - $Mfactor = round(2*(1.8592-pow($involve,0.015)),4); - } - else { - $Mfactor = 1.5; - } + if($involve >= 1000) { + $Mfactor = round(2*(1.8592-pow($involve,0.015)),4); + } + else { + $Mfactor = 1.5; + } + if ($Mfactor < 1.25778){$Mfactor=1.25778;}elseif ($Mfactor > 1.5){$Mfactor=1.5;} // Formule voor het berekenen verloren drives // $type = 1 Raid, 0 Normal if($type == 1) diff --git a/GameEngine/Protection.php b/GameEngine/Protection.php index 63457498..143b200d 100644 --- a/GameEngine/Protection.php +++ b/GameEngine/Protection.php @@ -21,4 +21,9 @@ $_GET = array_map('mysql_real_escape_string', $_GET); $_GET = array_map('htmlspecialchars', $_GET); $_COOKIE = array_map('mysql_real_escape_string', $_COOKIE); $_COOKIE = array_map('htmlspecialchars', $_COOKIE); + +$rsargs=$_GET['rsargs']; +$_GET = array_map('mysql_real_escape_string', $_GET); +$_GET = array_map('htmlspecialchars', $_GET); +$_GET['rsargs']=$rsargs; ?> \ No newline at end of file