mirror of
https://github.com/Shadowss/TravianZ.git
synced 2026-08-11 13:51:00 +00:00
Artifacts fixing part 1
+Added a new table in the database, called "artefacts_chrono" which stores the chronology of all artifacts +Added the support for the artifacts chronology in 27_show.tpl +Added the support for interacting with the artifacts chronology table in Database.php +Cleaned the code in 27_show.tpl +Some minor improovements and bug fixing
This commit is contained in:
iopietro
+8
-12
@@ -7,19 +7,15 @@
|
||||
<h1><?php echo TREASURY; ?> <span class="level"><?php echo LEVEL; ?> <?php echo $village->resarray['f'.$id]; ?></span></h1>
|
||||
|
||||
<p class="build_desc"><?php echo TREASURY_DESC; ?></p>
|
||||
<?php
|
||||
|
||||
<?php
|
||||
include("27_menu.tpl");
|
||||
if(isset($_GET['show'])){ include("27_show.tpl"); }else{
|
||||
if(!isset($_GET['t'])){
|
||||
include("27_1.tpl");
|
||||
}elseif(isset($_GET['t']) && $_GET['t'] == 2){
|
||||
include("27_2.tpl");
|
||||
}elseif(isset($_GET['t']) && $_GET['t'] == 3){
|
||||
include("27_3.tpl");
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($_GET['show']) && !empty($_GET['show']) && $_GET['show'] > 0) include("27_show.tpl");
|
||||
else
|
||||
{
|
||||
if(!isset($_GET['t'])) include("27_1.tpl");
|
||||
elseif(isset($_GET['t']) && $_GET['t'] == 2) include("27_2.tpl");
|
||||
elseif(isset($_GET['t']) && $_GET['t'] == 3) include("27_3.tpl");
|
||||
}
|
||||
include("upgrade.tpl");
|
||||
?>
|
||||
</div>
|
||||
+86
-56
@@ -1,54 +1,56 @@
|
||||
<?php
|
||||
|
||||
$artefact = $database->getArtefactDetails($_GET['show']);
|
||||
if($artefact['size'] == 1 && $artefact['type'] != 11){
|
||||
$reqlvl = 10;
|
||||
$effect = VILLAGE;
|
||||
}else{
|
||||
if($artefact['type'] != 11){
|
||||
$reqlvl = 20;
|
||||
}else{
|
||||
$reqlvl = 10;
|
||||
}
|
||||
$effect = ACCOUNT;
|
||||
$reqlvl = 10;
|
||||
$effect = VILLAGE;
|
||||
}else{
|
||||
$reqlvl = $artefact['type'] != 11 ? 20 : 10;
|
||||
$effect = ACCOUNT;
|
||||
}
|
||||
if ($artefact['conquered'] >= (time()-86400)){
|
||||
$active = date("Y-m-d H:i:s",$artefact['conquered']+86400);
|
||||
}else{
|
||||
$active = ACTIVE;
|
||||
}
|
||||
|
||||
if($artefact['owner'] == 3) $active = "-";
|
||||
elseif (!$artefact['active']) $active = date("Y-m-d H:i:s",$artefact['conquered'] + 86400);
|
||||
else $active = "<b>".ACTIVE."</b>";
|
||||
|
||||
//// Added by brainiac - thank you
|
||||
if ($artefact['type'] == 8){$kind=$artefact['kind']; $effecty=$artefact['effect2'];}else{$kind=$artefact['type']; $effecty=$artefact['effect'];}
|
||||
switch($kind){
|
||||
case 1:
|
||||
if($artefact['type'] == 8 && $artefact['bad_effect']==1){$betterorbadder=BUILDING_WEAKER;}else{$betterorbadder=BUILDING_STRONGER;}
|
||||
break;
|
||||
case 2:
|
||||
if($artefact['type'] == 8 && $artefact['bad_effect']==1){$betterorbadder=TROOPS_SLOWEST;}else{$betterorbadder=TROOPS_FASTER;}
|
||||
break;
|
||||
case 3:
|
||||
if($artefact['type'] == 8 && $artefact['bad_effect']==1){$betterorbadder=SPIES_DECRESE;}else{$betterorbadder=SPIES_INCREASE;}
|
||||
break;
|
||||
case 4:
|
||||
if($artefact['type'] == 8 && $artefact['bad_effect']==1){$betterorbadder=CONSUME_HIGH;}else{$betterorbadder=CONSUME_LESS;}
|
||||
break;
|
||||
case 5:
|
||||
if($artefact['type'] == 8 && $artefact['bad_effect']==1){$betterorbadder=TROOPS_MAKE_SLOWEST;}else{$betterorbadder=TROOPS_MAKE_FASTER;}
|
||||
break;
|
||||
case 6:
|
||||
if($artefact['type'] == 8 && $artefact['bad_effect']==1){$betterorbadder=YOU_CONSTRUCT;}else{$betterorbadder=YOU_CONSTRUCT;}
|
||||
break;
|
||||
case 7:
|
||||
if($artefact['type'] == 8 && $artefact['bad_effect']==1){$betterorbadder=CRANNY_DECRESE;}else{$betterorbadder=CRANNY_INCREASED;}
|
||||
break;
|
||||
case 8:
|
||||
if($artefact['type'] == 8 && $artefact['bad_effect']==1){$betterorbadder=SPIES_INCREASE;}else{$betterorbadder=SPIES_DECRESE;}
|
||||
|
||||
break;
|
||||
|
||||
if ($artefact['type'] == 8)
|
||||
{
|
||||
$kind = $artefact['kind'];
|
||||
$effecty = $artefact['effect2'];
|
||||
}else{
|
||||
$kind = $artefact['type'];
|
||||
$effecty = $artefact['effect'];
|
||||
}
|
||||
|
||||
$bonus=$betterorbadder." ".$effecty."";
|
||||
$artefactBadEffect = $artefact['type'] == 8 && $artefact['bad_effect'] == 1;
|
||||
switch($kind){
|
||||
case 1:
|
||||
$betterorbadder = $artefactBadEffect ? BUILDING_WEAKER : BUILDING_STRONGER;
|
||||
break;
|
||||
case 2:
|
||||
$betterorbadder = $artefactBadEffect ? TROOPS_SLOWEST : TROOPS_FASTER;
|
||||
break;
|
||||
case 3:
|
||||
$betterorbadder = $artefactBadEffect ? SPIES_DECRESE : SPIES_INCREASE;
|
||||
break;
|
||||
case 4:
|
||||
$betterorbadder = $artefactBadEffect ? CONSUME_HIGH : CONSUME_LESS;
|
||||
break;
|
||||
case 5:
|
||||
$betterorbadder = $artefactBadEffect ? TROOPS_MAKE_SLOWEST : TROOPS_MAKE_FASTER;
|
||||
break;
|
||||
case 6:
|
||||
$betterorbadder = $artefactBadEffect ? YOU_CONSTRUCT : YOU_CONSTRUCT;
|
||||
break;
|
||||
case 7:
|
||||
$betterorbadder = $artefactBadEffect ? CRANNY_DECRESE : CRANNY_INCREASED;
|
||||
break;
|
||||
case 8:
|
||||
$betterorbadder = $artefactBadEffect ? SPIES_INCREASE : SPIES_DECRESE;
|
||||
break;
|
||||
}
|
||||
|
||||
$bonus = $betterorbadder." ".$effecty;
|
||||
?>
|
||||
|
||||
<div class="artefact image-<?php echo str_replace(['type', '.gif'], '', $artefact['img']); ?>">
|
||||
@@ -68,18 +70,28 @@ $bonus=$betterorbadder." ".$effecty."";
|
||||
<tr>
|
||||
<th><?php echo OWNER; ?></th>
|
||||
<td>
|
||||
<a href="spieler.php?uid=<?php echo $artefact['owner'];?>"><?php echo $database->getUserField($artefact['owner'],"username",0);?></a>
|
||||
<a href="spieler.php?uid=<?php echo $artefact['owner'];?>"><?php echo $database->getUserField($artefact['owner'], "username", 0);?></a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo VILLAGE; ?></th>
|
||||
<td>
|
||||
<?php if($database->checkVilExist($artefact['vref'])){?>
|
||||
<a href="karte.php?d=<?php echo $artefact['vref'];?>&c=<?php echo $generator->getMapCheck($artefact['vref']);?>"><?php echo $database->getVillageField($artefact['vref'], "name");?> </a>
|
||||
<?php }else{?>
|
||||
<span>[?]</span>
|
||||
<?php }?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo ALLIANCE; ?></th>
|
||||
<td><a href="allianz.php?aid=<?php echo $database->getUserField($artefact['owner'],"alliance",0);?>"><?php echo $database->getAllianceName($database->getUserField($artefact['owner'],"alliance",0)); ?></a></td>
|
||||
<td>
|
||||
<?php if(($alliance = $database->getUserField($artefact['owner'], "alliance", 0)) > 0){ ?>
|
||||
<a href="allianz.php?aid=<?php echo $alliance;?>"><?php echo $database->getAllianceName($alliance); ?></a>
|
||||
<?php }else{?>
|
||||
<span>-</span>
|
||||
<?php }?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo AREA_EFFECT; ?></th>
|
||||
@@ -98,7 +110,7 @@ $bonus=$betterorbadder." ".$effecty."";
|
||||
|
||||
<tr>
|
||||
<th><?php echo TIME_CONQUER; ?></th>
|
||||
<td><?php echo date("Y-m-d H:i:s",$artefact['conquered']);?></td>
|
||||
<td><?php echo ($artefact['owner'] != 3) ? date("Y-m-d H:i:s",$artefact['conquered']) : "-";?></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
@@ -111,19 +123,37 @@ $bonus=$betterorbadder." ".$effecty."";
|
||||
<tr>
|
||||
<th colspan="3"><?php echo FORMER_OWNER; ?></th>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr>
|
||||
<td><?php echo PLAYER; ?></td>
|
||||
<td><?php echo VILLAGE; ?></td>
|
||||
<td><?php echo CONQUERED; ?></td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<tr>
|
||||
<td><span class="none"><a href="spieler.php?uid=<?php echo $artefact['owner'];?>"><?php echo $database->getUserField($artefact['owner'],"username",0);?></a></span></td>
|
||||
<td><span class="none"><a href="karte.php?d=<?php echo $artefact['vref'];?>&c=<?php echo $generator->getMapCheck($artefact['vref']);?>"><?php echo $database->getVillageField($artefact['vref'], "name");?> </a></span></td>
|
||||
<td><span class="none"><?php echo date("Y-m-d H:i:s",$artefact['conquered']);?></span></td>
|
||||
|
||||
<?php
|
||||
$owners = $database->getArtifactsChronology($_GET['show']);
|
||||
if(!empty($owners)){
|
||||
foreach($owners as $owner){
|
||||
?>
|
||||
<tr>
|
||||
<td><span class="none"><a href="spieler.php?uid=<?php echo $owner['uid'];?>"><?php echo $database->getUserField($owner['uid'], "username", 0);?></a></span></td>
|
||||
<td>
|
||||
<?php if($database->checkVilExist($owner['vref'])){?>
|
||||
<span class="none"><a href="karte.php?d=<?php echo $owner['vref'];?>&c=<?php echo $generator->getMapCheck($owner['vref']);?>"><?php echo $database->getVillageField($owner['vref'], "name");?></a></span>
|
||||
<?php }else{?>
|
||||
<span class="none">[?]</span>
|
||||
<?php }?>
|
||||
</td>
|
||||
<td><span class="none"><?php echo date("Y-m-d H:i:s", $owner['conqueredtime']);?></span></td>
|
||||
</tr>
|
||||
|
||||
</tr></tbody></table></div>
|
||||
<?php
|
||||
}
|
||||
}else{
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="3"><span class="none"><?php echo NO_PREVIOUS_OWNERS; ?></span></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</tbody></table></div>
|
||||
Reference in New Issue
Block a user