Commit graph

76 commits

Author SHA1 Message Date
Jason Long
7ef2158071 cleanup: use proper api to get tile number in MapScanner 2014-09-21 16:37:48 -04:00
Jason Long
6ccc6339fc cleanup: consolidate to a single isIndestructible() predicate 2014-09-21 16:35:00 -04:00
Jason Long
89e1b04f95 rewrite repairZone to handle dynamic tiles
also- fix a bug where repairZone() on an unpowerd zone
was incorrect
2014-09-21 16:34:50 -04:00
Jason Long
d4a80ec466 cleanup: rename isRoadAny() to isRoad()... ditto for isRailAny() 2014-09-21 16:28:02 -04:00
Jason Long
f944e5293c evalLot: fix so that railroads with wires are recognized as rails 2014-09-21 14:37:47 -04:00
Jason Long
951c0fecbf api: fix use of hi-bits in stadium-handling code 2014-06-20 12:23:43 -04:00
Jason Long
300acc7381 api: setTile() no longer accepts upper bits
also- eliminate "rawTile" from TileBehavior class and subclasses
2014-06-20 11:41:57 -04:00
Jason Long
c6586c322f cleanup: remove superfluous assignment of .tile property
the .tile property should already have the right value when this
method is entered
2014-06-20 11:41:46 -04:00
jason@long.name
78d094c8ac api: use masked tile number for tile-check methods
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@898 d9718cc8-9f43-0410-858b-315f434eb58c
2013-12-06 16:02:07 +00:00
jason@long.name
454409cecf tiles.rc: eliminate BULLBIT and use annotation instead
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@894 d9718cc8-9f43-0410-858b-315f434eb58c
2013-12-06 16:01:48 +00:00
jason@long.name
280126ac05 refactor: move makeTraffic() from city to zone-behavior class
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@875 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-10 13:31:16 +00:00
jason@long.name
ff84c48091 cleanup: move code that refreshes tile/rawTile closer to where it is needed
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@874 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-10 13:31:13 +00:00
jason@long.name
81c05604df behaviors: move terrain-related behaviors from MapScanner
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@871 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-04 12:54:03 +00:00
jason@long.name
4717c93039 behaviors: dispatch behavior from mapScan() method
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@870 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-04 12:53:59 +00:00
jason@long.name
fb4f1fee98 behaviors: MapScanner: s/cchr/rawTile and s/cchr9/tile
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@869 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-04 12:53:56 +00:00
jason@long.name
6bd61e6575 behaviors: rename old TileBehavior class to make room for new one
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@867 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-04 12:53:49 +00:00
jason@long.name
275139c2d1 refactor: make public getLandValue() method for accessing landValueMem[]
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@863 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-28 16:34:17 +00:00
jason@long.name
300adefd27 cleanup: use getTrafficDensity() instead of directly accessing the array
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@862 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-28 16:34:06 +00:00
jason@long.name
736754a5ab cleanup: rename FREEZ to RESCLR for consistency
matches the naming pattern used for COMCLR and INDCLR

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@858 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-20 11:21:28 +00:00
jason@long.name
90149dc9c0 evalLog road test: let road/rail crossing count as road
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@847 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-06 12:49:10 +00:00
jason@long.name
db6f3fb59c doSpecialZone: use annotations to control which special zone processing is done
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@836 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-03 01:07:35 +00:00
jason@long.name
18f00153a3 refactor: doSpecialZone- split up into separate functions for each zone type
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@835 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-03 01:07:25 +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
070cd90727 refactor: move checkZonePower down a level
(This will allow elimination of the doZone() intermediary function)

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@831 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:33:56 +00:00
jason@long.name
0f2c2f4617 refactor: checkZonePower() to set PWR bit and count zones
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@829 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:33:38 +00:00
jason@long.name
07bc48c34c cleanup: consolidate all doFire() functionality into doFire() method
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@828 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:33:28 +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
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
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
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
7540682a06 tile animation: make industrial zone smoke animations initiated by tiles.rc
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@760 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-20 21:35:09 +00:00
jason@long.name
0c497aa434 tile animation: use tiles.rc to control termination of coal plant smoke
when the coal plant is killed

Also, this sets up a framework to handle industrial zones in the same way.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@759 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-20 21:35:05 +00:00
jason@long.name
a190bbf88b engine: only use PWRBIT flag on zone center tiles
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@758 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-20 21:35:02 +00:00
jason@long.name
ba7ade2fa4 tile-animation: let tiles.rc determine coal plant's smoke animation
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@757 d9718cc8-9f43-0410-858b-315f434eb58c
2013-07-20 21:34:58 +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
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
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
25751e73c4 cleanup: do not refetch the tile value when a property exists having it
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@686 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-28 01:55:41 +00:00
jason@long.name
cd7537768d road/rail deteriation: use isOverWater() instead of hard-coded numbers
Note- this will allow deteriation of bridges even when there is
traffic.  This is a change from previous versions.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@685 d9718cc8-9f43-0410-858b-315f434eb58c
2013-05-28 01:55:33 +00:00