mirror of
https://github.com/Shadowss/TravianZ.git
synced 2026-09-04 09:27:17 +00:00
Refactor + BugFix
1. Fix a bug in Admin Panel that you can edit by yourself your rank, now you cannot edit your rank anymore. 2. Now Alliance Leader can edit his own Position 3. Fix negative value on Demolition Building, now in database at lvl is appear new level not -1 4. Refactor Ajax map, now all is alligned (Ajax folder and Map folder) 5. Fix bug from Palace (when change capital now Automation recount population automaticaly on old capital and new capital)
This commit is contained in:
novgorodschi catalin
+65
-79
@@ -1,82 +1,68 @@
|
||||
<table cellpadding="1" cellspacing="1" class="build_details">
|
||||
<thead>
|
||||
<tr>
|
||||
<td><?php echo CELEBRATIONS; ?></td>
|
||||
<td><?php echo ACTION; ?></td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
// 24_1.tpl - TOWNHALL CELEBRATIONS
|
||||
global $village, $database, $generator, $building, $session, $cel, $gc, $bid24, $id, $technology;
|
||||
|
||||
<tr>
|
||||
<?php
|
||||
$level = $village->resarray['f'.$id];
|
||||
$inuse = $database->getVillageField($village->wid, 'celebration');
|
||||
$time = Time();
|
||||
$i = 1;
|
||||
echo "<tr><td class=\"desc\"><div class=\"tit\">".$cel[$i]['name']." (".$cel[$i]['attri']." ".CULTURE_POINTS.")</div>
|
||||
<div class=\"details\"><img class=\"r1\" src=\"img/x.gif\" alt=\"Lumber\" title=\"".LUMBER."\" />".$cel[$i]['wood']."|<img class=\"r2\" src=\"img/x.gif\" alt=\"Clay\" title=\"".CLAY."\" />".$cel[$i]['clay']."|<img class=\"r3\" src=\"img/x.gif\" alt=\"Iron\" title=\"".IRON."\" />".$cel[$i]['iron']."|<img class=\"r4\" src=\"img/x.gif\" alt=\"Crop\" title=\"".CROP."\" />".$cel[$i]['crop']."|<img class=\"clock\" src=\"img/x.gif\" alt=\"duration\" title=\"".DURATION."\" />";
|
||||
echo $generator->getTimeFormat(round($cel[$i]['time'] * ($bid24[$building->getTypeLevel(24)]['attri'] / 100)/SPEED));
|
||||
//-- If available resources combined are not enough, remove NPC button
|
||||
$total_required = (int)($cel[$i]['wood'] + $cel[$i]['clay'] + $cel[$i]['iron'] + $cel[$i]['crop']);
|
||||
if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1 && $village->atotal >= $total_required) {
|
||||
echo "|<a href=\"build.php?gid=17&t=3&r1=".$cel[$i]['wood']."&r2=".$cel[$i]['clay']."&r3=".$cel[$i]['iron']."&r4=".$cel[$i]['crop']."\" title=\"NPC trade\"><img class=\"npc\" src=\"img/x.gif\" alt=\"NPC trade\" title=\"NPC trade\" /></a>";
|
||||
}
|
||||
if($inuse > $time){
|
||||
echo "<td class=\"act\">
|
||||
<div class=\"none\">".CELEBRATIONS_IN_PROGRESS."</div>
|
||||
</td></tr>";
|
||||
}
|
||||
else if($cel[$i]['wood'] > $village->awood || $cel[$i]['clay'] > $village->aclay || $cel[$i]['iron'] > $village->airon || $cel[$i]['crop'] > $village->acrop) {
|
||||
if($village->getProd("crop")>0){
|
||||
$time = $technology->calculateAvaliable(24,$cel[$i]);
|
||||
echo "<br><span class=\"none\">".ENOUGH_RESOURCES." ".$time[0]." at ".$time[1]."</span></div></td>";
|
||||
} else {
|
||||
echo "<br><span class=\"none\">".CROP_NEGATIVE."</span></div></td>";
|
||||
}
|
||||
echo "<td class=\"act\"><div class=\"none\">".TOO_FEW_RESOURCES."</div></td></tr>";
|
||||
}
|
||||
else {
|
||||
echo "</td>";
|
||||
echo "<td class=\"act\">";
|
||||
echo "<a class=\"research\" href=\"celebration.php?type=$i&id=$id\">".HOLD."</a></td></tr>";
|
||||
}
|
||||
|
||||
if($level >= 10){
|
||||
$level = $village->resarray['f'.$id];
|
||||
echo "<tr><td class=\"desc\">
|
||||
<div class=\"tit\">
|
||||
".GREAT_CELEBRATIONS." (2000 ".CULTURE_POINTS.")
|
||||
</div>
|
||||
<div class=\"details\"><img class=\"r1\" src=\"img/x.gif\" alt=\"Lumber\" title=\"".LUMBER."\" />29700|<img class=\"r2\" src=\"img/x.gif\" alt=\"Clay\" title=\"".CLAY."\" />33250|<img class=\"r3\" src=\"img/x.gif\" alt=\"Iron\" title=\"".IRON."\" />32000|<img class=\"r4\" src=\"img/x.gif\" alt=\"Crop\" title=\"".CROP."\" />6700|<img class=\"clock\" src=\"img/x.gif\" alt=\"duration\" title=\"".DURATION."\" />";
|
||||
echo $generator->getTimeFormat(round($gc[$level]/SPEED));
|
||||
//-- If available resources combined are not enough, remove NPC button
|
||||
$total_required = (int)(29700 + 33250 + 32000 + 6700);
|
||||
if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1 && $village->atotal >= $total_required) {
|
||||
echo "|<a href=\"build.php?gid=17&t=3&r1=29700&r2=33250&r3=32000&r4=6700\" title=\"NPC trade\"><img class=\"npc\" src=\"img/x.gif\" alt=\"NPC trade\" title=\"NPC trade\" /></a>";
|
||||
}
|
||||
if($inuse > $time){
|
||||
echo "<td class=\"act\">
|
||||
<div class=\"none\">".CELEBRATIONS_IN_PROGRESS."</div>
|
||||
</td></tr>";
|
||||
}
|
||||
else if(29700 > $village->awood || 33250 > $village->aclay || 32000 > $village->airon || 6700 > $village->acrop) {
|
||||
if($village->getProd("crop")>0){
|
||||
$time = $technology->calculateAvaliable(24,$cel[2]);
|
||||
echo "<br><span class=\"none\">".ENOUGH_RESOURCES." ".$time[0]." at ".$time[1]."</span></div></td>";
|
||||
} else {
|
||||
echo "<br><span class=\"none\">".CROP_NEGATIVE."</span></div></td>";
|
||||
}
|
||||
echo "<td class=\"act\">
|
||||
<div class=\"none\">".TOO_FEW_RESOURCES."</div>
|
||||
</td></tr>";
|
||||
}
|
||||
else {
|
||||
echo "</td>";
|
||||
echo "<td class=\"act\">
|
||||
<a class=\"research\" href=\"celebration.php?type=2&id=$id\">".HOLD."</a></td></tr>";
|
||||
}
|
||||
}
|
||||
$level = (int)$village->resarray['f'.$id];
|
||||
$inuse = (int)$database->getVillageField($village->wid, 'celebration');
|
||||
$now = time();
|
||||
$inProgress = $inuse > $now;
|
||||
?>
|
||||
</tbody>
|
||||
</table>
|
||||
<table cellpadding="1" cellspacing="1" class="build_details">
|
||||
<thead><tr><td><?php echo CELEBRATIONS;?></td><td><?php echo ACTION;?></td></tr></thead>
|
||||
<tbody>
|
||||
<?php
|
||||
$i = 1;
|
||||
$c = $cel[$i];
|
||||
$time = $generator->getTimeFormat(round($c['time'] * ($bid24[$building->getTypeLevel(24)]['attri']/100) / SPEED));
|
||||
$total = $c['wood']+$c['clay']+$c['iron']+$c['crop'];
|
||||
$showNpc = $session->userinfo['gold']>=3 && $building->getTypeLevel(17)>=1 && $village->atotal >= $total;
|
||||
$canAfford = $c['wood']<=$village->awood && $c['clay']<=$village->aclay && $c['iron']<=$village->airon && $c['crop']<=$village->acrop;
|
||||
?>
|
||||
<tr>
|
||||
<td class="desc">
|
||||
<div class="tit"><?php echo $c['name'];?> (<?php echo $c['attri'];?> <?php echo CULTURE_POINTS;?>)</div>
|
||||
<div class="details">
|
||||
<img class="r1" src="img/x.gif" title="<?php echo LUMBER;?>"/><?php echo (int)$c['wood'];?>|
|
||||
<img class="r2" src="img/x.gif" title="<?php echo CLAY;?>"/><?php echo (int)$c['clay'];?>|
|
||||
<img class="r3" src="img/x.gif" title="<?php echo IRON;?>"/><?php echo (int)$c['iron'];?>|
|
||||
<img class="r4" src="img/x.gif" title="<?php echo CROP;?>"/><?php echo (int)$c['crop'];?>|
|
||||
<img class="clock" src="img/x.gif" title="<?php echo DURATION;?>"/><?php echo $time;?>
|
||||
<?php if ($showNpc):?>|<a href="build.php?gid=17&t=3&r1=<?php echo $c['wood'];?>&r2=<?php echo $c['clay'];?>&r3=<?php echo $c['iron'];?>&r4=<?php echo $c['crop'];?>" title="NPC trade"><img class="npc" src="img/x.gif"/></a><?php endif;?>
|
||||
<?php if (!$canAfford &&!$inProgress): if ($village->getProd("crop")>0){ $t=$technology->calculateAvaliable(24,$c); echo "<br><span class=\"none\">".ENOUGH_RESOURCES." ".$t[0]." at ".$t[1]."</span>"; } else echo "<br><span class=\"none\">".CROP_NEGATIVE."</span>"; endif;?>
|
||||
</div>
|
||||
</td>
|
||||
<td class="act">
|
||||
<?php if ($inProgress):?><div class="none"><?php echo CELEBRATIONS_IN_PROGRESS;?></div>
|
||||
<?php elseif (!$canAfford):?><div class="none"><?php echo TOO_FEW_RESOURCES;?></div>
|
||||
<?php else:?><a class="research" href="celebration.php?type=<?php echo $i;?>&id=<?php echo $id;?>"><?php echo HOLD;?></a><?php endif;?>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<?php if ($level >= 10):
|
||||
$gcTime = $generator->getTimeFormat(round($gc[$level]/SPEED));
|
||||
$gcTotal = 29700+33250+32000+6700;
|
||||
$showNpc2 = $session->userinfo['gold']>=3 && $building->getTypeLevel(17)>=1 && $village->atotal >= $gcTotal;
|
||||
$canAfford2 = 29700<=$village->awood && 33250<=$village->aclay && 32000<=$village->airon && 6700<=$village->acrop;
|
||||
?>
|
||||
<tr>
|
||||
<td class="desc">
|
||||
<div class="tit"><?php echo GREAT_CELEBRATIONS;?> (2000 <?php echo CULTURE_POINTS;?>)</div>
|
||||
<div class="details">
|
||||
<img class="r1" src="img/x.gif" title="<?php echo LUMBER;?>"/>29700|
|
||||
<img class="r2" src="img/x.gif" title="<?php echo CLAY;?>"/>33250|
|
||||
<img class="r3" src="img/x.gif" title="<?php echo IRON;?>"/>32000|
|
||||
<img class="r4" src="img/x.gif" title="<?php echo CROP;?>"/>6700|
|
||||
<img class="clock" src="img/x.gif" title="<?php echo DURATION;?>"/><?php echo $gcTime;?>
|
||||
<?php if ($showNpc2):?>|<a href="build.php?gid=17&t=3&r1=29700&r2=33250&r3=32000&r4=6700" title="NPC trade"><img class="npc" src="img/x.gif"/></a><?php endif;?>
|
||||
<?php if (!$canAfford2 &&!$inProgress): if ($village->getProd("crop")>0){ $t=$technology->calculateAvaliable(24,$cel[2]); echo "<br><span class=\"none\">".ENOUGH_RESOURCES." ".$t[0]." at ".$t[1]."</span>"; } else echo "<br><span class=\"none\">".CROP_NEGATIVE."</span>"; endif;?>
|
||||
</div>
|
||||
</td>
|
||||
<td class="act">
|
||||
<?php if ($inProgress):?><div class="none"><?php echo CELEBRATIONS_IN_PROGRESS;?></div>
|
||||
<?php elseif (!$canAfford2):?><div class="none"><?php echo TOO_FEW_RESOURCES;?></div>
|
||||
<?php else:?><a class="research" href="celebration.php?type=2&id=<?php echo $id;?>"><?php echo HOLD;?></a><?php endif;?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
</tbody>
|
||||
</table>
|
||||
Reference in New Issue
Block a user