mirror of
https://github.com/Shadowss/TravianZ.git
synced 2026-07-05 20:34:21 +00:00
iopietro
bdd3bfd41c
+Troops while adding/editing a raid lists are now inside of a table, this is a graphic enhancement +Reduced the X and Y textboxes size while adding/editing a raid list +Fixed a bug that didn't permit to add a raid list +Fixed a bug that did permit to insert spies in raid lists +The farmlists graphic is now more clear, "Add raid" and "Start raid" are now two general buttons, instead of having two buttons for raid list +"Select all" checkbox, will select all raid without refreshing the page (through JS) +Moved the function "getDistance" to Database.php +Removed a lot of redundant code from crop_finder.php +Removed rams, catapults, chiefs and settlers from the raid list, because the first three can't even loot resources +Removed trooplist2.tpl because of a more general unique template file (trooplist.tpl) +Some minor improvements and bug fixing IMPORTANT NOTE: if you don't want to reinstal the whole server, you can simply run this little query (where "s1_" is the prefix of your server): ALTER TABLE `s1_raidlist` DROP `t7`, DROP `t8`, DROP `t9`, DROP `t10`;
131 lines
4.6 KiB
Smarty
131 lines
4.6 KiB
Smarty
<?php
|
|
$artefact1 = $database->getOwnArtefactInfo3($session->uid);
|
|
$wref = $village->wid;
|
|
$coor = $database->getCoor($wref);
|
|
?>
|
|
<body>
|
|
<div class="gid27">
|
|
<table id="own" cellpadding="1" cellspacing="1">
|
|
<thead>
|
|
<tr>
|
|
<th colspan="4"><?php echo OWN_ARTIFACTS; ?></th>
|
|
</tr>
|
|
<tr>
|
|
<td></td>
|
|
<td><?php echo NAME; ?></td>
|
|
<td><?php echo VILLAGE; ?></td>
|
|
<td><?php echo CONQUERED; ?></td>
|
|
</tr>
|
|
</thead>
|
|
|
|
<tbody>
|
|
<?php
|
|
|
|
if (count($artefact1)==0){
|
|
echo '<tr><td colspan="4" class="none">'.ANY_ARTIFACTS.'</td></tr>';
|
|
} else {
|
|
foreach($artefact1 as $artefact){
|
|
$coor2 = $database->getCoor($artefact['vref']);
|
|
if($artefact['size'] == 1 && $artefact['type'] != 11){
|
|
$reqlvl = 10;
|
|
$effect = "village";
|
|
}else{
|
|
if($artefact['type'] != 11){
|
|
$reqlvl = 20;
|
|
}else{
|
|
$reqlvl = 10;
|
|
}
|
|
$effect = "account";
|
|
}
|
|
echo '<tr><td class="icon"><img class="artefact_icon_' . $artefact['type'] . '" src="img/x.gif"></td>';
|
|
echo '<td class="nam">
|
|
<a href="build.php?id=' . $id . '&show='.$artefact['id'].'">' . $artefact['name'] . '</a> <span class="bon">' . $artefact['effect'] . '</span>
|
|
<div class="info">
|
|
Treasury <b>' . $reqlvl . '</b>, Effect <b>' . $effect . '</b>
|
|
</div>
|
|
</td>';
|
|
echo '<td class="pla"><a href="karte.php?d=' . $artefact['vref'] . '&c=' . $generator->getMapCheck($artefact['vref']) . '">' . $database->getVillageField($artefact['vref'], "name") . '</a></td>';
|
|
echo '<td class="dist">' . date("d/m/Y H:i", $artefact['conquered']) . '</td></tr>';
|
|
}
|
|
}
|
|
|
|
?>
|
|
</tbody>
|
|
</table>
|
|
|
|
<table id="near" cellpadding="1" cellspacing="1">
|
|
<thead>
|
|
<tr>
|
|
<th colspan="4"><?php echo ARTIFACTS_AREA; ?></th>
|
|
</tr>
|
|
|
|
<tr>
|
|
<td></td>
|
|
|
|
<td><?php echo NAME; ?></td>
|
|
|
|
<td><?php echo PLAYER; ?></td>
|
|
|
|
<td><?php echo DISTANCE; ?></td>
|
|
</tr>
|
|
</thead>
|
|
|
|
<tbody>
|
|
<?php
|
|
$count = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts"), MYSQLI_ASSOC);
|
|
$count = $count['Total'];
|
|
if($count == 0) {
|
|
echo '<td colspan="4" class="none">'.NO_ARTIFACTS_AREA.'</td>';
|
|
} else {
|
|
|
|
|
|
function haversine($l1, $o1, $l2, $o2) {
|
|
$l1 = deg2rad($l1);
|
|
$sinl1 = sin($l1);
|
|
$l2 = deg2rad($l2);
|
|
$o1 = deg2rad($o1);
|
|
$o2 = deg2rad($o2);
|
|
|
|
return (7926 - 26 * $sinl1) * asin(min(1, 0.707106781186548 * sqrt((1 - (sin($l2) * $sinl1) - cos($l1) * cos($l2) * cos($o2 - $o1)))));
|
|
}
|
|
|
|
|
|
unset($reqlvl);
|
|
unset($effect);
|
|
$arts = mysqli_query($database->dblink,"SELECT type, vref, id, name, size, owner, effect FROM " . TB_PREFIX . "artefacts");
|
|
$rows = array();
|
|
while($row = mysqli_fetch_array($arts)) {
|
|
$query = mysqli_query($database->dblink,'SELECT x, y FROM `' . TB_PREFIX . 'wdata` WHERE `id` = ' . (int) $row['vref']);
|
|
$coor2 = mysqli_fetch_assoc($query);
|
|
$dist = $database->getDistance($coor['x'], $coor['y'], $coor2['x'], $coor2['y']);
|
|
$rows[$dist] = $row;
|
|
}
|
|
ksort($rows);
|
|
foreach($rows as $row) {
|
|
$wref = $village->wid;
|
|
$coor = $database->getCoor($wref);
|
|
$wref2 = $row['vref'];
|
|
$coor2 = $database->getCoor($wref2);
|
|
echo '<tr>';
|
|
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
|
|
echo '<td class="nam">';
|
|
echo '<a href="build.php?id=' . $id . '&show='.$row['id'].'">' . $row['name'] . '</a> <span class="bon">' . $row['effect'] . '</span>';
|
|
echo '<div class="info">';
|
|
if($row['size'] == 1 && $row['type'] != 11){
|
|
$reqlvl = 10;
|
|
$effect = VILLAGE;
|
|
}else{
|
|
$reqlvl = $row['type'] != 11 ? 20 : 10;
|
|
$effect = ACCOUNT;
|
|
}
|
|
echo '<div class="info">'.TREASURY.' <b>' . $reqlvl . '</b>, '.EFFECT.' <b>' . $effect . '</b>';
|
|
echo '</div></td><td class="pla"><a href="karte.php?d=' . $row['vref'] . '&c=' . $generator->getMapCheck($row['vref']) . '">' . $database->getUserField($row['owner'], "username", 0) . '</a></td>';
|
|
echo '<td class="dist">'.$database->getDistance($coor['x'], $coor['y'], $coor2['x'], $coor2['y']).'</td>';
|
|
echo '</tr>';
|
|
}
|
|
}
|
|
|
|
?>
|
|
</tbody>
|
|
</table>
|
|
</div> |