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

update

Browse Source
This commit is contained in:
unknown
2012-08-10 20:36:18 +03:00
parent 13567e4954
commit 69cbf002b4
17 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Technology.php
+3 -1
View File
@@ -212,7 +212,7 @@ class Technology {
return $ownunit; return $ownunit;
} }
function getAllUnits($base,$InVillageOnly=False) { function getAllUnits($base,$InVillageOnly=False,$mode=0) {
global $database; global $database;
$ownunit = $database->getUnit($base); $ownunit = $database->getUnit($base);
$ownunit['u99'] -= $ownunit['u99']; $ownunit['u99'] -= $ownunit['u99'];
@@ -226,6 +226,7 @@ class Technology {
$ownunit['hero'] += $enforce['hero']; $ownunit['hero'] += $enforce['hero'];
} }
} }
if($mode==0){
$prisoners = $database->getPrisoners($base); $prisoners = $database->getPrisoners($base);
if(!empty($prisoners)) { if(!empty($prisoners)) {
foreach($prisoners as $prisoner){ foreach($prisoners as $prisoner){
@@ -240,6 +241,7 @@ class Technology {
$ownunit['hero'] += $prisoner['t11']; $ownunit['hero'] += $prisoner['t11'];
} }
} }
}
if(!$InVillageOnly) { if(!$InVillageOnly) {
$movement = $database->getVillageMovement($base); $movement = $database->getVillageMovement($base);
if(!empty($movement)) { if(!empty($movement)) {
Templates/Build/36.tpl
+11 -1
View File
@@ -76,7 +76,17 @@ include("next.tpl");
foreach($trainlist as $train) { foreach($trainlist as $train) {
$train_amt += $train['amt']; $train_amt += $train['amt'];
} }
$max = $bid36[$village->resarray['f'.$id]]['attri'] - ($village->unitarray['u99'] + $train_amt);
$max = $technology->maxUnit(99,false);
$max1 = 0;
for($i=19;$i<41;$i++){
if($village->resarray['f'.$i.'t'] == 36){
$max1 += $bid36[$village->resarray['f'.$i]]['attri'];
}
}
if($max > $max1 - ($village->unitarray['u99'] + $train_amt)){
$max = $max1 - ($village->unitarray['u99'] + $train_amt);
}
if($max < 0){ if($max < 0){
$max = 0; $max = 0;
} }
Templates/Notice/1.tpl
+1 -1
View File
@@ -75,7 +75,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/Notice/1x.tpl
+1 -1
View File
@@ -78,7 +78,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/Notice/2.tpl
+1 -1
View File
@@ -75,7 +75,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/Notice/2x.tpl
+1 -1
View File
@@ -78,7 +78,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/Notice/3.tpl
+1 -1
View File
@@ -77,7 +77,7 @@ for($i=153;$i<=162;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[163]) and $dataarray[163]!=0){ if(isset($dataarray[151]) and $dataarray[151]!=0){
if ($dataarray[163]==0){$tdclass='class="none"';} if ($dataarray[163]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[163]</td>"; echo "<td $tdclass>$dataarray[163]</td>";
} }
Templates/Notice/3x.tpl
+1 -1
View File
@@ -80,7 +80,7 @@ for($i=153;$i<=162;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[163]) and $dataarray[163]!=0){ if(isset($dataarray[151]) and $dataarray[151]!=0){
if ($dataarray[163]==0){$tdclass='class="none"';} if ($dataarray[163]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[163]</td>"; echo "<td $tdclass>$dataarray[163]</td>";
} }
Templates/Notice/4.tpl
+1 -1
View File
@@ -75,7 +75,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/Notice/4x.tpl
+1 -1
View File
@@ -78,7 +78,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/Notice/5.tpl
+1 -1
View File
@@ -75,7 +75,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/Notice/5x.tpl
+1 -1
View File
@@ -78,7 +78,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/Notice/6.tpl
+1 -1
View File
@@ -75,7 +75,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/Notice/6x.tpl
+1 -1
View File
@@ -78,7 +78,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/Notice/7.tpl
+1 -1
View File
@@ -72,7 +72,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/Notice/7x.tpl
+1 -1
View File
@@ -77,7 +77,7 @@ for($i=151;$i<=160;$i++) {
echo "<td>".$dataarray[$i]."</td>"; echo "<td>".$dataarray[$i]."</td>";
} }
} }
if(isset($dataarray[161]) and $dataarray[161]!=0){ if(isset($dataarray[147]) and $dataarray[147]!=0){
if ($dataarray[161]==0){$tdclass='class="none"';} if ($dataarray[161]==0){$tdclass='class="none"';}
echo "<td $tdclass>$dataarray[161]</td>"; echo "<td $tdclass>$dataarray[161]</td>";
} }
Templates/troops.tpl
+1 -1
View File
@@ -14,7 +14,7 @@
<th colspan="3"><?php echo TROOPS_DORF; ?></th> <th colspan="3"><?php echo TROOPS_DORF; ?></th>
</tr></thead><tbody> </tr></thead><tbody>
<?php <?php
$troops = $technology->getAllUnits($village->wid,True); $troops = $technology->getAllUnits($village->wid,True,1);
$TroopsPresent = False; $TroopsPresent = False;
for($i=1;$i<=50;$i++) { for($i=1;$i<=50;$i++) {
if($troops['u'.$i] > 0) { if($troops['u'.$i] > 0) {