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

276 commits

This branch
This branch
All branches
Author SHA1 Message Date
jason@long.name
52512c8987 tiles.rc: annotate each tile with its description number 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@820 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 16:32:14 +00:00
jason@long.name
d14121b415 overlay-map: cleanup: use isResidentialZoneAny() instead of manual check 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@819 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:27:23 +00:00
jason@long.name
f09ba76a23 tiles: use new residential-zone/commercial-zone annotations 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@818 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:27:14 +00:00
jason@long.name
c86b9bc03b tiles: annotate commercial and residential zones 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@817 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:27:05 +00:00
jason@long.name
fb6db46fde tiles: remove old isIndustrialZone() function 
Note: this old Industrial Zone checking function would erroneously
include the Coal power plant animated smoke.

You could see this bug by selecting "industrial zones" for the
overlay map, and looking closely where your coal power plants are.
You will see that the coal power plant is invisible in the overlay
except for the four tiles containing the smoke.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@816 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:26:44 +00:00
jason@long.name
14944850b7 tiles: annotate industrial zone tiles 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@815 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:26:29 +00:00
jason@long.name
4c66df859f buildings: allow defining anim tiles as belonging to a building 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@814 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:26:16 +00:00
jason@long.name
306058afeb buildings: define building metadata for special buildings 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@813 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:26:07 +00:00
jason@long.name
b9bdf2850c buildings: s/compound/building, auto-determine tile range 
auto-determine tiles that make up the building by requiring that
the building always be defined on the 2nd row, 2nd column

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@812 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:25:51 +00:00
jason@long.name
7069c8150c buildings: for component tiles, link back to the owner tile 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@811 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:25:39 +00:00
jason@long.name
3941b35fa4 buildings: rename zonePlopNew() to zonePlop() 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@810 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:25:29 +00:00
jason@long.name
f2069794a8 buildings: remove obsolete zonePlop() 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@809 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:25:21 +00:00
jason@long.name
889b1d968e buildings: replace callers of zonePlop() with calls to zonePlopNew() 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@808 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:25:01 +00:00
jason@long.name
2b126044ed buildings: implement zonePlopNew() to place a zone using info in tiles.rc 
Take note that the argument given to this function is not the upper-left
tile value, but rather the "zone" tile for the building.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@807 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:24:49 +00:00
jason@long.name
70383365e6 buildings: define large zone structures in tiles.rc 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@806 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 00:20:17 +00:00
jason@long.name
220f136848 GraphsPane: fix for graph reaching above 100% (issue #31) 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@805 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-31 19:15:59 +00:00
jason@long.name
98c60fb878 bump version number 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@804 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-31 19:15:47 +00:00
jason@long.name
8f7523fd62 demand valves: fix bug in demand valve determination 
is supposed to be dependent on tax rate, but due to using the wrong
local variable, it was ignoring the tax rate.
This fix will make the economy a little slower.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@801 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-25 02:22:30 +00:00
jason@long.name
47963b0011 tiles.rc: let zone population be controlled by tiles.rc 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@800 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-25 02:22:18 +00:00
jason@long.name
51973f75bd TileConstants: impl isIndestructible2(), slightly different than isIndestructible() 
the difference is whether RUBBLE is included or not;
TODO- make a better name

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@799 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-24 21:04:36 +00:00
jason@long.name
aa40fc8760 TileConstants: make isIndestructible() 
continuing the trend of moving tile number logic to centralized location

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@798 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-24 20:54:23 +00:00
jason@long.name
8635eb2d4e TODO- document an issue with draw-bridges 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@797 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-12 21:04:48 +00:00
jason@long.name
11f791b86e build.xml: bundle a 64x64 PNG icon in the generated zip file 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@796 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-12 21:04:19 +00:00
jason@long.name
11b1f6be7e cleanup: TileConstants- hide constants that don't need to be visible 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@795 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-12 02:37:14 +00:00
jason@long.name
8e73c86119 cleanup: remove constants that are not being used 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@794 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-12 02:37:11 +00:00
jason@long.name
e5e76834f6 cleanup: remove a couple lines of code not needed 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@793 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-12 02:37:07 +00:00
jason@long.name
471b77a562 evalLot: replace hardcode tile number comparisons with isRoad/isRail 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@792 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-12 02:37:04 +00:00
jason@long.name
ecba1ff5f9 tiles.rc: control airport radar animation through tiles.rc 
instead of in the java code

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@791 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-12 02:24:03 +00:00
jason@long.name
33cd0d02ed refactor: consolidate checkSize() into getZoneSizeFor() 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@790 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-12 02:23:54 +00:00
jason@long.name
4e11a80a2a isWire: fix bug in which the wrong variable was used 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@789 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-11 22:43:23 +00:00
jason@long.name
20a41f71f7 isRoad: fix bug in which the wrong variable was used 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@788 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-11 22:43:19 +00:00
jason@long.name
9e9d1b2e9b TileConstants: remove hardcoded tile values from OverlayMapView 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@787 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-11 22:43:13 +00:00
jason@long.name
9c6e987f65 cleanup: remove no-longer-used isBigZone() 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@786 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-11 22:43:09 +00:00
jason@long.name
2eee88e529 getPollutionValue: move to TileConstants 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@785 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-11 22:43:04 +00:00
jason@long.name
6f3029fc92 getPollutionValue: use isFire and isRadioactive instead of comparing numbers 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@784 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-11 22:42:59 +00:00
jason@long.name
9c209fa6b2 TileConstants: isConstructed() returns true if tile >= ROADBASE 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@783 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-11 22:42:54 +00:00
jason@long.name
d60bbad2e1 TileConstants: continue moving tile number logic to central location (rails and wires) 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@782 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-11 04:07:14 +00:00
jason@long.name
b4f7e09d74 TileConstants: move tile number comparisons to central location (road numbers) 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@781 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-11 04:07:11 +00:00
jason@long.name
1c4eb5a346 engine bugfix: when downgrading full res to little houses, preserve pwrbit 
This fixes the bug where a powered RES zone will temporarily flash
"no power" when it downgrades from full to partial.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@780 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-08-11 04:07:07 +00:00
jason@long.name
a32769259c tiles.rc: mark bridges, underwater wire, tunnel as Non-burnable 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@779 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-28 19:48:04 +00:00
jason@long.name
5adc2cd57a keyboard: set keymap on content pane, not root pane. 
This way, when the menu bar is active, the normal menu key sequences
(such as ESCAPE) will still work normally.

One quirk is the following-
* MINUS will still zoom out while the menu is active,
but PLUS will not work.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@778 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-26 20:05:46 +00:00
jason@long.name
9e3e681a81 keyboard: ESC will now close the current notification, if one is open 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@777 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-25 20:48:28 +00:00
jason@long.name
c5872a6e9f keyboard: ESC while dragging mouse will cancel the current op 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@776 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-25 20:48:19 +00:00
jason@long.name
40bfdc241a build.xml: when spawning subprocess, do not let it read from stdin 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@775 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-25 20:48:10 +00:00
jason@long.name
bbb48f4e91 keyboard: let ESCAPE be used to close New City dialog 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@774 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-25 20:48:01 +00:00
jason@long.name
0465be13c1 keyboard: add hotkeys for Zones and Overlays menus 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@773 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-25 20:47:51 +00:00
jason@long.name
b4c3a8327e zoom-levels: add menu options for Zoom In and Zoom Out 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@772 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-25 20:47:42 +00:00
jason@long.name
f0f101b78d keyboard: define access keys for more menus 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@771 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-25 20:47:32 +00:00
jason@long.name
f55492f8b8 keyboard: add shortcut keys to Game menu 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@770 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-25 20:47:19 +00:00
jason@long.name
a1fc7c20a2 zoom-levels: fix to recognize the numpad "-" key to zoom out 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@769 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-22 16:03:49 +00:00