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

refactor: get and set multiple fields at once

Browse Source
This commit is contained in:
Martin Ambrus
2017-11-08 17:46:18 +01:00
parent d7c38c7c39
commit 159de207c9
2 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+18 -11
View File
@@ -586,6 +586,8 @@ class Automation {
// IDs of villages that were affected by this building completion update,
// used to calculate statistical data at the end
$villagesAffected = [];
// IDs of owners for each village we process
$villageOwners = [];
// tribes for owner IDs, in case we have one owner that finished building
// in multiple villages, so we don't have to select their tribe in every
// foreach cycle
@@ -608,9 +610,12 @@ class Automation {
// complete each of them
foreach($res as $indi) {
// store village ID for later for statistical updates
$villageData = $database->getVillageFields($indi['wid'],'owner, maxcrop, maxstore, starv, pop');
$villageOwner = $villageData['owner'];
$villageOwners[$indi['wid']] = $villageOwner;
$villagesAffected[] = (int) $indi['wid'];
$level = $database->getFieldLevel($indi['wid'],$indi['field']);
$villageOwner = $database->getVillageField($indi['wid'],"owner");
$fieldsToSet = [];
if (!isset($ownersToTribes[$villageOwner])) {
$ownersToTribes[$villageOwner] = $database->getUserField($villageOwner, "tribe", 0);
@@ -632,7 +637,7 @@ class Automation {
// update capacity if we updated a warehouse or a granary
if (in_array($indi['type'], [10, 11, 38, 39])) {
$fieldDbName = (in_array($indi['type'], [10, 38]) ? 'maxstore' : 'maxcrop');
$max = $database->getVillageField($indi['wid'], $fieldDbName);
$max = $villageData[$fieldDbName];
if($level == 1 && $max == STORAGE_BASE) {
$max=STORAGE_BASE;
@@ -645,7 +650,7 @@ class Automation {
$max = ${'bid'.$indi['type']}[$level]['attri'] * STORAGE_MULTIPLIER;
}
$database->setVillageField($indi['wid'], $fieldDbName, $max);
$fieldsToSet[$fieldDbName] = $max;
}
// if we updated Embassy, update maximum members that the alliance can take
@@ -681,22 +686,24 @@ class Automation {
$crop = $database->getCropProdstarv($indi['wid']);
$unitarrays = $this->getAllUnits($indi['wid']);
$village = $database->getVillage($indi['wid']);
$upkeep = $village['pop'] + $this->getUpkeep($unitarrays, 0);
$starv = $database->getVillageField($indi['wid'],"starv");
if ($crop < $upkeep){
$upkeep = $villageData['pop'] + $this->getUpkeep($unitarrays, 0);
$starv = $villageData["starv"];
if ($crop < $upkeep) {
// add starv data
$database->setVillageField($indi['wid'], 'starv', $upkeep);
$fieldsToSet['starv'] = $upkeep;
if($starv==0){
$database->setVillageField($indi['wid'], 'starvupdate', $time);
$fieldsToSet['starvupdate'] = $time;
}
}
// update the requested fields, all at once
$database->setVillageFields($indi['wid'], array_keys($fieldsToSet), array_values($fieldsToSet));
}
// update statistical data andfor affected villages
// update statistical data for affected villages
foreach ($villagesAffected as $affected_id) {
$this->recountPop( $affected_id );
$this->procClimbers( $database->getVillageField( $affected_id, 'owner' ) );
$this->procClimbers( $villageOwners[$affected_id] );
}
// update data that can be done in one swoop instead of using multiple update queries
GameEngine/Database.php
+23
View File
@@ -1177,6 +1177,16 @@ class MYSQLi_DB implements IDbConnection {
}else return 0;
}
function getVillageFields($ref, $fields) {
list($ref, $field) = $this->escape_input((int) $ref, $fields);
$q = "SELECT $field FROM " . TB_PREFIX . "vdata where wref = $ref";
$result = mysqli_query($this->dblink,$q);
if($result) {
return mysqli_fetch_array($result, MYSQLI_ASSOC);
} else return 0;
}
function getOasisField($ref, $field) {
list($ref, $field) = $this->escape_input((int) $ref, $field);
@@ -1193,6 +1203,19 @@ class MYSQLi_DB implements IDbConnection {
return mysqli_query($this->dblink,$q);
}
function setVillageFields($ref, $fields, $values) {
list($ref, $field, $value) = $this->escape_input((int) $ref, $fields, $values);
// build the field-value query parts
$fieldValues = [];
foreach ($fields as $id => $fieldName) {
$fieldValues[] = $fieldName.' = '.((Math::isInt($values[$id]) || Math::isFloat($values[$id])) ? $values[$id] : '"'.$this->escape($values[$id]).'"');
}
$q = "UPDATE " . TB_PREFIX . "vdata set ".implode(', ', $fieldValues)." where wref = $ref";
return mysqli_query($this->dblink,$q);
}
function setVillageLevel($ref, $field, $value) {
list($ref, $field, $value) = $this->escape_input((int) $ref, $field, $value);