xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-17 16:51:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed units doubling when evasion is active

Browse Source
This commit is contained in:
AL-Kateb
2017-12-27 10:23:57 +00:00
parent f5c8b858d9
commit 4d00b4ad1c
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+17 -2
View File
@@ -1357,6 +1357,15 @@ class Automation {
} }
// modify units in DB // modify units in DB
$database->modifyUnit($data['to'], $evasionUnitModifications_units, $evasionUnitModifications_amounts, $evasionUnitModifications_modes); $database->modifyUnit($data['to'], $evasionUnitModifications_units, $evasionUnitModifications_amounts, $evasionUnitModifications_modes);
} }
//get defence units //get defence units
@@ -2915,6 +2924,7 @@ class Automation {
['99', '99o'], ['99', '99o'],
[$newtraps, $mytroops+$anothertroops], [$newtraps, $mytroops+$anothertroops],
[0, 0] [0, 0]
); );
$trapper_pic = "<img src=\"".GP_LOCATE."img/u/98.gif\" alt=\"Trap\" title=\"Trap\" />"; $trapper_pic = "<img src=\"".GP_LOCATE."img/u/98.gif\" alt=\"Trap\" title=\"Trap\" />";
$p_username = $database->getUserField($from['owner'],"username",0); $p_username = $database->getUserField($from['owner'],"username",0);
@@ -3120,15 +3130,19 @@ class Automation {
} }
unset($crop,$unitarrays,$getvillage,$village_upkeep); unset($crop,$unitarrays,$getvillage,$village_upkeep);
} }
//Returning units back to village is not necessary because it will be taken care when processing movement
// Fix by AL-Kateb
// if evasion was active, return units back to base // if evasion was active, return units back to base
if (isset($evaded)) { /*
if (isset($evaded)) {
foreach ($evasionUnitModifications_modes as $index => $mode) { foreach ($evasionUnitModifications_modes as $index => $mode) {
$evasionUnitModifications_modes[$index] = 1; $evasionUnitModifications_modes[$index] = 1;
} }
$database->modifyUnit($data['to'], $evasionUnitModifications_units, $evasionUnitModifications_amounts, $evasionUnitModifications_modes); $database->modifyUnit($data['to'], $evasionUnitModifications_units, $evasionUnitModifications_amounts, $evasionUnitModifications_modes);
} }
*/
################################################# #################################################
################FIXED BY SONGER################ ################FIXED BY SONGER################
@@ -3687,6 +3701,7 @@ class Automation {
array($u."1",$u."2",$u."3",$u."4",$u."5",$u."6",$u."7",$u."8",$u."9",$tribe."0","hero"), array($u."1",$u."2",$u."3",$u."4",$u."5",$u."6",$u."7",$u."8",$u."9",$tribe."0","hero"),
array($data['t1'],$data['t2'],$data['t3'],$data['t4'],$data['t5'],$data['t6'],$data['t7'],$data['t8'],$data['t9'],$data['t10'],$data['t11']), array($data['t1'],$data['t2'],$data['t3'],$data['t4'],$data['t5'],$data['t6'],$data['t7'],$data['t8'],$data['t9'],$data['t10'],$data['t11']),
array(1,1,1,1,1,1,1,1,1,1,1) array(1,1,1,1,1,1,1,1,1,1,1)
); );
$movementProcIDs[] = $data['moveid']; $movementProcIDs[] = $data['moveid'];
$crop = $database->getCropProdstarv($data['to']); $crop = $database->getCropProdstarv($data['to']);