Commit graph

51 commits

Author SHA1 Message Date
jason@long.name
d86c9f6b65 cleanup: remove a bunch of unused tile constants
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@845 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-05 11:23:28 +00:00
jason@long.name
c3e677047a strictness: getZoneSizeFor must be called on a zone-center tile
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@844 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-05 11:23:07 +00:00
jason@long.name
94e9892731 refactor: make getZoneSizeFor return CityDimension (width AND height)
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@843 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-05 11:22:56 +00:00
jason@long.name
b22263b4b6 applyZone: rewrite to use tiles.rc annotations
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@841 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-05 11:22:09 +00:00
jason@long.name
ed88e75a34 tiles.rc: move pollution values from Java code to tiles.rc
This patch maintains exact values for every tile, even where it
is probably wrong.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@837 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-04 18:57:51 +00:00
jason@long.name
1b82d46aeb cleanup: remove two obsolete functions from TileConstants.java
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@833 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:34:16 +00:00
jason@long.name
bef75adc90 scanTile: use annotations in tiles.rc to determine behavior of tiles
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@832 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:34:06 +00:00
jason@long.name
521a41f028 tiles.rc: use description numbers from tiles.rc rather than hardcoded numbers
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@821 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 16:32:25 +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
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
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
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
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
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
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
68717e3ea6 tiles.rc: move CONDBIT knowledge from source code to tiles.rc
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@746 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-20 21:10:50 +00:00
jason@long.name
c2cfeb540c tiles.rc: move BURNBIT knowledge from source code to tiles.rc
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@743 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-20 21:10:40 +00:00
jason@long.name
0a65ac514c TileConstants: replace BLBN, BLBNCN, BNCN constants with definitions
This will make it easier to find and replace uses of BULLBIT, BURNBIT, and
CONDBIT.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@741 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-20 21:10:34 +00:00
jason@long.name
91b3736886 tiles: transfer ZONEBIT knowledge to tiles.rc
and synthesize ZONEBIT when saving (for compatibility)

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@740 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-20 21:10:29 +00:00
jason@long.name
9bf2e91783 tile animation: synthesize ANIMBIT when saving (for compatibility)
Also, add some safety checks in case Tiles.get() is called with an out-of-range tile number.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@739 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-18 13:31:50 +00:00
jason@long.name
000036c303 tile animation: cleanup, remove obsolete ANIMBIT constant
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@737 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-17 20:59:06 +00:00
jason@long.name
8793847415 TileConstants: simplify logic in isBridge()
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@726 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-07 14:11:02 +00:00
jason@long.name
6406c12c14 TileConstants: implement isCombustible()
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@725 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-07 13:16:54 +00:00
jason@long.name
873caa361b cleanup: move tile value comparisons into TileConstants class
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@688 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-28 01:55:58 +00:00
jason@long.name
f5e1793592 cleanup: move res/com/ind Zone Pop() functions to TileConstants
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@687 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-28 01:55:49 +00:00
jason@long.name
c272e200bf cleanup: isOverWater() should neutralize traffic, not the caller
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@684 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-28 01:55:25 +00:00
jason@long.name
599ea026f3 cleanup: move neutralizeRoad() to TileConstants
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@683 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-28 01:55:17 +00:00
jason@long.name
e2fd24ff10 tiles: document the underwater railroad tiles
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@682 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-28 01:55:08 +00:00
jason@long.name
906a0c4570 tiles: helper function- isTinyExplosion
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@680 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-28 01:52:36 +00:00
jason@long.name
6794888026 tiles: helper functions- isFire, isRadioactive, isFlood
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@679 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-28 01:52:27 +00:00
jason@long.name
4e27a04cc3 tiles: CLEAR is not doze-able
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@651 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-17 01:16:06 +00:00
jason@long.name
aacddfa6ef tiles: CLEAR is not a zone-center
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@650 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-16 23:46:46 +00:00
jason@long.name
eb63e3817a ToolStroke: update Park tool to use new ToolEffect class
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@632 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-16 23:42:21 +00:00
jason@long.name
1aa2e3d30f ToolPreview: a class for holding the effect of a tool
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@629 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-16 23:41:57 +00:00
jason@long.name
7d2b2fdda5 cleanup: move autobulldoze-testing functions to TileConstants
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@619 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-08 02:11:35 +00:00
jason@long.name
db0a450076 TileConstants: two new helper methods: isDozeable, isZoneCenter
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@616 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-05 18:52:21 +00:00
jason@long.name
e9f06bb1c2 docs: add some notes on various attributes of tiles
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@615 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-05 18:52:13 +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