archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tiles.rc: tag which road/wire/rail tiles are "over water"

Browse source 
"over water" means when they decay or are bulldozed, they are replaced
with water instead of rubble/dirt.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@884 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-12-02 01:44:39 +00:00
parent 0640f78ebe
commit 0654013c3e
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
graphics/tiles.rc
View file

@ -80,8 +80,8 @@
62 terrain@0,992 (noburn)(description=#6)(behavior=FIRE)(becomes=63)(pollution=90) 62 terrain@0,992 (noburn)(description=#6)(behavior=FIRE)(becomes=63)(pollution=90)
63 terrain@0,1008 (noburn)(description=#6)(behavior=FIRE)(becomes=56)(pollution=90) 63 terrain@0,1008 (noburn)(description=#6)(behavior=FIRE)(becomes=56)(pollution=90)
# BEGIN ROADS WITH NO TRAFFIC # # BEGIN ROADS WITH NO TRAFFIC #
64 roads@0,0 (noburn)(description=#7)(behavior=ROAD) 64 roads@0,0 (noburn)(overwater)(description=#7)(behavior=ROAD)
65 roads@0,16 (noburn)(description=#7)(behavior=ROAD) 65 roads@0,16 (noburn)(overwater)(description=#7)(behavior=ROAD)
66 roads@0,32 (description=#7)(behavior=ROAD) 66 roads@0,32 (description=#7)(behavior=ROAD)
67 roads@0,48 (description=#7)(behavior=ROAD) 67 roads@0,48 (description=#7)(behavior=ROAD)
68 roads@0,64 (description=#7)(behavior=ROAD) 68 roads@0,64 (description=#7)(behavior=ROAD)
@ -96,7 +96,7 @@
77 roads@0,32 |roadwire@0,0 (conducts)(description=#7)(behavior=ROAD) 77 roads@0,32 |roadwire@0,0 (conducts)(description=#7)(behavior=ROAD)
78 roads@0,48 |roadwire@0,16 (conducts)(description=#7)(behavior=ROAD) 78 roads@0,48 |roadwire@0,16 (conducts)(description=#7)(behavior=ROAD)
# open draw bridge (east-west) - # open draw bridge (east-west) -
79 roads@0,240 (noburn)(description=#7)(behavior=ROAD) 79 roads@0,240 (noburn)(overwater)(description=#7)(behavior=ROAD)
# BEGIN ROADS WITH LIGHT TRAFFIC # # BEGIN ROADS WITH LIGHT TRAFFIC #
80 (64) |traffic@0,0 (becomes=128)(pollution=50) 80 (64) |traffic@0,0 (becomes=128)(pollution=50)
81 (65) |traffic@0,16 (becomes=129)(pollution=50) 81 (65) |traffic@0,16 (becomes=129)(pollution=50)
@ -114,7 +114,7 @@
93 roads@0,32 |traffic@0,0 |roadwire@0,0 (conducts)(becomes=141)(description=#7)(behavior=ROAD)(pollution=50) 93 roads@0,32 |traffic@0,0 |roadwire@0,0 (conducts)(becomes=141)(description=#7)(behavior=ROAD)(pollution=50)
94 roads@0,48 |traffic@0,16 |roadwire@0,16 (conducts)(becomes=142)(description=#7)(behavior=ROAD)(pollution=50) 94 roads@0,48 |traffic@0,16 |roadwire@0,16 (conducts)(becomes=142)(description=#7)(behavior=ROAD)(pollution=50)
# open draw bridge (north-south) - # open draw bridge (north-south) -
95 roads@0,240 (noburn)(becomes=143)(description=#7)(behavior=ROAD)(pollution=50) 95 roads@0,240 (noburn)(overwater)(becomes=143)(description=#7)(behavior=ROAD)(pollution=50)
96 (64) |traffic@16,0 (becomes=80)(pollution=50) 96 (64) |traffic@16,0 (becomes=80)(pollution=50)
97 (65) |traffic@16,16 (becomes=81)(pollution=50) 97 (65) |traffic@16,16 (becomes=81)(pollution=50)
98 (66) |traffic@16,0 (becomes=82)(pollution=50) 98 (66) |traffic@16,0 (becomes=82)(pollution=50)
@ -229,8 +229,8 @@
206 roads@0,48 |traffic@112,16 |roadwire@0,16 (conducts)(becomes=190)(description=#7)(behavior=ROAD)(pollution=75) 206 roads@0,48 |traffic@112,16 |roadwire@0,16 (conducts)(becomes=190)(description=#7)(behavior=ROAD)(pollution=75)
207 roads@0,240 (becomes=191)(description=#7)(behavior=ROAD)(pollution=75) 207 roads@0,240 (becomes=191)(description=#7)(behavior=ROAD)(pollution=75)
# BEGIN WIRES # # BEGIN WIRES #
208 wires@0,0 (noburn)(conducts)(description=#8) 208 wires@0,0 (noburn)(overwater)(conducts)(description=#8)
209 wires@0,16 (noburn)(conducts)(description=#8) 209 wires@0,16 (noburn)(overwater)(conducts)(description=#8)
210 wires@0,32 (conducts)(description=#8) 210 wires@0,32 (conducts)(description=#8)
211 wires@0,48 (conducts)(description=#8) 211 wires@0,48 (conducts)(description=#8)
212 wires@0,64 (conducts)(description=#8) 212 wires@0,64 (conducts)(description=#8)
@ -246,8 +246,8 @@
222 wires@0,224 (conducts)(description=#8) 222 wires@0,224 (conducts)(description=#8)
223 wires@0,240 (conducts)(description=#8) 223 wires@0,240 (conducts)(description=#8)
# BEGIN RAILS # # BEGIN RAILS #
224 rails@0,0 (noburn)(description=#9)(behavior=RAIL) 224 rails@0,0 (noburn)(overwater)(description=#9)(behavior=RAIL)
225 rails@0,16 (noburn)(description=#9)(behavior=RAIL) 225 rails@0,16 (noburn)(overwater)(description=#9)(behavior=RAIL)
226 rails@0,32 (description=#9)(behavior=RAIL) 226 rails@0,32 (description=#9)(behavior=RAIL)
227 rails@0,48 (description=#9)(behavior=RAIL) 227 rails@0,48 (description=#9)(behavior=RAIL)
228 rails@0,64 (description=#9)(behavior=RAIL) 228 rails@0,64 (description=#9)(behavior=RAIL)
@ -864,10 +864,10 @@
# POWER OUT INDICATOR # # POWER OUT INDICATOR #
827 misc_animation@0,0 827 misc_animation@0,0
# BEGIN BRIDGES # # BEGIN BRIDGES #
828 misc_animation@0,16 (noburn)(description=#20) 828 misc_animation@0,16 (noburn)(overwater)(description=#20)
829 misc_animation@0,32 (noburn)(description=#20) 829 misc_animation@0,32 (noburn)(overwater)(description=#20)
830 misc_animation@0,48 (noburn)(description=#20) 830 misc_animation@0,48 (noburn)(overwater)(description=#20)
831 misc_animation@0,64 (noburn)(description=#20) 831 misc_animation@0,64 (noburn)(overwater)(description=#20)
# BEGIN RADAR DISH # # BEGIN RADAR DISH #
832 misc_animation@0,80 (conducts)(building-part=716,1,-1)(description=#21) (becomes=833)(onshutdown=711) 832 misc_animation@0,80 (conducts)(building-part=716,1,-1)(description=#21) (becomes=833)(onshutdown=711)
833 misc_animation@0,96 (conducts)(building-part=716,1,-1)(description=#21) (becomes=834)(onshutdown=711) 833 misc_animation@0,96 (conducts)(building-part=716,1,-1)(description=#21) (becomes=834)(onshutdown=711)
@ -995,10 +995,10 @@
946 misc_animation@0,1904 (conducts)(description=#24)(becomes=947) 946 misc_animation@0,1904 (conducts)(description=#24)(becomes=947)
947 misc_animation@0,1920 (conducts)(description=#24)(becomes=940) 947 misc_animation@0,1920 (conducts)(description=#24)(becomes=940)
# BEGIN BRIDGE TILES # # BEGIN BRIDGE TILES #
948 misc_animation@0,1936 (noburn)(description=#20) 948 misc_animation@0,1936 (noburn)(overwater)(description=#20)
949 misc_animation@0,1952 (noburn)(description=#20) 949 misc_animation@0,1952 (noburn)(overwater)(description=#20)
950 misc_animation@0,1968 (noburn)(description=#20) 950 misc_animation@0,1968 (noburn)(overwater)(description=#20)
951 misc_animation@0,1984 (noburn)(description=#20) 951 misc_animation@0,1984 (noburn)(overwater)(description=#20)
# BEGIN NUCLEAR SWIRL # # BEGIN NUCLEAR SWIRL #
952 misc_animation@0,2000 (conducts)(description=#26)(becomes=953)(onshutdown=820) 952 misc_animation@0,2000 (conducts)(description=#26)(becomes=953)(onshutdown=820)
953 misc_animation@0,2016 (conducts)(description=#26)(becomes=954)(onshutdown=820) 953 misc_animation@0,2016 (conducts)(description=#26)(becomes=954)(onshutdown=820)

2
src/micropolisj/engine/TileSpec.java
View file

@ -18,6 +18,7 @@ public class TileSpec
TileSpec onShutdown; TileSpec onShutdown;
boolean canBurn; boolean canBurn;
boolean canConduct; boolean canConduct;
boolean overWater;
boolean zone; boolean zone;
public TileSpec owner; public TileSpec owner;
public int ownerOffsetX; public int ownerOffsetX;
@ -178,6 +179,7 @@ public class TileSpec
this.canBurn = !getBooleanAttribute("noburn"); this.canBurn = !getBooleanAttribute("noburn");
this.canConduct = getBooleanAttribute("conducts"); this.canConduct = getBooleanAttribute("conducts");
this.overWater = getBooleanAttribute("overwater");
this.zone = getBooleanAttribute("zone"); this.zone = getBooleanAttribute("zone");
} }