From 93bf346065d7c7a7b0f4971dcee4c07f4c6aea24 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Sun, 1 Sep 2013 16:32:55 +0000 Subject: [PATCH] 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 --- graphics/tiles.rc | 8 ++++---- strings/StatusMessages.properties | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graphics/tiles.rc b/graphics/tiles.rc index 1b7e7f9..d9cea19 100644 --- a/graphics/tiles.rc +++ b/graphics/tiles.rc @@ -985,10 +985,10 @@ 946 misc_animation@0,1904 (conducts)(description=#24)(becomes=947) 947 misc_animation@0,1920 (conducts)(description=#24)(becomes=940) # BEGIN BRIDGE TILES # -948 misc_animation@0,1936 (noburn)(description=#25) -949 misc_animation@0,1952 (noburn)(description=#25) -950 misc_animation@0,1968 (noburn)(description=#25) -951 misc_animation@0,1984 (noburn)(description=#25) +948 misc_animation@0,1936 (noburn)(description=#20) +949 misc_animation@0,1952 (noburn)(description=#20) +950 misc_animation@0,1968 (noburn)(description=#20) +951 misc_animation@0,1984 (noburn)(description=#20) # BEGIN NUCLEAR SWIRL # 952 misc_animation@0,2000 (conducts)(description=#26)(becomes=953)(onshutdown=820) 953 misc_animation@0,2016 (conducts)(description=#26)(becomes=954)(onshutdown=820) diff --git a/strings/StatusMessages.properties b/strings/StatusMessages.properties index 29eaa55..9583029 100644 --- a/strings/StatusMessages.properties +++ b/strings/StatusMessages.properties @@ -31,7 +31,7 @@ zone.21 = Radar Dish zone.22 = Fountain zone.23 = Industrial zone.24 = Steelers 38 Bears 3 -zone.25 = Draw Bridge +zone.25 = zone.26 = Ur 238 zone.27 =