mirror of
https://github.com/Shadowss/TravianZ.git
synced 2026-09-01 16:17:13 +00:00
Reports refactor Part 2
+Heroes are now divided by tribes in battle reports +Added to every report the support to read heroes from the battle report data Automation.php: +Added the hero data, to every battle reports +Fixed a bug that didn't count own dead defensive troops for general attacks, top 10 attackers, attackers and hero xp +Fixed a bug that didn't permit to add the rat enforcement to the village, from quest number 8 Battle.php: +Fixed a bug with catapults/rams that permitted to destroy level 1 buildings with only one catapults (even against 1000000 defensive troops) +Added a new function, for more readability +General minor improovementes and bug fixing
This commit is contained in:
iopietro
+43
-42
@@ -1,8 +1,7 @@
|
||||
<?php
|
||||
$dataarray = explode(",",$message->readingNotice['data']);
|
||||
$colspan = (isset($dataarray[168]) && $dataarray[168] > 0) ? 11 : 10;
|
||||
$colspan2 = (isset($dataarray[170]) && $dataarray[170] > 0) ? 11 : 10;
|
||||
$spy = !empty($dataarray[167]) && !empty($dataarray[166]) && empty($dataarray[185]);
|
||||
$colspan = (isset($dataarray[178]) && $dataarray[178] > 0) ? 11 : 10;
|
||||
$spy = !empty($dataarray[177]) && !empty($dataarray[176]) && empty($dataarray[195]);
|
||||
|
||||
//Attacker
|
||||
if ($database->getUserField($dataarray[0], 'username', 0) != "[?]") {
|
||||
@@ -62,7 +61,7 @@ $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[168]) && $dataarray[168] > 0){
|
||||
if (isset($dataarray[178]) && $dataarray[178] > 0){
|
||||
echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
|
||||
}
|
||||
echo "</tr><tr><th>Troops</th>";
|
||||
@@ -72,8 +71,8 @@ for($i = 3; $i <= 12; $i++) {
|
||||
else echo "<td>".$dataarray[$i]."</td>";
|
||||
}
|
||||
|
||||
if (isset($dataarray[168]) && $dataarray[168] > 0){
|
||||
echo "<td>$dataarray[168]</td>";
|
||||
if (isset($dataarray[178]) && $dataarray[178] > 0){
|
||||
echo "<td>$dataarray[178]</td>";
|
||||
}
|
||||
echo "<tr><th>Casualties</th>";
|
||||
|
||||
@@ -82,88 +81,90 @@ for($i = 13; $i <= 22; $i++) {
|
||||
else echo "<td>".$dataarray[$i]."</td>";
|
||||
}
|
||||
|
||||
if(isset($dataarray[168]) && $dataarray[168] > 0){
|
||||
if ($dataarray[169] == 0) $tdclass='class="none"'; else $tdclass='';
|
||||
echo "<td $tdclass>$dataarray[169]</td>";
|
||||
if(isset($dataarray[178]) && $dataarray[178] > 0){
|
||||
if ($dataarray[179] == 0) $tdclass='class="none"'; else $tdclass='';
|
||||
echo "<td $tdclass>$dataarray[179]</td>";
|
||||
}
|
||||
if(!$spy && ($dataarray[172] > 0 || $dataarray[173] > 0 || $dataarray[174] > 0 || $dataarray[175] > 0 || $dataarray[176] > 0 || $dataarray[177] > 0 || $dataarray[178] > 0 || $dataarray[179] > 0 || $dataarray[180] > 0 || $dataarray[181] > 0 || $dataarray[182] > 0)){
|
||||
if(!$spy && array_sum(array_slice($dataarray, 182, 11)) > 0){
|
||||
echo "</tr><tr><th>Prisoners</th>";
|
||||
for($i = 172; $i <= 181; $i++) {
|
||||
for($i = 182; $i <= 191; $i++) {
|
||||
if($dataarray[$i] == 0) echo "<td class=\"none\">0</td>";
|
||||
else echo "<td>".$dataarray[$i]."</td>";
|
||||
}
|
||||
if(isset($dataarray[168]) && $dataarray[168] > 0){
|
||||
if ($dataarray[182] == 0) $tdclass='class="none"'; else $tdclass='';
|
||||
echo "<td $tdclass>$dataarray[182]</td>";
|
||||
if(isset($dataarray[178]) && $dataarray[178] > 0){
|
||||
if ($dataarray[192] == 0) $tdclass='class="none"'; else $tdclass='';
|
||||
echo "<td $tdclass>$dataarray[192]</td>";
|
||||
}
|
||||
}
|
||||
echo "</tr></tbody>";
|
||||
if (!empty($dataarray[160]) && !empty($dataarray[161])){ //ram
|
||||
if (!empty($dataarray[170]) && !empty($dataarray[171])){ //ram
|
||||
?>
|
||||
<tbody class="goods"><tr><th>Information</th><td colspan="<?php echo $colspan; ?>">
|
||||
<img class="unit u<?php echo $dataarray[160]; ?>" src="img/x.gif" alt="Ram" title="Ram" />
|
||||
<?php echo $dataarray[161]; ?>
|
||||
<img class="unit u<?php echo $dataarray[170]; ?>" src="img/x.gif" alt="Ram" title="Ram" />
|
||||
<?php echo $dataarray[171]; ?>
|
||||
</td></tr></tbody>
|
||||
<?php }
|
||||
if (!empty($dataarray[162]) && !empty($dataarray[163])){ //cata
|
||||
if (!empty($dataarray[172]) && !empty($dataarray[173])){ //cata
|
||||
?>
|
||||
<tbody class="goods"><tr><th>Information</th><td colspan="<?php echo $colspan; ?>">
|
||||
<img class="unit u<?php echo $dataarray[162]; ?>" src="img/x.gif" alt="Catapult" title="Catapult" />
|
||||
<?php echo $dataarray[163]; ?>
|
||||
<img class="unit u<?php echo $dataarray[172]; ?>" src="img/x.gif" alt="Catapult" title="Catapult" />
|
||||
<?php echo $dataarray[173]; ?>
|
||||
</td></tr></tbody>
|
||||
<?php }
|
||||
if (!empty($dataarray[164]) && !empty($dataarray[165])){ //chief
|
||||
if (!empty($dataarray[174]) && !empty($dataarray[175])){ //chief
|
||||
?>
|
||||
<tbody class="goods"><tr><th>Information</th><td colspan="<?php echo $colspan; ?>">
|
||||
<img class="unit u<?php echo $dataarray[164]; ?>" src="img/x.gif" alt="Chief" title="Chief" />
|
||||
<?php echo $dataarray[165]; ?>
|
||||
<img class="unit u<?php echo $dataarray[174]; ?>" src="img/x.gif" alt="Chief" title="Chief" />
|
||||
<?php echo $dataarray[175]; ?>
|
||||
</td></tr></tbody>
|
||||
<?php }
|
||||
if ($spy){ //spy
|
||||
?>
|
||||
<tbody class="goods"><tr><th>Information</th><td colspan="<?php echo $colspan; ?>">
|
||||
|
||||
<?php echo $dataarray[167]; ?>
|
||||
<?php echo $dataarray[177]; ?>
|
||||
</td></tr></tbody>
|
||||
<?php }
|
||||
if (!empty($dataarray[183])){ //release prisoners
|
||||
if (!empty($dataarray[193])){ //release prisoners
|
||||
?>
|
||||
<tbody class="goods"><tr><th>Information</th><td colspan="<?php echo $colspan; ?>">
|
||||
|
||||
<?php echo $dataarray[183]; ?>
|
||||
<?php echo $dataarray[193]; ?>
|
||||
</td></tr></tbody>
|
||||
<?php }
|
||||
if (!empty($dataarray[186]) && !empty($dataarray[187])){ //hero
|
||||
if (!empty($dataarray[196]) && !empty($dataarray[197])){ //hero
|
||||
?>
|
||||
<tbody class="goods"><tr><th>Information</th><td colspan="<?php echo $colspan; ?>">
|
||||
<img class="unit u<?php echo $dataarray[186]; ?>" src="img/x.gif" alt="Hero" title="Hero" />
|
||||
<?php echo $dataarray[187]; ?>
|
||||
<img class="unit u<?php echo $dataarray[196]; ?>" src="img/x.gif" alt="Hero" title="Hero" />
|
||||
<?php echo $dataarray[197]; ?>
|
||||
</td></tr></tbody>
|
||||
<?php }
|
||||
if(isset($dataarray[185]) && !empty($dataarray[185])){ //No troops returned
|
||||
if(isset($dataarray[195]) && !empty($dataarray[195])){ //No troops returned
|
||||
?>
|
||||
<tbody class="goods"><tr><th>Information</th><td colspan="<?php echo $colspan; ?>">
|
||||
<?php echo $dataarray[185]; ?>
|
||||
<?php echo $dataarray[195]; ?>
|
||||
</td></tr></tbody>
|
||||
<?php }elseif(empty($dataarray[166]) && empty($dataarray[167])){?>
|
||||
<?php }elseif(empty($dataarray[176]) && empty($dataarray[177])){?>
|
||||
<tbody class="goods"><tr><th>Bounty</th><td colspan="<?php echo $colspan; ?>">
|
||||
<div class="res"><img class="r1" src="img/x.gif" alt="Lumber" title="Lumber" /><?php echo $dataarray[23]; ?> | <img class="r2" src="img/x.gif" alt="Clay" title="Clay" /><?php echo $dataarray[24]; ?> | <img class="r3" src="img/x.gif" alt="Iron" title="Iron" /><?php echo $dataarray[25]; ?> | <img class="r4" src="img/x.gif" alt="Crop" title="Crop" /><?php echo $dataarray[26]; ?></div><div class="carry"><img class="car" src="img/x.gif" alt="carry" title="carry" /><?php echo ($dataarray[23]+$dataarray[24]+$dataarray[25]+$dataarray[26])."/".$dataarray[27]; ?></div>
|
||||
</td></tr></tbody></table>
|
||||
<?php } //Defender(s)
|
||||
$defArray = [1, $dataarray[55], $dataarray[76], $dataarray[97], $dataarray[118], $dataarray[139]];
|
||||
$targetTribe = $dataarray[33];
|
||||
$targetTribe = $dataarray[34];
|
||||
foreach($defArray as $index => $value){
|
||||
if($value == 0) continue;
|
||||
|
||||
$heroIndex = ($index == 0 ? 180 : 160 + ($index - 1));
|
||||
$heroDeadIndex = ($index == 0 ? 1 : 5);
|
||||
|
||||
$target = ($index == 0 ? $targetTribe : $index) - 1;
|
||||
$start = $target * 10 + 1;
|
||||
$troopsStart = $index * 21 + 35 - ($index == 0 ? 1 : 0);
|
||||
$troopsStart = $index * 21 + 35;
|
||||
?>
|
||||
<table cellpadding="1" cellspacing="1" class="defender">
|
||||
<thead>
|
||||
<tr>
|
||||
<td class="role">Defender</td>
|
||||
<td colspan="<?php echo $colspan2; ?>"><?php echo ($index == 0) ? $defuser_url." from the village ".$deffrom_url : "Reinforcement"; ?></td>
|
||||
<td colspan="<?php echo $dataarray[$heroIndex] > 0 ? 11 : 10; ?>"><?php echo ($index == 0) ? $defuser_url." from the village ".$deffrom_url : "Reinforcement"; ?></td>
|
||||
</tr></thead>
|
||||
<tbody class="units">
|
||||
<tr>
|
||||
@@ -173,7 +174,7 @@ foreach($defArray as $index => $value){
|
||||
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[170]) && $dataarray[170] > 0){
|
||||
if(isset($dataarray[$heroIndex]) && $dataarray[$heroIndex] > 0){
|
||||
echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
|
||||
}
|
||||
echo "</tr><tr><th>Troops</th>";
|
||||
@@ -183,8 +184,8 @@ for($i = $troopsStart; $i <= $troopsStart + 9; $i++) {
|
||||
else echo "<td>".$dataarray[$i]."</td>";
|
||||
}
|
||||
|
||||
if(isset($dataarray[170]) && $dataarray[170] > 0){
|
||||
echo "<td>$dataarray[170]</td>";
|
||||
if(isset($dataarray[$heroIndex]) && $dataarray[$heroIndex] > 0){
|
||||
echo "<td>".$dataarray[$heroIndex]."</td>";
|
||||
}
|
||||
echo "<tr><th>Casualties</th>";
|
||||
|
||||
@@ -193,9 +194,9 @@ for($i = $troopsStart + 10; $i <= $troopsStart + 19; $i++) {
|
||||
else echo "<td>".$dataarray[$i]."</td>";
|
||||
}
|
||||
|
||||
if(isset($dataarray[170]) && $dataarray[170] > 0){
|
||||
if ($dataarray[171] == 0){$tdclass1='class="none"';}
|
||||
echo "<td $tdclass1>$dataarray[171]</td>";
|
||||
if(isset($dataarray[$heroIndex]) && $dataarray[$heroIndex] > 0){
|
||||
if ($dataarray[$heroIndex + $heroDeadIndex] == 0) $tdclass1 = 'class="none"';
|
||||
echo "<td $tdclass1>".$dataarray[$heroIndex + $heroDeadIndex]."</td>";
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user