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

fix showing attack on your oasis

Browse Source
This commit is contained in:
yi12345
2013-09-21 21:12:22 +03:00
parent a50b05c475
commit 5aca587f14
6 changed files with 137 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Build/16.tpl
+7 -2
View File
@@ -14,15 +14,20 @@
<?php
$units_type = $database->getMovement("34",$village->wid,1);
$settlers = $database->getMovement("7",$village->wid,1);
$oasis_incoming = 0;
$array = $database->getOasis($village->wid);
foreach($array as $conqured){
$oasis_incoming += count($database->getMovement(6,$conqured['wref'],0));
}
$units_incoming = count($units_type);
$settlers_incoming = count($settlers);
for($i=0;$i<$units_incoming;$i++){
if($units_type[$i]['attack_type'] == 1 && $units_type[$i]['sort_type'] == 3)
$units_incoming -= 1;
}
if($units_incoming > 0 or $settlers_incoming > 0){
if($units_incoming > 0 or $settlers_incoming > 0 or $oasis_incoming > 0){
?>
<h4>Incoming troops (<?php echo $units_incoming; ?>)</h4>
<h4>Incoming troops (<?php echo $units_incoming+$settlers_incoming+$oasis_incoming; ?>)</h4>
<?php include("16_incomming.tpl");
}
?>
Templates/Build/16_incomming.tpl
+87 -1
View File
@@ -133,7 +133,7 @@ if ($units[$y]['sort_type']==3){
if ($units[$y]['attack_type']==1){
$actionType = "Return from ";
} else if ($units[$y]['attack_type']==2){
$actionType = "Reinforment for ";
$actionType = "Reinforcement for ";
} else if ($units[$y]['attack_type']==3){
$actionType = "Return from ";
} else if ($units[$y]['attack_type']==4){
@@ -212,6 +212,92 @@ $to = $database->getMInfo($units[$y]['vref']);
<?php
}
}
$array = $database->getOasis($village->wid);
foreach($array as $conqured){
$oasis = $database->getMovement("6",$conqured['wref'],0);
$total_for = count($oasis);
for($y=0;$y < $total_for;$y++){
$timer = $y+1;
if ($oasis[$y]['attack_type']==2){
$actionType = "Reinforcement for ";
} else if ($oasis[$y]['attack_type']==3){
$actionType = "Attack on ";
} else if ($oasis[$y]['attack_type']==4){
$actionType = "Raid on ";
}
$reinfowner = $database->getVillageField($oasis[$y]['from'],"owner");
if($oasis[$y]['t11'] != 0 && $reinfowner == $session->uid) {
$colspan = 11;
}else{
$colspan = 10;
}
echo "<table class=\"troop_details\" cellpadding=\"1\" cellspacing=\"1\"><thead><tr><td class=\"role\">
<a href=\"karte.php?d=".$oasis[$y]['from']."&c=".$generator->getMapCheck($oasis[$y]['from'])."\">".$database->getVillageField($oasis[$y]['from'],"name")."</a></td>
<td colspan=\"$colspan\">";
echo "<a href=\"spieler.php?uid=".$database->getVillageField($oasis[$y]['from'],"owner")."\">".$database->getUserField($database->getVillageField($oasis[$y]['from'],"owner"),"username",0)."'s troops</a>";
echo "</td></tr></thead><tbody class=\"units\">";
$tribe = $database->getUserField($database->getVillageField($oasis[$y]['from'],"owner"),"tribe",0);
$start = ($tribe-1)*10+1;
$end = ($tribe*10);
echo "<tr><th>&nbsp;</th>";
for($i=$start;$i<=($end);$i++) {
echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
}
if($oasis[$y]['t11'] != 0 && $reinfowner == $session->uid) {
echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
}
echo "</tr><tr><th>Troops</th>";
for($i=1;$i<=$colspan;$i++) {
$totalunits = $oasis[$y]['t1']+$oasis[$y]['t2']+$oasis[$y]['t3']+$oasis[$y]['t4']+$oasis[$y]['t5']+$oasis[$y]['t6']+$oasis[$y]['t7']+$oasis[$y]['t8']+$oasis[$y]['t9']+$oasis[$y]['t10']+$oasis[$y]['t11'];
if($oasis[$y]['attack_type'] == 2){
if($reinfowner != $session->uid){
echo "<td class=\"none\">?</td>";
}else{
if($oasis[$y]['t'.$i] == 0) {
echo "<td class=\"none\">0</td>";
}
else {
echo "<td>";
echo $oasis[$y]['t'.$i]."</td>";
}
}}else{
$artefact = count($database->getOwnUniqueArtefactInfo2($session->uid,3,3,0));
$artefact1 = count($database->getOwnUniqueArtefactInfo2($village->wid,3,1,1));
$artefact2 = count($database->getOwnUniqueArtefactInfo2($session->uid,3,2,0));
$total_artefact = $artefact + $artefact1 + $artefact2;
if($totalunits > $building->getTypeLevel(16) && $total_artefact == 0){
echo "<td class=\"none\">?</td>";
}else{
if($oasis[$y]['t'.$i] == 0) {
echo "<td class=\"none\">0</td>";
}else{
echo "<td>?</td>";
}
}
}
}
echo "</tr></tbody>";
echo '
<tbody class="infos">
<tr>
<th>Arrival</th>
<td colspan="10">
<div class="in small"><span id=timer'.$timer.'>'.$generator->getTimeFormat($oasis[$y]['endtime']-time()).'</span> h</div>';
$datetime = $generator->procMtime($oasis[$y]['endtime']);
echo "<div class=\"at small\">";
if($datetime[0] != "today") {
echo "on ".$datetime[0]." ";
}
echo "at ".$datetime[1]." hours</div>
</div>
</td>
</tr>
</tbody>";
echo "</table>";
}
}
$settlers = $database->getMovement("7",$village->wid,1);
$total_for3 = count($settlers);
Templates/Build/16_walking.tpl
+2 -2
View File
@@ -140,9 +140,9 @@ $timer += 1;
echo "on ".$datetime[0]." ";
}
echo "at ".$datetime[1]."</div>";
if (($units[$y]['starttime']+90)>time()){
if (($settlers[$y]['starttime']+90)>time()){
?>
<div class="abort"><a href="build.php?id=<?php echo $_GET['id']."&mode=troops&cancel=1&moveid=".$units[$y]['moveid']; ?>"><img src="img/x.gif" class="del" /></a></div>
<div class="abort"><a href="build.php?id=<?php echo $_GET['id']."&mode=troops&cancel=1&moveid=".$settlers[$y]['moveid']; ?>"><img src="img/x.gif" class="del" /></a></div>
<?php } ?>
</div>
</td>