From b1363da60e655c8f0e3dccd2409979dda90eaa70 Mon Sep 17 00:00:00 2001 From: hATrayflood Date: Tue, 20 Oct 2015 00:07:20 +0900 Subject: [PATCH] fix #52: zone name misstake when query --- micropolis-java/graphics/tiles.rc | 44 +++++++++---------- .../strings/StatusMessages.properties | 7 +-- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/micropolis-java/graphics/tiles.rc b/micropolis-java/graphics/tiles.rc index cc25f780..bceb351c 100644 --- a/micropolis-java/graphics/tiles.rc +++ b/micropolis-java/graphics/tiles.rc @@ -51,10 +51,10 @@ 38 terrain@0,608 39 terrain@0,624 # BEGIN WOODS (4 frames) # -40 terrain@0,640 (bulldozable)(description=#2) -41 terrain@0,656 (bulldozable)(description=#2) -42 terrain@0,672 (bulldozable)(description=#2) -43 terrain@0,688 (bulldozable)(description=#2) +40 terrain@0,640 (bulldozable)(description=#23) +41 terrain@0,656 (bulldozable)(description=#23) +42 terrain@0,672 (bulldozable)(description=#23) +43 terrain@0,688 (bulldozable)(description=#23) # BEGIN RUBBLE (4 frames) # 44 terrain@0,704 (bulldozable)(noburn)(description=#3) 45 terrain@0,720 (bulldozable)(noburn)(description=#3) @@ -433,7 +433,7 @@ 406 res_zones@16,816 (conducts) 407 res_zones@32,816 (conducts) 408 res_zones@0,832 (conducts) -409 res_zones@16,832 (zone)(conducts)(building=3x3)(residential-zone)(behavior=HOSPITAL_CHURCH)(description=#10) +409 res_zones@16,832 (zone)(conducts)(building=3x3)(residential-zone)(behavior=HOSPITAL_CHURCH)(description=#27) 410 res_zones@32,832 (conducts) 411 res_zones@0,848 (conducts) 412 res_zones@16,848 (conducts) @@ -442,7 +442,7 @@ 415 res_zones@16,864 (conducts) 416 res_zones@32,864 (conducts) 417 res_zones@0,880 (conducts) -418 res_zones@16,880 (zone)(conducts)(building=3x3)(residential-zone)(behavior=HOSPITAL_CHURCH)(description=#10) +418 res_zones@16,880 (zone)(conducts)(building=3x3)(residential-zone)(behavior=HOSPITAL_CHURCH)(description=#28) 419 res_zones@32,880 (conducts) 420 res_zones@0,896 (conducts) 421 res_zones@16,896 (conducts) @@ -960,22 +960,22 @@ 914 ind_zones@32,400|ind08_smoke_frames@128,16 (conducts)(building-part=688,1,0) (becomes=915)(onshutdown=689) 915 ind_zones@32,400|ind08_smoke_frames@176,16 (conducts)(building-part=688,1,0) (becomes=912)(onshutdown=689) # BEGIN COAL PLANT SMOKE # -916 coal@32,0 |coal_smoke_frames@32,0 (conducts)(building-part=750,1,-1)(becomes=917)(onshutdown=747) -917 coal@32,0 |coal_smoke_frames@96,0 (conducts)(building-part=750,1,-1)(becomes=918)(onshutdown=747) -918 coal@32,0 |coal_smoke_frames@160,0 (conducts)(building-part=750,1,-1)(becomes=919)(onshutdown=747) -919 coal@32,0 |coal_smoke_frames@224,0 (conducts)(building-part=750,1,-1)(becomes=916)(onshutdown=747) -920 coal@48,0 |coal_smoke_frames@48,0 (conducts)(building-part=750,2,-1)(becomes=921)(onshutdown=748) -921 coal@48,0 |coal_smoke_frames@112,0 (conducts)(building-part=750,2,-1)(becomes=922)(onshutdown=748) -922 coal@48,0 |coal_smoke_frames@176,0 (conducts)(building-part=750,2,-1)(becomes=923)(onshutdown=748) -923 coal@48,0 |coal_smoke_frames@240,0 (conducts)(building-part=750,2,-1)(becomes=920)(onshutdown=748) -924 coal@32,16|coal_smoke_frames@32,16 (conducts)(building-part=750,1,0) (becomes=925)(onshutdown=751) -925 coal@32,16|coal_smoke_frames@96,16 (conducts)(building-part=750,1,0) (becomes=926)(onshutdown=751) -926 coal@32,16|coal_smoke_frames@160,16 (conducts)(building-part=750,1,0) (becomes=927)(onshutdown=751) -927 coal@32,16|coal_smoke_frames@224,16 (conducts)(building-part=750,1,0) (becomes=924)(onshutdown=751) -928 coal@48,16|coal_smoke_frames@48,16 (conducts)(building-part=750,2,0) (becomes=929)(onshutdown=752) -929 coal@48,16|coal_smoke_frames@112,16 (conducts)(building-part=750,2,0) (becomes=930)(onshutdown=752) -930 coal@48,16|coal_smoke_frames@176,16 (conducts)(building-part=750,2,0) (becomes=931)(onshutdown=752) -931 coal@48,16|coal_smoke_frames@240,16 (conducts)(building-part=750,2,0) (becomes=928)(onshutdown=752) +916 coal@32,0 |coal_smoke_frames@32,0 (conducts)(description=#25)(building-part=750,1,-1)(becomes=917)(onshutdown=747) +917 coal@32,0 |coal_smoke_frames@96,0 (conducts)(description=#25)(building-part=750,1,-1)(becomes=918)(onshutdown=747) +918 coal@32,0 |coal_smoke_frames@160,0 (conducts)(description=#25)(building-part=750,1,-1)(becomes=919)(onshutdown=747) +919 coal@32,0 |coal_smoke_frames@224,0 (conducts)(description=#25)(building-part=750,1,-1)(becomes=916)(onshutdown=747) +920 coal@48,0 |coal_smoke_frames@48,0 (conducts)(description=#25)(building-part=750,2,-1)(becomes=921)(onshutdown=748) +921 coal@48,0 |coal_smoke_frames@112,0 (conducts)(description=#25)(building-part=750,2,-1)(becomes=922)(onshutdown=748) +922 coal@48,0 |coal_smoke_frames@176,0 (conducts)(description=#25)(building-part=750,2,-1)(becomes=923)(onshutdown=748) +923 coal@48,0 |coal_smoke_frames@240,0 (conducts)(description=#25)(building-part=750,2,-1)(becomes=920)(onshutdown=748) +924 coal@32,16|coal_smoke_frames@32,16 (conducts)(description=#25)(building-part=750,1,0) (becomes=925)(onshutdown=751) +925 coal@32,16|coal_smoke_frames@96,16 (conducts)(description=#25)(building-part=750,1,0) (becomes=926)(onshutdown=751) +926 coal@32,16|coal_smoke_frames@160,16 (conducts)(description=#25)(building-part=750,1,0) (becomes=927)(onshutdown=751) +927 coal@32,16|coal_smoke_frames@224,16 (conducts)(description=#25)(building-part=750,1,0) (becomes=924)(onshutdown=751) +928 coal@48,16|coal_smoke_frames@48,16 (conducts)(description=#25)(building-part=750,2,0) (becomes=929)(onshutdown=752) +929 coal@48,16|coal_smoke_frames@112,16 (conducts)(description=#25)(building-part=750,2,0) (becomes=930)(onshutdown=752) +930 coal@48,16|coal_smoke_frames@176,16 (conducts)(description=#25)(building-part=750,2,0) (becomes=931)(onshutdown=752) +931 coal@48,16|coal_smoke_frames@240,16 (conducts)(description=#25)(building-part=750,2,0) (becomes=928)(onshutdown=752) # BEGIN STADIUM PLAYFIELD # # Note: the original source code made these unburnable, which doesn't make sense 932 misc_animation@0,1680 (conducts)(description=#24)(becomes=933) diff --git a/micropolis-java/strings/StatusMessages.properties b/micropolis-java/strings/StatusMessages.properties index 163dc1a8..c050fe7b 100644 --- a/micropolis-java/strings/StatusMessages.properties +++ b/micropolis-java/strings/StatusMessages.properties @@ -29,11 +29,12 @@ zone.19 = Nuclear Power zone.20 = Draw Bridge zone.21 = Radar Dish zone.22 = Fountain -zone.23 = +zone.23 = Park zone.24 = Steelers 38 Bears 3 -zone.25 = +zone.25 = Coal Smoke zone.26 = Ur 238 -zone.27 = +zone.27 = Hospital +zone.28 = Church ! population density status.1 = Low