From 3a92381e358c213ccf434ab6d2fbe2d924b7f499 Mon Sep 17 00:00:00 2001 From: Shadowss Date: Mon, 9 Sep 2013 08:44:32 +0300 Subject: [PATCH] fix conquer oasis. Thanks to IngMak --- GameEngine/Database/db_MYSQL.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php index 88742d31..9f808f38 100644 --- a/GameEngine/Database/db_MYSQL.php +++ b/GameEngine/Database/db_MYSQL.php @@ -480,7 +480,14 @@ class MYSQL_DB { if($OasisInfo['conqured'] == 0 || $OasisInfo['conqured'] != 0 && $OasisInfo['loyalty'] < 99 / min(3,(4-$this->VillageOasisCount($OasisInfo['conqured']))) && $troopcount == 0) { $CoordsVillage = $this->getCoor($vref); $CoordsOasis = $this->getCoor($wref); - if(abs($CoordsOasis['x']-$CoordsVillage['x'])<=3 && abs($CoordsOasis['y']-$CoordsVillage['y'])<=3) { + $max = 2 * WORLD_MAX + 1; + $x1 = intval($CoordsOasis['x']); + $y1 = intval($CoordsOasis['y']); + $x2 = intval($CoordsVillage['x']); + $y2 = intval($CoordsVillage['y']); + $distanceX = min(abs($x2 - $x1), abs($max - abs($x2 - $x1))); + $distanceY = min(abs($y2 - $y1), abs($max - abs($y2 - $y1))); + if ($distanceX<=3 && $distanceY<=3) { return True; } else { return False;