fix: upkeep decreases crop usage by real usage value of Roman units

This commit is contained in:
Martin Ambrus
2017-10-28 11:52:55 +02:00
parent 48ed6ec359
commit 06de01cdd7
+54 -25
View File
@@ -440,39 +440,68 @@ class Technology {
$end = 50; $end = 50;
break; break;
} }
for($j=19;$j<=38;$j++) {
if($buildarray['f'.$j.'t'] == 41) {
$horsedrinking = $j;
break;
}
}
for($i=$start;$i<=$end;$i++) { for($i=$start;$i<=$end;$i++) {
$k = $i-$start+1; $k = $i-$start+1;
$unit = "u".$i; $unit = "u".$i;
$unit2 = "t".$k; $unit2 = "t".$k;
global $$unit; global $$unit;
$dataarray = $$unit; $dataarray = $$unit;
for($j=19;$j<=38;$j++) {
if($buildarray['f'.$j.'t'] == 41) {
$horsedrinking = $j;
}
}
if($prisoners == 0){ if($prisoners == 0){
if(isset($horsedrinking)){ if(isset($horsedrinking)){
if(($i==4 && $buildarray['f'.$horsedrinking] >= 10) if(($i==4 && $buildarray['f'.$horsedrinking] >= 10)
|| ($i==5 && $buildarray['f'.$horsedrinking] >= 15) || ($i==5 && $buildarray['f'.$horsedrinking] >= 15)
|| ($i==6 && $buildarray['f'.$horsedrinking] == 20)) { || ($i==6 && $buildarray['f'.$horsedrinking] == 20)
$upkeep += ($dataarray['pop']-1) * $array[$unit]; ) {
$upkeepDecrement = 0;
switch ($i) {
case 4: $upkeepDecrement = 2;
break;
case 5: $upkeepDecrement = 3;
break;
case 6: $upkeepDecrement = 4;
break;
}
$upkeep += ($dataarray['pop'] - $upkeepDecrement) * $array[$unit];
} else {
$upkeep += $dataarray['pop'] * $array[$unit];
}
} else {
$upkeep += $dataarray['pop'] * $array[$unit];
}
} else { } else {
$upkeep += $dataarray['pop'] * $array[$unit]; if(isset($horsedrinking)){
}}else{ if(($i==4 && $buildarray['f'.$horsedrinking] >= 10)
$upkeep += $dataarray['pop'] * $array[$unit]; || ($i==5 && $buildarray['f'.$horsedrinking] >= 15)
} || ($i==6 && $buildarray['f'.$horsedrinking] == 20)
}else{ ) {
if(isset($horsedrinking)){ $upkeepDecrement = 0;
if(($i==4 && $buildarray['f'.$horsedrinking] >= 10) switch ($i) {
|| ($i==5 && $buildarray['f'.$horsedrinking] >= 15) case 4: $upkeepDecrement = 2;
|| ($i==6 && $buildarray['f'.$horsedrinking] == 20)) { break;
$upkeep += ($dataarray['pop']-1) * $array[$unit2];
} else { case 5: $upkeepDecrement = 3;
$upkeep += $dataarray['pop'] * $array[$unit2]; break;
}}else{
$upkeep += $dataarray['pop'] * $array[$unit2]; case 6: $upkeepDecrement = 4;
} break;
}
$upkeep += ($dataarray['pop'] - $upkeepDecrement) * $array[$unit2];
} else {
$upkeep += $dataarray['pop'] * $array[$unit2];
}
} else {
$upkeep += $dataarray['pop'] * $array[$unit2];
}
} }
} }
// $unit = "hero"; // $unit = "hero";