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

Additions

Browse Source 
+Added the beerfest (in the brewery)
+Added a better catapult targets checking system
+Updated the sql struct with the new one
This commit is contained in:
iopietro
2018-09-22 15:13:04 +02:00
parent 0065cb3970
commit b4da6e2274
15 changed files with 1013 additions and 1320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/sendUnits/attack.tpl
+2 -4
View File
@@ -69,13 +69,11 @@
<tr>
<th>{$smarty.const.DESTINATION}:</th>
<td colspan="{$colspan}">
{$targetName = 'ctar1'}
{$randomTargetValue = 0}
{$targetType = 1}
{include file=$smarty.const.TEMPLATES_DIR|cat:'sendUnits/catapultTargets.tpl'}
{if $units[8] >= 20}
{$targetName = 'ctar2'}
{$randomTargetValue = -1}
{$targetType = 2}
{include file=$smarty.const.TEMPLATES_DIR|cat:'sendUnits/catapultTargets.tpl'}
{/if}
</td>
templates/sendUnits/catapultTargets.tpl
+12 -6
View File
@@ -1,10 +1,16 @@
{$groupNames = [$smarty.const.RESOURCES, $smarty.const.INFRASTRUCTURE, $smarty.const.MILITARY]}
{$groupNames = [1 => $smarty.const.RESOURCES, $smarty.const.INFRASTRUCTURE, $smarty.const.MILITARY]}
<select name="{$targetName}" class="dropdown">
{if $randomTargetValue < 0}
<option value="{$randomTargetValue + 1}">-</option>
<select name="ctar{$targetType}" class="dropdown">
{if $targetType > 1}
<option value="-1">-</option>
{/if}
<option value="{$randomTargetValue}">{$smarty.const.RANDOM}</option>
{if !empty($catapultTargetBuildings[0])}
{foreach $catapultTargetBuildings[0] as $building}
<option value="{$building.id}">{$building.name}</option>
{/foreach}
{/if}
{foreach $groupNames as $type => $groupName}
{if !empty($catapultTargetBuildings[$type])}
<optgroup label="{$groupName}">
@@ -14,4 +20,4 @@
</optgroup>
{/if}
{/foreach}
</select>
</select>
templates/village/buildings/35.tpl
+3 -1
View File
@@ -1,2 +1,4 @@
{assign var=bonusTexts value=[$smarty.const.CURRENT_BONUS, $smarty.const.BONUS_LEVEL, $smarty.const.PERCENT]}
{include file={$smarty.const.TEMPLATES_DIR}|cat:'village/buildings/showBonus.tpl'}
{include file={$smarty.const.TEMPLATES_DIR}|cat:'village/buildings/showBonus.tpl'}
<br />
{include file={$smarty.const.TEMPLATES_DIR}|cat:'village/buildings/brewery/beerFest.tpl'}
templates/village/buildings/brewery/beerFest.tpl
+40
View File
@@ -0,0 +1,40 @@
<form action="build.php?id={$parameters['id']}" method="post" id="start">
<input type="hidden" name="action" value="startBeerFest">
<table cellpadding="1" cellspacing="1" class="build_details">
<thead>
<tr>
<td>{$smarty.const.CELEBRATION}</td>
<td>{$smarty.const.ACTION}</td>
</tr>
</thead>
<tbody>
<tr>
<td class="desc">
<div class="tit">
<a href="#" onClick="return Popup(0, 1);">{$smarty.const.BEER_FEST}</a>
</div>
<div class="details">
<img class="r1" src="assets/img/x.gif" alt="{$smarty.const.LUMBER}" title="{$smarty.const.LUMBER}" />{$beerFest['neededResources'][0]}|
<img class="r2" src="assets/img/x.gif" alt="{$smarty.const.CLAY}" title="{$smarty.const.CLAY}" />{$beerFest['neededResources'][1]}|
<img class="r3" src="assets/img/x.gif" alt="{$smarty.const.IRON}" title="{$smarty.const.IRON}" />{$beerFest['neededResources'][2]}|
<img class="r4" src="assets/img/x.gif" alt="{$smarty.const.CROP}" title="{$smarty.const.CROP}" />{$beerFest['neededResources'][3]}|
<img class="clock" src="assets/img/x.gif" alt="{$smarty.const.DURATION}" title="{$smarty.const.DURATION}" />{$beerFest.duration}
{if $gold >= 3 && $isMarketplaceBuilt && $villageTotalResources >= $beerFest['totalResources']} |
<a href="build.php?gid=17&t=3&r1={$beerFest['neededResources'][0]}&r2={$beerFest['neededResources'][1]}&r3={$beerFest['neededResources'][2]}&r4={$beerFest['neededResources'][3]}">
<img class="npc" src="assets/img/x.gif"alt="{$smarty.const.NPC_TRADE}" title="{$smarty.const.NPC_TRADE}" />
</a>
{/if}
</div>
</td>
{if !empty($beerFest.error)}
<td class="{if $beerFest.error|strstr:':'}timer{else}none{/if}">{$beerFest.error}</td>
{else}
<td class="act">
<a class="research" href="#" onclick="document.getElementById('start').submit();">{$smarty.const.START}</a>
</td>
{/if}
</tr>
</tbody>
</table>
</form>
templates/village/buildings/research.tpl
+1 -1
View File
@@ -37,7 +37,7 @@
<td class="none">{$research.error}</td>
{else}
<td class="act">
<a class="research" href="build.php?id={$parameters['id']}&amp;a={$unit}&amp;c={$sessionChecker}">{$smarty.const.RESEARCH}</a>
<a class="research" href="build.php?id={$parameters['id']}&a={$unit}&c={$sessionChecker}">{$smarty.const.RESEARCH}</a>
</td>
{/if}
</tr>