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

54 commits

Author SHA1 Message Date
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
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
821679d841 tile descriptions: consolidate to single string for 'Industrial' 
Formerly #23 and #12 were both "Industrial", with #12 being used for
the basic industrial zones, and #23 being used for any animation
appearing for industrial zones.

Now that the tiles using a particular description number don't need
to be contiguous, we will consolidate to just use #12 for "industrial",
and this will free up #23 for some other use in the future.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@827 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 16:33:21 +00:00
jason@long.name
282cd77b48 tile descriptions: describe the animated zone destruction tiles as "Rubble" 
rather than "Industrial"

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@826 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 16:33:12 +00:00
jason@long.name
f5180e9f9c tile descriptions: smoke on coal power plant should be "Coal Power" not "Industrial" 
remove description annotation on the animated tiles of the coal power plant,
so that they inherit the description of the coal power plant, rather than
having a description of "Industrial"

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@825 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 16:33:04 +00:00
jason@long.name
93bf346065 tile descriptions: consolidate to a single string for 'draw bridge' 
formerly, the string "Draw Bridge" was defined separately for
east-west and north-south bridges, simply because they were disjoint
in the tile numbering sequence.

Now both draw bridges use description number 20.
This frees up description number 25 for something else some day.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@824 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 16:32:55 +00:00
jason@long.name
21f1cff598 tiles.rc: remove 'description' annotation for undefined/unused tiles 
The earlier commit that added the description annotations maintained
exact compatibility with the descriptions hardcoded in the source
code. Now we are going back and removing the descriptions that do
not apply.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@823 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-09-01 16:32:46 +00:00
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
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
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
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
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
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
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
45b84f0cbb tile animation: make nuclear swirl handled same as coal smoke 
that is, it starts only when setZonePower() is called for that zone,
and it automatically stops when killZone() is invoked.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@761 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-20 21:35:12 +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
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
ee449d59a4 tiles.rc: use inheritance to define roads with traffic 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@755 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-20 21:29:50 +00:00
jason@long.name
b65e83ec79 tiles.rc: annotate conductive tiles 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@745 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-20 21:10:47 +00:00
jason@long.name
cc4ba189ce tiles.rc: annotate tiles with "noburn" if they are not combustible 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@742 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-20 21:10:37 +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
568377ccc8 tile animation: another cleanup item - unpowered zone should not animate 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@738 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-17 21:05:32 +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
a4f8846ca7 tiles.rc: make source size specifications optional, since it's always 16x16 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@736 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-17 20:30:42 +00:00
jason@long.name
8d940ec99d tiles.rc: add comments to delineate different categories 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@731 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-17 20:11:51 +00:00
jason@long.name
cf6fce279c tiles.rc: rename tiles.dat to tiles.rc, bring TileSpec into main program 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@730 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-17 20:11:47 +00:00
jason@long.name
630f859063 tile animation: copy animation information from Java source code to tiles.dat 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@729 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-07-17 19:58:25 +00:00
jason@long.name
eff811b159 graphics: traffic- cropped image to remove excess space 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@719 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-28 15:08:07 +00:00
jason@long.name
fd24bc5e67 graphics: separate out wires and railroads tiles 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@718 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-28 15:08:00 +00:00
jason@long.name
df2049ef98 graphics: update HACKING file with new instructions for building tiles.png 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@717 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-26 22:12:14 +00:00
jason@long.name
4fdc4fb34f graphics: move "MakeTiles" program into src/ directory 
(but do not include it in the generated jar file)

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@714 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-26 22:11:38 +00:00
jason@long.name
0a44ffe64a graphics: traffic at squares- moved to layers 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@713 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-26 13:15:38 +00:00
jason@long.name
094c0848e8 graphics: traffic on turns- now using layers 
this fixes a couple defects in the original graphics pack-
- dashed lines on curves (tile 71) would shift or flicker during animation
- one of the road pixels (tile 70) would flash during heavy-trf animation

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@712 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-26 13:15:20 +00:00
jason@long.name
e106ce0445 graphics: use layers for N/S traffic on tiles 73, 75, 78 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@711 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-26 13:15:01 +00:00
jason@long.name
778976f100 graphics: fix road (tile 72)- dashed line in wrong position 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@710 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-26 13:14:42 +00:00
jason@long.name
8d5291e591 graphics: attempt to move wire over road to separate file 
(generated tiles.png does not match previous version, so something
is wrong)

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@709 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-26 13:14:07 +00:00
jason@long.name
cae33311b3 graphics: tiles.dat: allow spaces before pipes 
this allows layer names to be more nicely lined up

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@708 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-26 13:13:50 +00:00
jason@long.name
d8444ff2e4 graphics: more traffic animation pulled to the separate traffic.png file 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@707 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-26 13:13:27 +00:00
jason@long.name
cd1b9e3641 graphics: pull some traffic animation to a separate file, and use layers to compose the tiles 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@706 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-26 13:13:10 +00:00
jason@long.name
2e217755a3 graphics: MakeTiles: support layering two or more images together 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@705 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-26 13:12:52 +00:00
jason@long.name
57fd5c0847 graphics: split 'special' into one file per special zone, and misc_animation.png 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@704 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-25 18:56:43 +00:00
jason@long.name
ad6ef12228 graphics: split all_industrial into ind_zones and special 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@703 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-25 18:56:24 +00:00
jason@long.name
3df55318e0 graphics: convert all_commercial into com_zones (arranged in 3x3 blocks) 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@702 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-25 18:56:03 +00:00
jason@long.name
960b734417 graphics: res_zones: has residential tiles arranged in 3x3 blocks 
(the same way they appear in the game)

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@701 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-25 18:55:42 +00:00
jason@long.name
c203103baf graphics/HACKING doc: explains how to build a new tiles.png 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@700 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-25 17:40:27 +00:00
jason@long.name
ad6d40200c MakeTiles: make default to take whole image specified 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@699 d9718cc8-9f43-0410-858b-315f434eb58c
 2013-06-25 17:40:11 +00:00