From 17d042aa22d069a2a2e0d0d65f25e582bbb4d23a Mon Sep 17 00:00:00 2001 From: KFCSpike Date: Sat, 4 Jan 2014 13:40:38 +0000 Subject: [PATCH 1/2] Allow Capital to capture artefact --- GameEngine/Database/db_MYSQL.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php index 1cd3ee44..4e40a5e6 100644 --- a/GameEngine/Database/db_MYSQL.php +++ b/GameEngine/Database/db_MYSQL.php @@ -3303,13 +3303,14 @@ class MYSQL_DB { $form->addError("error","Max num. of great/unique artefacts. Your hero could not claim the artefact and"); return FALSE; } - if (($type == 1 && ($villageartifact || $accountartifact)) || (($type == 2 || $type == 3)&& $accountartifact)) { - if($this->getVillageField($from,"capital")==1) { - $form->addError("error","Ancient Construction Plan cannot kept in capital village"); - return FALSE; - }else{ - return TRUE; - } + if (($type == 1 && ($villageartifact || $accountartifact)) || (($type == 2 || $type == 3)&& $accountartifact)){ + return TRUE; +// if($this->getVillageField($from,"capital")==1) { +// $form->addError("error","Ancient Construction Plan cannot kept in capital village"); +// return FALSE; +// }else{ +// return TRUE; +// } } else { $form->addError("error","Your level treasury is low. Your hero could not claim the artefact"); return FALSE; From 22b6722ed2d97907997ba95ef99ab8cd438c41ba Mon Sep 17 00:00:00 2001 From: KFCSpike Date: Sat, 4 Jan 2014 13:41:35 +0000 Subject: [PATCH 2/2] Fix typo --- GameEngine/Automation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index baaf5743..c0782e9b 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -2483,7 +2483,7 @@ class Automation { if ($type=='3') { if ($database->canClaimArtifact($data['from'],$artifact['vref'],$artifact['size'],$artifact['type'])) { $database->claimArtefact($data['from'],$data['to'],$database->getVillageField($data['from'],"owner")); - $info_hero = $hero_pic.",Your hero is carrying home a artefact".$xp; + $info_hero = $hero_pic.",Your hero is carrying home an artefact".$xp; } else { $info_hero = $hero_pic.",".$form->getError("error").$xp; }