From 391fc183c08d018579a38b87e118653486b3cd70 Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Fri, 20 Apr 2012 15:27:04 +0300
Subject: [PATCH] fix unit icons in report, now you can see when your
 reinforcemnt scouted if the village without spys, and update
 Templates/Build/16_incomming.tpl: now when your reinforcement return you can
 see the troops number instead ?

---
 GameEngine/Automation.php        | 13 +++++++++++++
 Templates/Build/16_incomming.tpl |  2 +-
 Templates/Notice/0.tpl           |  3 ++-
 Templates/Notice/1.tpl           |  3 ++-
 Templates/Notice/15.tpl          |  3 ++-
 Templates/Notice/16.tpl          |  3 ++-
 Templates/Notice/17.tpl          |  3 ++-
 Templates/Notice/18.tpl          |  3 ++-
 Templates/Notice/19.tpl          |  3 ++-
 Templates/Notice/2.tpl           |  3 ++-
 Templates/Notice/20.tpl          |  3 ++-
 Templates/Notice/21.tpl          |  3 ++-
 Templates/Notice/3.tpl           |  3 ++-
 Templates/Notice/4.tpl           |  3 ++-
 Templates/Notice/5.tpl           |  3 ++-
 Templates/Notice/6.tpl           |  3 ++-
 Templates/Notice/7.tpl           |  3 ++-
 Templates/Notice/8.tpl           |  3 ++-
 18 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index 6127949b..7603f2c7 100644
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -1082,6 +1082,18 @@ ${dead.$i}=$data['t'.$i];
 						$life1 = $enforce['u'.$start.'']+$enforce['u'.($start+1).'']+$enforce['u'.($start+2).'']+$enforce['u'.($start+3).'']+$enforce['u'.($start+4).'']+$enforce['u'.($start+5).'']+$enforce['u'.($start+6).'']+$enforce['u'.($start+7).'']+$enforce['u'.($start+8).'']+$enforce['u'.($start+9).''];
                         //NEED TO SEND A RAPPORTAGE!!!
                         $data2 = ''.$database->getVillageField($enforce['from'],"owner").','.$to['wref'].','.addslashes($to['name']).','.$tribe.','.$life.','.$notlife.'';
+						if($scout){
+						for($i=1;$i<=10;$i++)
+						{
+						if($battlepart['casualties_attacker'][$i]){
+						if($unitsdead_att == $unitssend_att){
+                        $database->addNotice($database->getVillageField($enforce['from'],"owner"),$from['wref'],$ownally,15,'Reinforcement in '.addslashes($to['name']).' was attacked',$data2,$AttackArrivalTime);
+						}else{
+						$database->addNotice($database->getVillageField($enforce['from'],"owner"),$from['wref'],$ownally,16,'Reinforcement in '.addslashes($to['name']).' was attacked',$data2,$AttackArrivalTime);
+						}
+						}
+						}
+						}else{
 						if($notlife == 0){
                         $database->addNotice($database->getVillageField($enforce['from'],"owner"),$from['wref'],$ownally,15,'Reinforcement in '.addslashes($to['name']).' was attacked',$data2,$AttackArrivalTime);
 						}else if($life1 > $notlife1){
@@ -1091,6 +1103,7 @@ ${dead.$i}=$data['t'.$i];
 						}
                         //delete reinf sting when its killed all.
                         if($wrong=='0'){ $database->deleteReinf($enforce['id']); }
+						}
                 }
             }
                 $unitsdead_def[1] = ''.$dead['1'].','.$dead['2'].','.$dead['3'].','.$dead['4'].','.$dead['5'].','.$dead['6'].','.$dead['7'].','.$dead['8'].','.$dead['9'].','.$dead['10'].'';
diff --git a/Templates/Build/16_incomming.tpl b/Templates/Build/16_incomming.tpl
index f74c5b2d..fc959e1c 100644
--- a/Templates/Build/16_incomming.tpl
+++ b/Templates/Build/16_incomming.tpl
@@ -101,7 +101,7 @@ $to = $database->getMInfo($units[$y]['vref']);
  <tr><th>Troops</th>
             <?php
             for($i=1;$i<($units[$y]['t11'] != 0?12:11);$i++) {
-			if($units[$y]['attack_type']!=2){
+			if($units[$y]['attack_type']!=2 or $units[$y]['from']==$village->wid){
             	if($units[$y]['t'.$i] == 0) {
                 	echo "<td class=\"none\">0</td>";
                 }
diff --git a/Templates/Notice/0.tpl b/Templates/Notice/0.tpl
index fa565f44..c3bef1fb 100644
--- a/Templates/Notice/0.tpl
+++ b/Templates/Notice/0.tpl
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/1.tpl b/Templates/Notice/1.tpl
index 681ca3ef..35243b90 100644
--- a/Templates/Notice/1.tpl
+++ b/Templates/Notice/1.tpl
@@ -31,7 +31,8 @@ if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/15.tpl b/Templates/Notice/15.tpl
index fb1c7aaa..c294673f 100644
--- a/Templates/Notice/15.tpl
+++ b/Templates/Notice/15.tpl
@@ -29,7 +29,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[3] == 1? 1 : (($dataarray[3] == 2)? 11 : (($dataarray[3] == 3)? 21 : 31));
+$tribe = $dataarray[3];
+$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>";
 }
diff --git a/Templates/Notice/16.tpl b/Templates/Notice/16.tpl
index fb1c7aaa..c294673f 100644
--- a/Templates/Notice/16.tpl
+++ b/Templates/Notice/16.tpl
@@ -29,7 +29,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[3] == 1? 1 : (($dataarray[3] == 2)? 11 : (($dataarray[3] == 3)? 21 : 31));
+$tribe = $dataarray[3];
+$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>";
 }
diff --git a/Templates/Notice/17.tpl b/Templates/Notice/17.tpl
index fb1c7aaa..c294673f 100644
--- a/Templates/Notice/17.tpl
+++ b/Templates/Notice/17.tpl
@@ -29,7 +29,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[3] == 1? 1 : (($dataarray[3] == 2)? 11 : (($dataarray[3] == 3)? 21 : 31));
+$tribe = $dataarray[3];
+$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>";
 }
diff --git a/Templates/Notice/18.tpl b/Templates/Notice/18.tpl
index fa565f44..c3bef1fb 100644
--- a/Templates/Notice/18.tpl
+++ b/Templates/Notice/18.tpl
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/19.tpl b/Templates/Notice/19.tpl
index f9153dae..da8ab4ad 100644
--- a/Templates/Notice/19.tpl
+++ b/Templates/Notice/19.tpl
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/2.tpl b/Templates/Notice/2.tpl
index 6443834c..0559a01d 100644
--- a/Templates/Notice/2.tpl
+++ b/Templates/Notice/2.tpl
@@ -30,7 +30,8 @@ if($dataarray[147]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";}
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/20.tpl b/Templates/Notice/20.tpl
index fa565f44..c3bef1fb 100644
--- a/Templates/Notice/20.tpl
+++ b/Templates/Notice/20.tpl
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/21.tpl b/Templates/Notice/21.tpl
index fa565f44..c3bef1fb 100644
--- a/Templates/Notice/21.tpl
+++ b/Templates/Notice/21.tpl
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/3.tpl b/Templates/Notice/3.tpl
index 251a8110..a22a9d89 100644
--- a/Templates/Notice/3.tpl
+++ b/Templates/Notice/3.tpl
@@ -34,7 +34,8 @@ if($dataarray[147]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";}
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/4.tpl b/Templates/Notice/4.tpl
index b61bfc9f..a58bd2e7 100644
--- a/Templates/Notice/4.tpl
+++ b/Templates/Notice/4.tpl
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/5.tpl b/Templates/Notice/5.tpl
index b61bfc9f..a58bd2e7 100644
--- a/Templates/Notice/5.tpl
+++ b/Templates/Notice/5.tpl
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/6.tpl b/Templates/Notice/6.tpl
index b61bfc9f..a58bd2e7 100644
--- a/Templates/Notice/6.tpl
+++ b/Templates/Notice/6.tpl
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/7.tpl b/Templates/Notice/7.tpl
index b61bfc9f..a58bd2e7 100644
--- a/Templates/Notice/7.tpl
+++ b/Templates/Notice/7.tpl
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }
diff --git a/Templates/Notice/8.tpl b/Templates/Notice/8.tpl
index e09049ca..3a5f0f79 100644
--- a/Templates/Notice/8.tpl
+++ b/Templates/Notice/8.tpl
@@ -25,7 +25,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
 <tbody class="units"><tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$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>";
 }