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

General fixes

Browse Source 
+Changed error control priority in the Armoury and Blacksmith
This commit is contained in:
iopietro
2018-06-06 02:25:49 +02:00
parent c9332ea67d
commit b7f958b203
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Build/12_upgrades.tpl
+4 -4
View File
@@ -40,6 +40,9 @@
if($abdata['b'.$j] == 20) { if($abdata['b'.$j] == 20) {
echo "<td class=\"act\"><div class=\"none\">".MAXIMUM_LEVEL."</div></td></tr>"; echo "<td class=\"act\"><div class=\"none\">".MAXIMUM_LEVEL."</div></td></tr>";
} }
else if ($building->getTypeLevel(12) <= $abdata['b'.$j]+$ups) {
echo "<td class=\"act\"><div class=\"none\">".UPGRADE_BLACKSMITH."</div></td></tr>";
}
else if(${'ab'.$i}[$abdata['b'.$j]+1+$ups]['wood'] > $village->maxstore || ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['clay'] > $village->maxstore || ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['iron'] > $village->maxstore) { else if(${'ab'.$i}[$abdata['b'.$j]+1+$ups]['wood'] > $village->maxstore || ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['clay'] > $village->maxstore || ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['iron'] > $village->maxstore) {
echo "<td class=\"act\"><div class=\"none\">".EXPAND_WAREHOUSE."</div></td></tr>"; echo "<td class=\"act\"><div class=\"none\">".EXPAND_WAREHOUSE."</div></td></tr>";
} }
@@ -54,10 +57,7 @@
echo "<br><span class=\"none\">".CROP_NEGATIVE."</span></div></td>"; echo "<br><span class=\"none\">".CROP_NEGATIVE."</span></div></td>";
} }
echo "<td class=\"act\"><div class=\"none\">".TOO_FEW_RESOURCES."</div></td></tr>"; echo "<td class=\"act\"><div class=\"none\">".TOO_FEW_RESOURCES."</div></td></tr>";
} }
else if ($building->getTypeLevel(12) <= $abdata['b'.$j]+$ups) {
echo "<td class=\"act\"><div class=\"none\">".UPGRADE_BLACKSMITH."</div></td></tr>";
}
else if ($totalUps == 1 && !$session->plus || $totalUps > 1) { else if ($totalUps == 1 && !$session->plus || $totalUps > 1) {
echo "<td class=\"act\"><div class=\"none\">".UPGRADE_IN_PROGRESS."</div></td></tr>"; echo "<td class=\"act\"><div class=\"none\">".UPGRADE_IN_PROGRESS."</div></td></tr>";
} }
Templates/Build/13_upgrades.tpl
+4 -4
View File
@@ -40,6 +40,9 @@
if($abdata['a'.$j] == 20) { if($abdata['a'.$j] == 20) {
echo "<td class=\"act\"><div class=\"none\">".MAXIMUM_LEVEL."</div></td></tr>"; echo "<td class=\"act\"><div class=\"none\">".MAXIMUM_LEVEL."</div></td></tr>";
} }
else if ($building->getTypeLevel(13) <= $abdata['a'.$j]+$ups) {
echo "<td class=\"act\"><div class=\"none\">".UPGRADE_ARMOURY."</div></td></tr>";
}
else if(${'ab'.$i}[$abdata['a'.$j]+1+$ups]['wood'] > $village->maxstore || ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['clay'] > $village->maxstore || ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['iron'] > $village->maxstore) { else if(${'ab'.$i}[$abdata['a'.$j]+1+$ups]['wood'] > $village->maxstore || ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['clay'] > $village->maxstore || ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['iron'] > $village->maxstore) {
echo "<td class=\"act\"><div class=\"none\">".EXPAND_WAREHOUSE."</div></td></tr>"; echo "<td class=\"act\"><div class=\"none\">".EXPAND_WAREHOUSE."</div></td></tr>";
} }
@@ -54,10 +57,7 @@
echo "<br><span class=\"none\">".CROP_NEGATIVE."</span></div></td>"; echo "<br><span class=\"none\">".CROP_NEGATIVE."</span></div></td>";
} }
echo "<td class=\"act\"><div class=\"none\">".TOO_FEW_RESOURCES."</div></td></tr>"; echo "<td class=\"act\"><div class=\"none\">".TOO_FEW_RESOURCES."</div></td></tr>";
} }
else if ($building->getTypeLevel(13) <= $abdata['a'.$j]+$ups) {
echo "<td class=\"act\"><div class=\"none\">".UPGRADE_ARMOURY."</div></td></tr>";
}
else if ($totalUps == 1 && !$session->plus || $totalUps > 1) { else if ($totalUps == 1 && !$session->plus || $totalUps > 1) {
echo "<td class=\"act\"><div class=\"none\">".UPGRADE_IN_PROGRESS."</div></td></tr>"; echo "<td class=\"act\"><div class=\"none\">".UPGRADE_IN_PROGRESS."</div></td></tr>";
} }