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

Fix demolish #337

Browse Source 
Fix demolish #337
This commit is contained in:
novgorodschi catalin
2026-07-24 18:16:53 +03:00
parent 15a18a1e21
commit a7817f9631
4 changed files with 181 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation/AutomationBuildQueue.php
+12 -17
View File
@@ -210,23 +210,14 @@ trait AutomationBuildQueue {
$buildarray = $GLOBALS["bid".$type];
if ($type == 10 || $type == 38) {
$database->query("
UPDATE ".TB_PREFIX."vdata
SET
`maxstore` = IF(`maxstore` - ".$buildarray[$level]['attri']." <= ".STORAGE_BASE.", ".STORAGE_BASE.", `maxstore` - ".$buildarray[$level]['attri'].")
WHERE
wref=".(int) $vil['vref']);
}
if ($type == 11 || $type == 39) {
$database->query("
UPDATE ".TB_PREFIX."vdata
SET
`maxcrop` = IF(`maxcrop` - ".$buildarray[$level]['attri']." <= ".STORAGE_BASE.", ".STORAGE_BASE.", `maxcrop` - ".$buildarray[$level]['attri'].")
WHERE
wref=".(int) $vil['vref']);
}
// FIX: capacitatea de depozitare se RECALCULEAZA din cladirile
// ramase, dupa ce nivelul nou e scris mai jos. Scaderea de
// dinainte lua `attri` al nivelului, dar `attri` e capacitatea
// TOTALA la acel nivel (1200, 1700, 2300...), nu incrementul -
// deci taia prea mult. Ignora si STORAGE_MULTIPLIER. Efectul era
// ascuns de pragul STORAGE_BASE si "reparat" abia la urmatoarea
// rulare a lui updateStore().
$needsStorageRecalc = in_array($type, [10, 11, 38, 39]);
if ($level == 1) $clear = ",f".$vil['buildnumber']."t=0";
else $clear = "";
@@ -235,6 +226,10 @@ trait AutomationBuildQueue {
$q = "UPDATE ".TB_PREFIX."fdata SET f".$vil['buildnumber']."=".$newLevel." ".$clear." WHERE vref=".(int)$vil['vref'];
$database->query($q);
if ($needsStorageRecalc) {
$database->recalculateStorage($vil['vref']);
}
$pop = $this->getPop($type, $newLevel);
$database->modifyPop($vil['vref'], $pop[0], 1);
$this->procClimbers($database->getVillageField($vil['vref'], 'owner'));
GameEngine/Database/DatabaseVillageQueries.php
+76
View File
@@ -1675,6 +1675,82 @@ trait DatabaseVillageQueries {
return $result;
}
/**
* Recalculeaza capacitatea de depozitare a unui sat din cladirile lui.
*
* Aceeasi regula ca recalcularea periodica din Automation::updateStore():
* se aduna `attri` * STORAGE_MULTIPLIER pentru fiecare depozit/hambar
* (normal si mare) din sloturile f19..f39, cu prag minim STORAGE_BASE.
*
* De ce recalculare, nu scadere incrementala: `attri` este capacitatea
* TOTALA la acel nivel (1200, 1700, 2300...), nu incrementul. Scaderea
* folosita la demolare lua toata valoarea nivelului si ignora si
* STORAGE_MULTIPLIER, deci taia prea mult - efect mascat de pragul minim.
* Recalcularea nu poate ramane in urma, indiferent ce s-a schimbat.
*/
function recalculateStorage($wid) {
$wid = (int) $wid;
global $bid10, $bid11, $bid38, $bid39;
$fdata = $this->getResourceLevel($wid, false);
if (!$fdata) {
return false;
}
$multiplier = defined('STORAGE_MULTIPLIER') ? STORAGE_MULTIPLIER : 1;
$base = defined('STORAGE_BASE') ? STORAGE_BASE : 0;
$store = 0;
$crop = 0;
$map = array(
10 => array('store', $bid10),
38 => array('store', $bid38),
11 => array('crop', $bid11),
39 => array('crop', $bid39),
);
for ($i = 19; $i < 40; $i++) {
$type = isset($fdata['f' . $i . 't']) ? (int) $fdata['f' . $i . 't'] : 0;
$level = isset($fdata['f' . $i]) ? (int) $fdata['f' . $i] : 0;
if (!isset($map[$type]) || $level <= 0) {
continue;
}
list($target, $data) = $map[$type];
if (!isset($data[$level]['attri'])) {
continue;
}
$amount = $data[$level]['attri'] * $multiplier;
if ($target === 'store') {
$store += $amount;
} else {
$crop += $amount;
}
}
if ($store < $base) { $store = $base; }
if ($crop < $base) { $crop = $base; }
$result = mysqli_query(
$this->dblink,
"UPDATE " . TB_PREFIX . "vdata
SET maxstore = " . (int) $store . ", maxcrop = " . (int) $crop . "
WHERE wref = " . $wid
);
// randul de sat s-a schimbat: urmatoarea citire trebuie sa vina din DB
unset(self::$villageFieldsCache[$wid . '0'], self::$villageFieldsCache[$wid . '3']);
return $result;
}
function modifyPop($vid, $pop, $mode) {
list($vid, $pop, $mode) = $this->escape_input((int) $vid, (int) $pop, $mode);