archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
505 commits 1 branch 0 tags 2.1 MiB
Commit graph

505 commits

This branch
This branch
All branches
Author SHA1 Message Date
jason@long.name
408d3d44bf autobulldoze- fix behavior of wire tool 
now when there's not enough money to build wire, the auto-bulldoze
will not have any effect

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@590 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-27 01:30:23 +00:00
jason@long.name
d10ec8e5b1 cleanup: rename canAutoBulldoze to canAutoBulldozeZ 
since this method is only for when a ZONE is being placed (Z=Zone)

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@589 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-27 01:30:17 +00:00
jason@long.name
8b428bfc29 autobulldoze: prepare for movement of auto-bulldoze code 
When road/rail/wire tool is used, auto-bulldozing occurs before checking
the cost of the road/rail/wire being placed. This means when the user
is low on funds, the wire tool may end up bulldozing only, even though
there is not enough money for building what they want.

This patch prepares the way for moving where the auto-bulldoze check
is done in the case of the road/rail/wire tool.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@588 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-27 01:30:10 +00:00
jason@long.name
32d5a8db7c BudgetDialog: refactor so components are layed out by separate functions 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@587 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-27 00:38:54 +00:00
jason@long.name
6ee909e10c cleanup: create constants for fire/police station maintenance cost 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@586 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-24 21:26:17 +00:00
jason@long.name
88669eabb6 BudgetDialog: replace funding spinners with sliders 
also- add back in the column that indicates how much money is requested
for the various departments

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@585 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-24 21:26:11 +00:00
jason@long.name
8e9cd7d94d BudgetDialog: if ESC is pressed, close the dialog 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@584 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-24 21:26:05 +00:00
jason@long.name
6cfc5ef5ef budget: fix bug that caused budget numbers to occassionally be wrong 
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
 2013-02-24 21:25:59 +00:00
jason@long.name
e98727b601 cleanup: eliminate unused MiscHistory class 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@582 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-24 21:25:52 +00:00
jason@long.name
6524f9c22a java6-compat: make compat wrapper for J7 method setAutoRequestFocus() 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@577 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-24 14:01:47 +00:00
jason@long.name
7473c893bd java6-compat: eliminate use of diamond operator (a J7-only feature) 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@576 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-24 14:01:36 +00:00
jason@long.name
b1a1dea224 query tool: check bounds before attempting query 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@575 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-24 01:19:17 +00:00
jason@long.name
5219c6f1be bugfix: check map boundry in traffic gen 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@574 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-24 01:19:11 +00:00
jason@long.name
3cfb63272a build.xml: version bump 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@573 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-24 01:19:04 +00:00
jason@long.name
b0bd5bab21 cleanup: fix really minor typo in comment 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@572 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-23 12:54:04 +00:00
jason@long.name
d9d42b1af2 cleanup: change Animate.Smoke.AniThis to a boolean array 
since it only holds true/false values

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@571 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-23 12:53:57 +00:00
jason@long.name
84fa05500b javadocs: explain a little more about draw bridges 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@570 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-23 12:53:51 +00:00
jason@long.name
4158265409 cleanup: make macros isRoad and isRail to test for those tile types 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@569 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-23 12:53:44 +00:00
jason@long.name
89d6839101 cleanup: rename fireZone to killZone 
since the function is not about setting fire to a zone,
rather it is about nullifying the ability of the zone

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@568 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-20 02:05:04 +00:00
jason@long.name
1da609a5ce coalsmoke: when coal plant blows up, stop its smoke animation 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@567 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-20 02:04:58 +00:00
jason@long.name
aadacd9210 coalplant- do not eliminate fire when animating smoke 
This changes the behavior of a coal plant on fire.
Previously, if the smoke tiles were on fire when the coal plant
is activated, the coalSmoke() function would replace the fire tiles
with the animated smoke.

Now, the animated smoke tiles are only set when the tiles are
the original coal plant tiles.  Fire needs to burn itself out,
the rubble must be bulldozed, then the plant must call repairZone()
for itself, and only then will the animated smoke be added back in.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@566 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-20 02:04:51 +00:00
jason@long.name
4fe20e253e javadocs: document the BudgetNumbers class 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@565 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-20 01:36:57 +00:00
jason@long.name
4b145e0682 javadocs: document the ZoneStatus class 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@564 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-20 01:36:50 +00:00
jason@long.name
d21f73e186 TrafficGen: s/engine/city for consistency with MapScanner class 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@563 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-20 01:36:43 +00:00
jason@long.name
fb2f73c008 cleanup: eliminate TrafficGen.Position in favor of CityLocation 
Two classes that did the same thing for the same purpose.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@562 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-20 01:36:36 +00:00
jason@long.name
41e1321edc javadoc: fix typo that prevented docs for setSmoke() from being parsed 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@561 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 02:43:08 +00:00
jason@long.name
e9ec153278 TODO- document another task that needs looked at some day 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@560 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:58:36 +00:00
jason@long.name
16ad436a14 internal docs: explain fire as source of pollution 
in getPollutionValue() function

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@559 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:58:29 +00:00
jason@long.name
908ff0b5a1 cleanup: drawStadium: use xpos,ypos properties instead of function arguments 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@558 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:58:21 +00:00
jason@long.name
8614e6ff0e cleanup: rename incrementROG to adjustROG and document it 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@557 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:58:15 +00:00
jason@long.name
c48abf0bca cleanup: coalSmoke: use xpos,ypos properties instead of function arguments 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@556 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:58:08 +00:00
jason@long.name
8e9902ef64 cleanup: getCRValue: document and use xpos,ypos properties 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@555 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:58:01 +00:00
jason@long.name
ae95b98980 cleanup: evalResidential, etc: use xpos,ypos properties instead of arguments 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@554 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:57:54 +00:00
jason@long.name
52365e4c35 cleanup: zonePlop: use xpos,ypos properties instead of parameters 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@553 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:57:48 +00:00
jason@long.name
8572c30c60 cleanup: comPlop,indPlop,residentialPlop: use xpos,ypos properties 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@552 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:57:41 +00:00
jason@long.name
d2066409b9 cleanup: make buildHouse() use xpos,ypos properties not parameters 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@551 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:57:35 +00:00
jason@long.name
deb9738b6f cleanup: repairZone: use zoneBase variable to place tiles 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@550 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:57:27 +00:00
jason@long.name
de8b27d10a cleanup: repairZone should use xpos,ypos properties 
instead of using function parameters

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@549 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:57:21 +00:00
jason@long.name
889676d9e2 cleanup: doCommericial, doIndustrial, use xpos,ypos properties 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@548 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:57:11 +00:00
jason@long.name
273620b6c5 cleanup: doResidential{In,Out} use xpos,ypos properties 
instead of having them be passed in as parameters

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@547 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:57:04 +00:00
jason@long.name
e2c1a7eb6a cleanup: setSmoke should use xpos,ypos properties 
instead of requiring them to be passed in as parameters

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@546 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:56:54 +00:00
jason@long.name
a92a5d6107 javadocs: document CityLocation, CityEval, and MapGenerator classes 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@545 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:56:47 +00:00
jason@long.name
9bf7a9d8ec javadocs: document methods of the Sprite class 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@544 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:56:41 +00:00
jason@long.name
beb640e2e8 cleanup: make Animate class private to the package 
since it has no utility outside of the engine itself

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@543 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:56:34 +00:00
jason@long.name
feb04ae09a javadocs: document methods in the MapScanner class 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@542 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:56:29 +00:00
jason@long.name
082d752c21 TODO/FIXME- document some tasks that need to be looked at later 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@541 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-18 01:56:22 +00:00
jason@long.name
0255ae0744 cleanup: remove duplicate definitions of min/max game level 
i.e.
removed Micropolis.MIN_LEVEL and Micropolis.MAX_LEVEL
as it was superceded by
GameLevel.MIN_LEVEL and GameLevel.MAX_LEVEL

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@540 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-17 20:58:31 +00:00
jason@long.name
9943df80f4 javadocs: explain what the simulator's internal arrays do 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@539 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-17 20:58:24 +00:00
jason@long.name
50a7cf4770 cleanup: refactor smoothTerrain() to make it side-effect free 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@538 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-17 20:58:17 +00:00
jason@long.name
567adeee43 cleanup: make qtem a local instead of global variable 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@537 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-02-17 20:58:10 +00:00