xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-23 19:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: horse drinking trough forgives upkeep for all horse units

Browse Source 
#105
This commit is contained in:
Martin Ambrus
2017-11-26 16:00:55 +01:00
parent 3ccdbec06d
commit ef416cd548
1 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Technology.php
+6 -34
View File
@@ -499,26 +499,12 @@ class Technology {
|| ( $i == 5 && $buildarray[ 'f' . $horsedrinking ] >= 15 ) || ( $i == 5 && $buildarray[ 'f' . $horsedrinking ] >= 15 )
|| ( $i == 6 && $buildarray[ 'f' . $horsedrinking ] == 20 ) || ( $i == 6 && $buildarray[ 'f' . $horsedrinking ] == 20 )
) { ) {
$upkeepDecrement = 0; $upkeep += (( $dataarray['pop'] - 1 ) * $array[ $unit ]);
switch ( $i ) {
case 4:
$upkeepDecrement = 2;
break;
case 5:
$upkeepDecrement = 3;
break;
case 6:
$upkeepDecrement = 4;
break;
}
$upkeep += ( $dataarray['pop'] - $upkeepDecrement ) * $array[ $unit ];
} else { } else {
$upkeep += $dataarray['pop'] * $array[ $unit ]; $upkeep += ($dataarray['pop'] * $array[ $unit ]);
} }
} else { } else {
$upkeep += $dataarray['pop'] * $array[ $unit ]; $upkeep += ($dataarray['pop'] * $array[ $unit ]);
} }
} else { } else {
if ( isset( $horsedrinking ) ) { if ( isset( $horsedrinking ) ) {
@@ -526,26 +512,12 @@ class Technology {
|| ( $i == 5 && $buildarray[ 'f' . $horsedrinking ] >= 15 ) || ( $i == 5 && $buildarray[ 'f' . $horsedrinking ] >= 15 )
|| ( $i == 6 && $buildarray[ 'f' . $horsedrinking ] == 20 ) || ( $i == 6 && $buildarray[ 'f' . $horsedrinking ] == 20 )
) { ) {
$upkeepDecrement = 0; $upkeep += (( $dataarray['pop'] - 1 ) * $array[ $unit2 ]);
switch ( $i ) {
case 4:
$upkeepDecrement = 2;
break;
case 5:
$upkeepDecrement = 3;
break;
case 6:
$upkeepDecrement = 4;
break;
}
$upkeep += ( $dataarray['pop'] - $upkeepDecrement ) * $array[ $unit2 ];
} else { } else {
$upkeep += $dataarray['pop'] * $array[ $unit2 ]; $upkeep += ($dataarray['pop'] * $array[ $unit2 ]);
} }
} else { } else {
$upkeep += $dataarray['pop'] * $array[ $unit2 ]; $upkeep += ($dataarray['pop'] * $array[ $unit2 ]);
} }
} }
} }