Commit graph

72 commits

Author SHA1 Message Date
jason@long.name
c4fa905d97 doc: file format
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@607 d9718cc8-9f43-0410-858b-315f434eb58c
2013-04-27 17:11:00 +00:00
jason@long.name
7e52c97246 file-format: fix to load files generated by simcity classic
Warning- loading and then saving such a file will probably cause
the file to be unreadable to simcity classic

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@606 d9718cc8-9f43-0410-858b-315f434eb58c
2013-04-07 00:15:13 +00:00
jason@long.name
1bbc20487f overlay-map: add sanity check for tile value before indexing a tile
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@605 d9718cc8-9f43-0410-858b-315f434eb58c
2013-04-07 00:14:55 +00:00
jason@long.name
19a3fcefd7 game-load: fix bug in speed sanity check
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@604 d9718cc8-9f43-0410-858b-315f434eb58c
2013-04-07 00:14:42 +00:00
jason@long.name
93b5422afb CityBudget: do not change funds when changing difficulty level
Before I had implemented the New City dialog box, the only way
to set the difficulty was via the menu after the game started.
Now that the difficulty level can be set before starting the game,
there is no need to give/take money when the difficulty changes.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@603 d9718cc8-9f43-0410-858b-315f434eb58c
2013-03-23 15:46:18 +00:00
jason@long.name
2c69407d47 CityBudget: do not change funds when generating a map
initial funds are now set when player clicks Play button

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@602 d9718cc8-9f43-0410-858b-315f434eb58c
2013-03-23 15:46:05 +00:00
jason@long.name
0b8efea513 CityBudget: move in the four escrow-style account balances
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@601 d9718cc8-9f43-0410-858b-315f434eb58c
2013-03-23 15:45:52 +00:00
jason@long.name
04534d6273 refactor: move totalFunds property to separate class
this new class (CityBudget) will contain all finance-related balances

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@600 d9718cc8-9f43-0410-858b-315f434eb58c
2013-03-23 15:45:37 +00:00
jason@long.name
92f79886ae overlay-map: allow engine to be queried
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@599 d9718cc8-9f43-0410-858b-315f434eb58c
2013-03-23 14:08:30 +00:00
jason@long.name
efd0326db2 engine: allow non-default sized maps to be instantiated
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@598 d9718cc8-9f43-0410-858b-315f434eb58c
2013-03-23 14:08:09 +00:00
jason@long.name
e80daa30de java: start the GUI the proper way, using the EDT
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@597 d9718cc8-9f43-0410-858b-315f434eb58c
2013-03-18 22:29:56 +00:00
jason@long.name
344c34c039 TODO- document a potential bug that needs reviewed some day
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@596 d9718cc8-9f43-0410-858b-315f434eb58c
2013-03-18 22:29:45 +00:00
jason@long.name
d7c37b2909 bump version
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@595 d9718cc8-9f43-0410-858b-315f434eb58c
2013-03-18 22:29:33 +00:00
jason@long.name
478de9aae5 aboutdlg: include information on how to get the source code
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@594 d9718cc8-9f43-0410-858b-315f434eb58c
2013-03-18 22:29:23 +00:00
jason@long.name
4f4f166cca aboutdlg: include version/vendor of Java run-time in About dialog box
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@593 d9718cc8-9f43-0410-858b-315f434eb58c
2013-03-15 20:30:06 +00:00
jason@long.name
9c5b1fca33 cleanup: no longer need the autoDoze function
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@592 d9718cc8-9f43-0410-858b-315f434eb58c
2013-02-27 01:30:36 +00:00
jason@long.name
21ecd20092 autobulldoze: fix behavior of road and rail tools
now when there's not enough money to build a rail or road,
the auto-bulldoze will not have any effect

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@591 d9718cc8-9f43-0410-858b-315f434eb58c
2013-02-27 01:30:30 +00:00
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