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

Refactor + BugFix

Browse Source 
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
2026-05-18 09:18:35 +03:00
parent 2bce101a27
commit 55e6dd60b5
96 changed files with 6176 additions and 6763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Build/26_4.tpl
+77 -52
View File
@@ -1,55 +1,80 @@
<div id="build" class="gid26"><h1><?php echo PALACE; ?> <span class="level"><?php echo LEVEL; ?> <?php echo $village->resarray['f'.$id]; ?></span></h1>
<p class="build_desc">
<a href="#" onClick="return Popup(26,4, 'gid');"
class="build_logo"> <img
class="building g26"
src="img/x.gif" alt="Palace"
title="<?php echo PALACE; ?>" /> </a>
<?php echo PALACE_DESC; ?>
<?php include("26_menu.tpl"); ?>
<table cellpadding="1" cellspacing="1" id="expansion">
<thead><tr>
<th colspan="6"><a name="h2"></a><?php echo CONQUERED_BY_VILLAGE; ?></th>
</tr>
<tr>
<td colspan="2"><?php echo VILLAGE; ?></td>
<td><?php echo PLAYER; ?></td>
<td><?php echo INHABITANTS; ?></td>
<td><?php echo COORDINATES; ?></td>
<td><?php echo DATE; ?></td>
</tr></thead>
<tbody>
<?php
$slot1 = $database->getVillageField($village->wid, 'exp1');
$slot2 = $database->getVillageField($village->wid, 'exp2');
$slot3 = $database->getVillageField($village->wid, 'exp3');
// 26_4.tpl - PALACE / CONQUERED VILLAGES
global $database, $village, $generator;
if($slot1 != 0 || $slot2 != 0 || $slot3 != 0){
for($i=1; $i <= 3; $i++){
if (${'slot'.$i}<>0) {
$coor = $database->getCoor(${'slot'.$i});
$vname = $database->getVillageField(${'slot'.$i},'name');
$owner = $database->getVillageField(${'slot'.$i},'owner');
$pop = $database->getVillageField(${'slot'.$i},'pop');
$vcreated = $database->getVillageField(${'slot'.$i},'created');
$ownername = $database->getUserField($owner,'username',0);
echo '
<tr>
<td class="ra">'.$i.'.</td>
<td class="vil"><a href="karte.php?d='.${'slot'.$i}.'&c='.$generator->getMapCheck(${'slot'.$i}).'">'.$vname.'</a></td>
<td class="pla"><a href="spieler.php?uid='.$owner.'">'.$ownername.'</a></td>
<td class="ha">'.$pop.'</td>
<td class="aligned_coords"><div class="cox">('.$coor['x'].'</div><div class="pi">|</div><div class="coy">'.$coor['y'].')</div></td>
<td class="dat">'.date('d.m.Y',$vcreated).'</td>
</tr>';
}
}
}
else{
echo '<tr><td colspan="6" class="none">'.NONE_CONQUERED_BY_VILLAGE.'</td></tr>';
}
$level = (int)$village->resarray['f'.$id];
// ia toate 3 sloturile o singură dată
$slots = [
(int)$database->getVillageField($village->wid, 'exp1'),
(int)$database->getVillageField($village->wid, 'exp2'),
(int)$database->getVillageField($village->wid, 'exp3'),
];
$slots = array_filter($slots); // elimină 0
?>
</tbody></table></div>
<div id="build" class="gid26">
<h1><?php echo PALACE; ?> <span class="level"><?php echo LEVEL.' '.$level; ?></span></h1>
<p class="build_desc">
<a href="#" onclick="return Popup(26,4,'gid');" class="build_logo">
<img class="building g26" src="img/x.gif" alt="<?php echo PALACE; ?>" title="<?php echo PALACE; ?>" />
</a>
<?php echo PALACE_DESC; ?>
</p>
<?php include("26_menu.tpl"); ?>
<table cellpadding="1" cellspacing="1" id="expansion">
<thead>
<tr>
<th colspan="6"><a name="h2"></a><?php echo CONQUERED_BY_VILLAGE; ?></th>
</tr>
<tr>
<td colspan="2"><?php echo VILLAGE; ?></td>
<td><?php echo PLAYER; ?></td>
<td><?php echo INHABITANTS; ?></td>
<td><?php echo COORDINATES; ?></td>
<td><?php echo DATE; ?></td>
</tr>
</thead>
<tbody>
<?php if (!empty($slots)):
$i = 1;
foreach ($slots as $wid):
// un singur set de date per sat
$coor = $database->getCoor($wid);
$villageData = $database->getVillage($wid); // conține name, owner, pop, created
$ownerName = $database->getUserField($villageData['owner'], 'username', 0);
$mapCheck = $generator->getMapCheck($wid);
?>
<tr>
<td class="ra"><?php echo $i; ?>.</td>
<td class="vil">
<a href="karte.php?d=<?php echo $wid; ?>&c=<?php echo $mapCheck; ?>">
<?php echo htmlspecialchars($villageData['name']); ?>
</a>
</td>
<td class="pla">
<a href="spieler.php?uid=<?php echo (int)$villageData['owner']; ?>">
<?php echo htmlspecialchars($ownerName); ?>
</a>
</td>
<td class="ha"><?php echo (int)$villageData['pop']; ?></td>
<td class="aligned_coords">
<div class="cox">(<?php echo (int)$coor['x']; ?></div>
<div class="pi">|</div>
<div class="coy"><?php echo (int)$coor['y']; ?>)</div>
</td>
<td class="dat"><?php echo date('d.m.Y', (int)$villageData['created']); ?></td>
</tr>
<?php
$i++;
endforeach;
else: ?>
<tr>
<td colspan="6" class="none"><?php echo NONE_CONQUERED_BY_VILLAGE; ?></td>
</tr>
<?php endif; ?>
</tbody>
</table>
</div>