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

Merge pull request #51 from Fannybaws/ArtefactCaptureCapital

Browse Source 
Artefact capture from capital
This commit is contained in:
Shadow
2014-01-04 06:00:05 -08:00
parent cc6462f555 22b6722ed2
commit afdbf9905d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+1 -1
View File
@@ -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;
}
GameEngine/Database/db_MYSQL.php
+8 -7
View File
@@ -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;