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

Reports refactor #1

Browse Source 
-Removed 29 files from the "Templates/Notice" folder, there were a lot
of duplicated/very similar kinds of report. Now, there are only 6 kinds
of report (9.tpl isn't counted)
+Changed a lot of codes in some .tpl reports, into a foreach

Automation.php:

+Modified report data, for the refactored report system
+Some clean-up

Battle.php:

+Fixed catapults and rams, they weren't able to destroy completely a building
+Fixed a possible division by 0 error
This commit is contained in:
iopietro
2018-04-19 20:14:54 +02:00
parent 06fc62752a
commit 882215cd2a
41 changed files with 426 additions and 9017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Notice/15.tpl
+25 -33
View File
@@ -1,17 +1,16 @@
<?php
//reinforcement is underattack
$dataarray = explode(",",$message->readingNotice['data']);
if(isset($dataarray[24]) and $dataarray[24]!=0){$colspan="11";}else{$colspan="10";}
if ($database->getUserField($dataarray[0],'username',0)!="??") {
$user_url="<a href=\"spieler.php?uid=".$database->getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0)."</a>";
}else{
$user_url="<font color=\"grey\"><b>??</b></font>";
$colspan = (isset($dataarray[24]) && $dataarray[24] > 0) ? 10 : 11;
if ($database->getUserField($dataarray[0], 'username', 0) != "[?]") {
$user_url = "<a href=\"spieler.php?uid=".$database->getUserField($dataarray[0], 'id', 0)."\">".$database->getUserField($dataarray[0], 'username', 0)."</a>";
}
if($database->getVillageField($dataarray[26],'name')!="??") {
$from_url="<a href=\"karte.php?d=".$dataarray[26]."&c=".$generator->getMapCheck($dataarray[26])."\">".$database->getVillageField($dataarray[26],'name')."</a>";
}else{
$from_url="<font color=\"grey\"><b>??</b></font>";
else $user_url = "<font color=\"grey\"><b>[?]</b></font>";
if($database->getVillageField($dataarray[26], 'name') != "[?]") {
$from_url = "<a href=\"karte.php?d=".$dataarray[26]."&c=".$generator->getMapCheck($dataarray[26])."\">".$database->getVillageField($dataarray[26], 'name')."</a>";
}
else $from_url = "<font color=\"grey\"><b>[?]</b></font>";
?>
<table cellpadding="1" cellspacing="1" id="report_surround">
<thead>
@@ -21,10 +20,9 @@ if($database->getVillageField($dataarray[26],'name')!="??") {
</tr>
<tr>
<?php
$date = $generator->procMtime($message->readingNotice['time']); ?>
<?php $date = $generator->procMtime($message->readingNotice['time']); ?>
<td class="sent">Sent:</td>
<td>on <?php echo $date[0]."<span> at ".$date[1]; ?></span> <span>hour</span></td>
<td>on <span><?php echo $date[0]." at ".$date[1]; ?></span> <span>hour</span></td>
</tr>
</thead>
<tbody>
@@ -41,39 +39,33 @@ if($database->getVillageField($dataarray[26],'name')!="??") {
<td>&nbsp;</td>
<?php
$tribe = $dataarray[3];
$start = ($tribe-1)*10+1;
for($i=$start;$i<=($start+9);$i++) {
$start = ($tribe - 1) * 10 + 1;
for($i = $start; $i <= ($start + 9); $i++) {
echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
}
if(isset($dataarray[24]) and $dataarray[24]!=0){
if(isset($dataarray[24]) && $dataarray[24] > 0){
echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
}
echo "</tr><tr><th>Troops</th>";
for($i=4;$i<=13;$i++) {
if($dataarray[$i] == 0) {
echo "<td class=\"none\">0</td>";
}
else {
echo "<td>".$dataarray[$i]."</td>";
}
for($i = 4; $i <= 13; $i++) {
if($dataarray[$i] == 0) echo "<td class=\"none\">0</td>";
else echo "<td>".$dataarray[$i]."</td>";
}
if(isset($dataarray[24]) and $dataarray[24]!=0){
if(isset($dataarray[24]) && $dataarray[24] > 0){
echo "<td>$dataarray[24]</td>";
}
echo "<tr><th>Casualties</th>";
for($i=14;$i<=23;$i++) {
if($dataarray[$i] == 0) {
echo "<td class=\"none\">0</td>";
}
else {
echo "<td>".$dataarray[$i]."</td>";
}
for($i = 14; $i <= 23; $i++) {
if($dataarray[$i] == 0) echo "<td class=\"none\">0</td>";
else echo "<td>".$dataarray[$i]."</td>";
}
if(isset($dataarray[24]) and $dataarray[24]!=0){
if ($dataarray[25]==0){$tdclass='class="none"';}
if(isset($dataarray[24]) && $dataarray[24] > 0){
if ($dataarray[25] == 0){$tdclass = 'class="none"';}
echo "<td $tdclass>$dataarray[25]</td>";
}
?>
</tr></tbody>
</table>
</td></tr></tbody></table>
</td></tr></tbody></table>