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

fix: prune methods to include storage multiplier

Browse Source 
Also, the updateStore() method does not need to concern itself with
villages without warehouses and granaries, as they have already been
tended by prune methods beforehead.
This commit is contained in:
Martin Ambrus
2017-11-15 22:17:11 +01:00
parent 38c4172a43
commit c7acc523ea
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+15 -22
View File
@@ -497,11 +497,11 @@ class Automation {
clay = IF(clay < 0, 0, clay), clay = IF(clay < 0, 0, clay),
iron = IF(iron < 0, 0, iron), iron = IF(iron < 0, 0, iron),
crop = IF(crop < 0, 0, crop), crop = IF(crop < 0, 0, crop),
maxstore = IF(maxstore < 800, 800, maxstore), maxstore = IF(maxstore < (800 * ".STORAGE_MULTIPLIER."), (800 * ".STORAGE_MULTIPLIER."), maxstore),
maxcrop = IF(maxcrop < 800, 800, maxcrop) maxcrop = IF(maxcrop < (800 * ".STORAGE_MULTIPLIER."), (800 * ".STORAGE_MULTIPLIER."), maxcrop)
WHERE WHERE
maxstore < 800 OR maxstore < (800 * ".STORAGE_MULTIPLIER.") OR
maxcrop < 800 OR maxcrop < (800 * ".STORAGE_MULTIPLIER.") OR
wood < 0 OR wood < 0 OR
clay < 0 OR clay < 0 OR
iron < 0 OR iron < 0 OR
@@ -518,11 +518,11 @@ class Automation {
clay = IF(clay < 0, 0, clay), clay = IF(clay < 0, 0, clay),
iron = IF(iron < 0, 0, iron), iron = IF(iron < 0, 0, iron),
crop = IF(crop < 0, 0, crop), crop = IF(crop < 0, 0, crop),
maxstore = IF(maxstore < 800, 800, maxstore), maxstore = IF(maxstore < (800 * ".STORAGE_MULTIPLIER."), (800 * ".STORAGE_MULTIPLIER."), maxstore),
maxcrop = IF(maxcrop < 800, 800, maxcrop) maxcrop = IF(maxcrop < (800 * ".STORAGE_MULTIPLIER."), (800 * ".STORAGE_MULTIPLIER."), maxcrop)
WHERE WHERE
maxstore < 800 OR maxstore < (800 * ".STORAGE_MULTIPLIER.") OR
maxcrop < 800 OR maxcrop < (800 * ".STORAGE_MULTIPLIER.") OR
wood < 0 OR wood < 0 OR
clay < 0 OR clay < 0 OR
iron < 0 OR iron < 0 OR
@@ -4323,12 +4323,9 @@ class Automation {
private function updateStore() { private function updateStore() {
global $bid10, $bid38, $bid11, $bid39; global $bid10, $bid38, $bid11, $bid39;
// first of all, update all max storage and max crop where it fell below 800
$result = mysqli_query($GLOBALS['link'],'SELECT * FROM `' . TB_PREFIX . 'fdata`'); $result = mysqli_query($GLOBALS['link'],'SELECT * FROM `' . TB_PREFIX . 'fdata`');
mysqli_begin_transaction($GLOBALS['link']) or die(mysqli_error($database->dblink)); mysqli_begin_transaction($GLOBALS['link']);
while ($row = mysqli_fetch_assoc($result)) while ($row = mysqli_fetch_assoc($result))
{ {
$ress = $crop = 0; $ress = $crop = 0;
@@ -4357,19 +4354,15 @@ class Automation {
} }
} }
if ($ress == 0) // no need for update, since we didn't find any warehouses or granaries
{ // and maximums would have been set to correct values inside prune* functions already
$ress = 800 * STORAGE_MULTIPLIER; if ($ress == 0 && $crop == 0) {
continue;
} }
if ($crop == 0) mysqli_query($GLOBALS['link'],'UPDATE `' . TB_PREFIX . 'vdata` SET `maxstore` = ' . (int) $ress . ', `maxcrop` = ' . (int) $crop . ' WHERE `wref` = ' . (int) $row['vref']);
{
$crop = 800 * STORAGE_MULTIPLIER;
}
mysqli_query($GLOBALS['link'],'UPDATE `' . TB_PREFIX . 'vdata` SET `maxstore` = ' . (int) $ress . ', `maxcrop` = ' . (int) $crop . ' WHERE `wref` = ' . (int) $row['vref']) or die(mysqli_error($database->dblink));
} }
mysqli_commit($GLOBALS['link']) or die(mysqli_error($database->dblink)); mysqli_commit($GLOBALS['link']);
} }
private function oasisResourcesProduce() { private function oasisResourcesProduce() {