archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

budget: fix bug that caused budget numbers to occassionally be wrong

Browse source 
when bringing up the budget manually, depending on the exact moment
the road/rail/etc counts might be wrong, leading to wrong numbers being
shown

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@583 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-02-24 21:25:59 +00:00
parent e98727b601
commit 6cfc5ef5ef
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/micropolisj/engine/Micropolis.java
View file

@ -129,6 +129,13 @@ public class Micropolis
int totalPop;
int lastCityPop;
// used in generateBudget()
int lastRoadTotal;
int lastRailTotal;
int lastTotalPop;
int lastFireStationCount;
int lastPoliceCount;
int trafficMaxLocationX;
int trafficMaxLocationY;
int pollutionMaxLocationX;
@ -1669,6 +1676,12 @@ public class Micropolis
void collectTaxPartial()
{
lastRoadTotal = roadTotal;
lastRailTotal = railTotal;
lastTotalPop = totalPop;
lastFireStationCount = fireStationCount;
lastPoliceCount = policeCount;
BudgetNumbers b = generateBudget();
taxFund += b.taxIncome;
@ -1731,12 +1744,12 @@ public class Micropolis
b.policePercent = Math.max(0.0, policePercent);
b.previousBalance = totalFunds;
b.taxIncome = (int)Math.round(totalPop * landValueAverage / 120 * b.taxRate * FLevels[gameLevel]);
b.taxIncome = (int)Math.round(lastTotalPop * landValueAverage / 120 * b.taxRate * FLevels[gameLevel]);
assert b.taxIncome >= 0;
b.roadRequest = (int)Math.round((roadTotal + railTotal * 2) * RLevels[gameLevel]);
b.fireRequest = 100 * fireStationCount;
b.policeRequest = 100 * policeCount;
b.roadRequest = (int)Math.round((lastRoadTotal + lastRailTotal * 2) * RLevels[gameLevel]);
b.fireRequest = 100 * lastFireStationCount;
b.policeRequest = 100 * lastPoliceCount;
b.roadFunded = (int)Math.round(b.roadRequest * b.roadPercent);
b.fireFunded = (int)Math.round(b.fireRequest * b.firePercent);