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

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 ?

Browse Source
This commit is contained in:
unknown
2012-04-20 15:27:04 +03:00
parent f21b3894f4
commit 391fc183c0
18 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+13
View File
@@ -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).'']; $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!!! //NEED TO SEND A RAPPORTAGE!!!
$data2 = ''.$database->getVillageField($enforce['from'],"owner").','.$to['wref'].','.addslashes($to['name']).','.$tribe.','.$life.','.$notlife.''; $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){ if($notlife == 0){
$database->addNotice($database->getVillageField($enforce['from'],"owner"),$from['wref'],$ownally,15,'Reinforcement in '.addslashes($to['name']).' was attacked',$data2,$AttackArrivalTime); $database->addNotice($database->getVillageField($enforce['from'],"owner"),$from['wref'],$ownally,15,'Reinforcement in '.addslashes($to['name']).' was attacked',$data2,$AttackArrivalTime);
}else if($life1 > $notlife1){ }else if($life1 > $notlife1){
@@ -1091,6 +1103,7 @@ ${dead.$i}=$data['t'.$i];
} }
//delete reinf sting when its killed all. //delete reinf sting when its killed all.
if($wrong=='0'){ $database->deleteReinf($enforce['id']); } 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'].''; $unitsdead_def[1] = ''.$dead['1'].','.$dead['2'].','.$dead['3'].','.$dead['4'].','.$dead['5'].','.$dead['6'].','.$dead['7'].','.$dead['8'].','.$dead['9'].','.$dead['10'].'';
Templates/Build/16_incomming.tpl
+1 -1
View File
@@ -101,7 +101,7 @@ $to = $database->getMInfo($units[$y]['vref']);
<tr><th>Troops</th> <tr><th>Troops</th>
<?php <?php
for($i=1;$i<($units[$y]['t11'] != 0?12:11);$i++) { 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) { if($units[$y]['t'.$i] == 0) {
echo "<td class=\"none\">0</td>"; echo "<td class=\"none\">0</td>";
} }
Templates/Notice/0.tpl
+2 -1
View File
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/1.tpl
+2 -1
View File
@@ -31,7 +31,8 @@ if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/15.tpl
+2 -1
View File
@@ -29,7 +29,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/16.tpl
+2 -1
View File
@@ -29,7 +29,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/17.tpl
+2 -1
View File
@@ -29,7 +29,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/18.tpl
+2 -1
View File
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/19.tpl
+2 -1
View File
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/2.tpl
+2 -1
View File
@@ -30,7 +30,8 @@ if($dataarray[147]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";}
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/20.tpl
+2 -1
View File
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/21.tpl
+2 -1
View File
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/3.tpl
+2 -1
View File
@@ -34,7 +34,8 @@ if($dataarray[147]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";}
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/4.tpl
+2 -1
View File
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/5.tpl
+2 -1
View File
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/6.tpl
+2 -1
View File
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/7.tpl
+2 -1
View File
@@ -28,7 +28,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }
Templates/Notice/8.tpl
+2 -1
View File
@@ -25,7 +25,8 @@ $dataarray = explode(",",$message->readingNotice['data']);
<tbody class="units"><tr> <tbody class="units"><tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<?php <?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++) { 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>"; echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
} }