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

Fixed some bugs

Browse Source 
+Level upgrades in Blacksmith and Armoury are now shown correctly
+Corrected a typo
+Upgrades in the Blacksmith and the Armoury should be ordered correctly
This commit is contained in:
iopietro
2018-04-07 23:15:23 +02:00
parent 0132af4611
commit d236a21d38
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Database.php
+1 -1
View File
@@ -6014,7 +6014,7 @@ References: User ID/Message ID, Mode
return $cachedValue; return $cachedValue;
} }
$q = "SELECT * FROM " . TB_PREFIX . "research where vref = $vid"; $q = "SELECT * FROM " . TB_PREFIX . "research where vref = $vid ORDER BY timestamp ASC";
$result = mysqli_query($this->dblink,$q); $result = mysqli_query($this->dblink,$q);
$researchingCache[$vid] = $this->mysqli_fetch_all($result); $researchingCache[$vid] = $this->mysqli_fetch_all($result);
return $researchingCache[$vid]; return $researchingCache[$vid];
GameEngine/Lang/en.php
+1 -1
View File
@@ -63,7 +63,7 @@ define("LOGIN_PASS_EMPTY","Enter password.");
define("EMAIL_ERROR","Email does not match existing"); define("EMAIL_ERROR","Email does not match existing");
define("PASS_MISMATCH","Passwords do not match"); define("PASS_MISMATCH","Passwords do not match");
define("ALLI_OWNER","Please appoint an alliance owner before deleting"); define("ALLI_OWNER","Please appoint an alliance owner before deleting");
define("SIT_ERROR","Sitter already set or player inexistent"); define("SIT_ERROR","Sitter already set or player not found");
define("USR_NT_FOUND","Name does not exist."); define("USR_NT_FOUND","Name does not exist.");
define("LOGIN_PW_ERROR","The password is wrong."); define("LOGIN_PW_ERROR","The password is wrong.");
define("WEL_TOPIC","Useful tips & information "); define("WEL_TOPIC","Useful tips & information ");
Templates/Build/12_upgrades.tpl
+4 -2
View File
@@ -82,9 +82,11 @@
</thead><tbody>"; </thead><tbody>";
$timer = 1; $timer = 1;
foreach($ABups as $black) { foreach($ABups as $black) {
$unit = ($session->tribe-1)*10 + substr($black['tech'],1,2); $ABUnit = substr($black['tech'],1,2);
$abdata['b'.$ABUnit]++;
$unit = ($session->tribe-1)*10 + $ABUnit;
echo "<tr><td class=\"desc\"><img class=\"unit u$unit\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($unit)."\" title=\"".$technology->getUnitName($unit)."\" />".$technology->getUnitName($unit); echo "<tr><td class=\"desc\"><img class=\"unit u$unit\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($unit)."\" title=\"".$technology->getUnitName($unit)."\" />".$technology->getUnitName($unit);
echo "<span class=\"none\"> (".LEVEL." ".($timer+$ups).")</span>"; echo "<span class=\"none\"> (".LEVEL." ".$abdata['b'.$ABUnit].")</span>";
if($timer > 1) echo "<span class=\"none\"> ".WAITING."</span>"; if($timer > 1) echo "<span class=\"none\"> ".WAITING."</span>";
echo "</td>"; echo "</td>";
echo "<td class=\"dur\"><span id=\"timer$timer\">".$generator->getTimeFormat($black['timestamp']-time())."</span></td>"; echo "<td class=\"dur\"><span id=\"timer$timer\">".$generator->getTimeFormat($black['timestamp']-time())."</span></td>";
Templates/Build/13_upgrades.tpl
+4 -2
View File
@@ -82,9 +82,11 @@
</thead><tbody>"; </thead><tbody>";
$timer = 1; $timer = 1;
foreach($ABups as $arms) { foreach($ABups as $arms) {
$unit = ($session->tribe-1)*10 + substr($arms['tech'],1,2); $ABUnit = substr($arms['tech'],1,2);
$abdata['a'.$ABUnit]++;
$unit = ($session->tribe-1)*10 + $ABUnit;
echo "<tr><td class=\"desc\"><img class=\"unit u$unit\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($unit)."\" title=\"".$technology->getUnitName($unit)."\" />".$technology->getUnitName($unit); echo "<tr><td class=\"desc\"><img class=\"unit u$unit\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($unit)."\" title=\"".$technology->getUnitName($unit)."\" />".$technology->getUnitName($unit);
echo "<span class=\"none\"> (".LEVEL." ".($timer+$ups).")</span>"; echo "<span class=\"none\"> (".LEVEL." ".$abdata['a'.$ABUnit].")</span>";
if($timer > 1) echo "<span class=\"none\"> ".WAITING."</span>"; if($timer > 1) echo "<span class=\"none\"> ".WAITING."</span>";
echo "</td>"; echo "</td>";
echo "<td class=\"dur\"><span id=\"timer$timer\">".$generator->getTimeFormat($arms['timestamp']-time())."</span></td>"; echo "<td class=\"dur\"><span id=\"timer$timer\">".$generator->getTimeFormat($arms['timestamp']-time())."</span></td>";