latest fixes (#1)

* fix: all languages added to installer

* fix: all languages added to installer and Admin

* fix: max crop/resources reset to level 1 value temporarily

This happened when level 1 granary / warehouse was built because of
a missing + sign in a formula.

#374
This commit is contained in:
Martin Ambrus
2017-11-27 16:35:30 +01:00
committed by GitHub
parent 761b2aaef4
commit 7bd9bc5d39
3 changed files with 18 additions and 16 deletions
+2 -2
View File
@@ -63,9 +63,9 @@ function refresh(tz) {
<option value="en" <?php if (LANG=="en") echo "selected";?>>English</option> <option value="en" <?php if (LANG=="en") echo "selected";?>>English</option>
<option value="nl" <?php if (LANG=="nl") echo "selected";?>>Dutch</option> <option value="nl" <?php if (LANG=="nl") echo "selected";?>>Dutch</option>
<option value="es" <?php if (LANG=="es") echo "selected";?>>Spain</option> <option value="es" <?php if (LANG=="es") echo "selected";?>>Spain</option>
<option value="my" <?php if (LANG=="my") echo "selected";?>>Malay</option> <option value="rs" <?php if (LANG=="rs") echo "selected";?>>Serbian</option>
<option value="ru" <?php if (LANG=="ru") echo "selected";?>>Russian</option> <option value="ru" <?php if (LANG=="ru") echo "selected";?>>Russian</option>
<option value="zh_tw" <?php if (LANG=="zh_tw") echo "selected";?>>Taiwan</option> <option value="zh_tw" <?php if (LANG=="zh_tw") echo "selected";?>>Taiwanese</option>
</select> </select>
</td> </td>
</tr> </tr>
+2 -3
View File
@@ -654,11 +654,10 @@ class Automation {
if ($level != 1) { if ($level != 1) {
$max -= ${'bid'.$indi['type']}[$level-1]['attri'] * STORAGE_MULTIPLIER; $max -= ${'bid'.$indi['type']}[$level-1]['attri'] * STORAGE_MULTIPLIER;
$max += ${'bid'.$indi['type']}[$level]['attri'] * STORAGE_MULTIPLIER;
} else {
$max = ${'bid'.$indi['type']}[$level]['attri'] * STORAGE_MULTIPLIER;
} }
$max += ${'bid'.$indi['type']}[$level]['attri'] * STORAGE_MULTIPLIER;
$fieldsToSet[$fieldDbName] = $max; $fieldsToSet[$fieldDbName] = $max;
} }
+3
View File
@@ -141,6 +141,9 @@ echo "<div class=\"headline\"><span class=\"f10 c5\">Error creating constant.php
<select name="lang"> <select name="lang">
<option value="en" selected="selected">English</option> <option value="en" selected="selected">English</option>
<option value="es">Spanish</option> <option value="es">Spanish</option>
<option value="rs">Serbian</option>
<option value="ru">Rusian</option>
<option value="zh_tw">Taiwanese</option>
</select> </select>
</td> </td>
</tr> </tr>