xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-28 00:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: treasuries with artifacts must be destroyable, villages must not

Browse Source 
#425
This commit is contained in:
Martin Ambrus
2017-12-26 20:03:28 +01:00
parent 765914d863
commit 56680344ec
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+2 -22
View File
@@ -2309,20 +2309,6 @@ class Automation {
/**
* FIRST CATAPULTS ROW
*/
// first of all, update data if we're targetting a Treasury in village with an artefact,
// since such village (and its Treasury) cannot be destroyed until that artefact is
// removed... don't worry about Treasury levels here either, that can be taken care of
// once the artefact is gone
if ($hasArtefact && $data['ctar1'] == 27) {
$data['ctar1'] = 0;
}
if (isset($data['ctar2']) && $hasArtefact && $data['ctar2'] == 27) {
$data['ctar2'] = 0;
}
// on to targetting
$basearray = $data['to'];
$bdo = $database->getResourceLevel($basearray, false);
$catapultTarget = $data['ctar1'];
@@ -2378,10 +2364,7 @@ class Automation {
if ($i==41) $i=99;
if ($bdo['f'.$i] > 0 && $catapultTarget != 31 && $catapultTarget != 32 && $catapultTarget != 33)
{
// don't allow to randomly select Treasury if there's an artefact in it
if (!$hasArtefact || ($hasArtefact && $bdo['f'.$i.'t'] != 27)) {
$list[] = $i;
}
$list[] = $i;
}
}
$catapultTarget = $list[ rand(0, count($list) - 1) ];
@@ -2443,10 +2426,7 @@ class Automation {
if ($i==41) $i=99;
if ($bdo['f'.$i] > 0)
{
// don't allow to randomly select Treasury if there's an artefact in it
if (!$hasArtefact || ($hasArtefact && $bdo['f'.$i.'t'] != 27)) {
$list[] = $i;
}
$list[] = $i;
}
}
$catapultTarget2 = $list[ rand(0, count($list) - 1) ];