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

latest fixes (#1)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
Admin/Templates/editServerSet.tpl
+7 -7
View File
@@ -63,12 +63,12 @@ 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>
<tr> <tr>
<td>Server Speed</td> <td>Server Speed</td>
<td><input class="fm" name="speed" value="<?php echo SPEED;?>" style="width: 20%;"></td> <td><input class="fm" name="speed" value="<?php echo SPEED;?>" style="width: 20%;"></td>
@@ -76,7 +76,7 @@ function refresh(tz) {
<tr> <tr>
<td>Troop Speed</td> <td>Troop Speed</td>
<td><input class="fm" name="incspeed" value="<?php echo INCREASE_SPEED;?>" style="width: 20%;"></td> <td><input class="fm" name="incspeed" value="<?php echo INCREASE_SPEED;?>" style="width: 20%;"></td>
</tr> </tr>
<td>Evasion Speed</td> <td>Evasion Speed</td>
<td><input class="fm" name="evasionspeed" value="<?php echo EVASION_SPEED;?>" style="width: 20%;"></td> <td><input class="fm" name="evasionspeed" value="<?php echo EVASION_SPEED;?>" style="width: 20%;"></td>
</tr> </tr>
@@ -129,7 +129,7 @@ function refresh(tz) {
<option value="432000" <?php if (PROTECTION=="432000") echo "selected";?>>120 hours (5 days)</option> <option value="432000" <?php if (PROTECTION=="432000") echo "selected";?>>120 hours (5 days)</option>
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Register Open</td> <td>Register Open</td>
<td> <td>
@@ -148,7 +148,7 @@ function refresh(tz) {
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Quest</td> <td>Quest</td>
<td> <td>
<select name="quest"> <select name="quest">
@@ -214,7 +214,7 @@ function refresh(tz) {
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Tourn Threshold</td> <td>Tourn Threshold</td>
<td><input class="fm" name="ts_threshold" value="<?php echo TS_THRESHOLD;?>" style="width: 20%;"></td> <td><input class="fm" name="ts_threshold" value="<?php echo TS_THRESHOLD;?>" style="width: 20%;"></td>
</tr> </tr>
GameEngine/Automation.php
+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;
} }
install/templates/config.tpl
+9 -6
View File
@@ -4,15 +4,15 @@
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## ---------------------------------------------------------------------------------------- ## ## ---------------------------------------------------------------------------------------- ##
## Project: TravianZ ## ## Project: TravianZ ##
## Version: 22.06.2015 ## ## Version: 22.06.2015 ##
## Filename config.tpl ## ## Filename config.tpl ##
## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix, martinambrus ## ## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix, martinambrus ##
## Fixed by: Shadow - STARVATION , HERO FIXED COMPL. ## ## Fixed by: Shadow - STARVATION , HERO FIXED COMPL. ##
## Fixed by: InCube - double troops ## ## Fixed by: InCube - double troops ##
## License: TravianZ Project ## ## License: TravianZ Project ##
## Copyright: TravianZ (c) 2010-2015. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2015. All rights reserved. ##
## URLs: http://travian.shadowss.ro ## ## URLs: http://travian.shadowss.ro ##
## Source code: https://github.com/Shadowss/TravianZ ## ## Source code: https://github.com/Shadowss/TravianZ ##
## ## ## ##
############################################################################################## ##############################################################################################
@@ -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>
@@ -279,15 +282,15 @@ echo "<div class=\"headline\"><span class=\"f10 c5\">Error creating constant.php
</p> </p>
<!-- <RIGHT BOX - GPACK RELATED> <!-- <RIGHT BOX - GPACK RELATED>
<span><center><strong>GPACK RELATED</strong></center></span><br /> <span><center><strong>GPACK RELATED</strong></center></span><br />
<span class="f9 c6 c2">GPack:</span><span class="c3"><select name="gpack"> <span class="f9 c6 c2">GPack:</span><span class="c3"><select name="gpack">
<option value="false" selected="selected">No</option> <option value="false" selected="selected">No</option>
<option value="true" disabled="disabled">Yes</option></select></span><br /><br /> <option value="true" disabled="disabled">Yes</option></select></span><br /><br />
<span class="f9 c6 c2">GPack Design:</span><span class="c3"><select name="gp_locate"> <span class="f9 c6 c2">GPack Design:</span><span class="c3"><select name="gp_locate">
<option value="gpack/travian_default/" selected="selected">Travian Default <option value="gpack/travian_default/" selected="selected">Travian Default
<option value="gpack/travianx_v1/">TravianX v1 by Dzoki</option></select></span><br /><br /> <option value="gpack/travianx_v1/">TravianX v1 by Dzoki</option></select></span><br /><br />
--> -->
<!-- </RIGHT BOX - GPACK RELATED> --> <!-- </RIGHT BOX - GPACK RELATED> -->
<p> <p>