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

tile descriptions: consolidate to single string for 'Industrial'

Browse source 
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
This commit is contained in:
jason@long.name 2013-09-01 16:33:21 +00:00
parent 282cd77b48
commit 821679d841
2 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
graphics/tiles.rc
View file

@ -873,23 +873,23 @@
842 misc_animation@0,240 (description=#22)(becomes=843)
843 misc_animation@0,256 (description=#22)(becomes=840)
# unknown... (8 frames, known in source code as INDBASE2)
844 misc_animation@0,272 (description=#23)(becomes=845)
845 misc_animation@0,288 (description=#23)(becomes=846)
846 misc_animation@0,304 (description=#23)(becomes=847)
847 misc_animation@0,320 (description=#23)(becomes=848)
848 misc_animation@0,336 (description=#23)(becomes=849)
849 misc_animation@0,352 (description=#23)(becomes=850)
850 misc_animation@0,368 (description=#23)(becomes=851)
851 misc_animation@0,384 (description=#23)(becomes=844)
844 misc_animation@0,272 (becomes=845)
845 misc_animation@0,288 (becomes=846)
846 misc_animation@0,304 (becomes=847)
847 misc_animation@0,320 (becomes=848)
848 misc_animation@0,336 (becomes=849)
849 misc_animation@0,352 (becomes=850)
850 misc_animation@0,368 (becomes=851)
851 misc_animation@0,384 (becomes=844)
# BEGIN INDUSTRIAL ANIMATION (8 frames) #
852 misc_animation@0,400 (conducts)(building-part=625,-1,-1)(description=#23) (becomes=853)(onshutdown=621)
853 misc_animation@0,416 (conducts)(building-part=625,-1,-1)(description=#23) (becomes=854)(onshutdown=621)
854 misc_animation@0,432 (conducts)(building-part=625,-1,-1)(description=#23) (becomes=855)(onshutdown=621)
855 misc_animation@0,448 (conducts)(building-part=625,-1,-1)(description=#23) (becomes=856)(onshutdown=621)
856 misc_animation@0,464 (conducts)(building-part=625,-1,-1)(description=#23) (becomes=857)(onshutdown=621)
857 misc_animation@0,480 (conducts)(building-part=625,-1,-1)(description=#23) (becomes=858)(onshutdown=621)
858 misc_animation@0,496 (conducts)(building-part=625,-1,-1)(description=#23) (becomes=859)(onshutdown=621)
859 misc_animation@0,512 (conducts)(building-part=625,-1,-1)(description=#23) (becomes=852)(onshutdown=621)
852 misc_animation@0,400 (conducts)(building-part=625,-1,-1) (becomes=853)(onshutdown=621)
853 misc_animation@0,416 (conducts)(building-part=625,-1,-1) (becomes=854)(onshutdown=621)
854 misc_animation@0,432 (conducts)(building-part=625,-1,-1) (becomes=855)(onshutdown=621)
855 misc_animation@0,448 (conducts)(building-part=625,-1,-1) (becomes=856)(onshutdown=621)
856 misc_animation@0,464 (conducts)(building-part=625,-1,-1) (becomes=857)(onshutdown=621)
857 misc_animation@0,480 (conducts)(building-part=625,-1,-1) (becomes=858)(onshutdown=621)
858 misc_animation@0,496 (conducts)(building-part=625,-1,-1) (becomes=859)(onshutdown=621)
859 misc_animation@0,512 (conducts)(building-part=625,-1,-1) (becomes=852)(onshutdown=621)
# BEGIN ZONE DESTRUCT & RUBBLIZE #
860 misc_animation@0,528 (noburn)(description=#3) (becomes=861)
861 misc_animation@0,544 (noburn)(description=#3) (becomes=862)
@ -917,38 +917,38 @@
882 misc_animation@0,880
883 misc_animation@0,896
# BEGIN SMOKE STACKS #
884 misc_animation@0,912 (conducts)(building-part=643,1,-1)(description=#23)(becomes=885)(onshutdown=641)
885 misc_animation@0,928 (conducts)(building-part=643,1,-1)(description=#23)(becomes=886)(onshutdown=641)
886 misc_animation@0,944 (conducts)(building-part=643,1,-1)(description=#23)(becomes=887)(onshutdown=641)
887 misc_animation@0,960 (conducts)(building-part=643,1,-1)(description=#23)(becomes=884)(onshutdown=641)
888 misc_animation@0,976 (conducts)(building-part=643,1,0) (description=#23)(becomes=889)(onshutdown=644)
889 misc_animation@0,992 (conducts)(building-part=643,1,0) (description=#23)(becomes=890)(onshutdown=644)
890 misc_animation@0,1008 (conducts)(building-part=643,1,0) (description=#23)(becomes=891)(onshutdown=644)
891 misc_animation@0,1024 (conducts)(building-part=643,1,0) (description=#23)(becomes=888)(onshutdown=644)
892 misc_animation@0,1040 (conducts)(building-part=652,0,-1)(description=#23)(becomes=893)(onshutdown=649)
893 misc_animation@0,1056 (conducts)(building-part=652,0,-1)(description=#23)(becomes=894)(onshutdown=649)
894 misc_animation@0,1072 (conducts)(building-part=652,0,-1)(description=#23)(becomes=895)(onshutdown=649)
895 misc_animation@0,1088 (conducts)(building-part=652,0,-1)(description=#23)(becomes=892)(onshutdown=649)
896 misc_animation@0,1104 (conducts)(building-part=652,1,-1)(description=#23)(becomes=897)(onshutdown=650)
897 misc_animation@0,1120 (conducts)(building-part=652,1,-1)(description=#23)(becomes=898)(onshutdown=650)
898 misc_animation@0,1136 (conducts)(building-part=652,1,-1)(description=#23)(becomes=899)(onshutdown=650)
899 misc_animation@0,1152 (conducts)(building-part=652,1,-1)(description=#23)(becomes=896)(onshutdown=650)
900 misc_animation@0,1168 (conducts)(building-part=679,0,-1)(description=#23)(becomes=901)(onshutdown=676)
901 misc_animation@0,1184 (conducts)(building-part=679,0,-1)(description=#23)(becomes=902)(onshutdown=676)
902 misc_animation@0,1200 (conducts)(building-part=679,0,-1)(description=#23)(becomes=903)(onshutdown=676)
903 misc_animation@0,1216 (conducts)(building-part=679,0,-1)(description=#23)(becomes=900)(onshutdown=676)
904 misc_animation@0,1232 (conducts)(building-part=679,1,-1)(description=#23)(becomes=905)(onshutdown=677)
905 misc_animation@0,1248 (conducts)(building-part=679,1,-1)(description=#23)(becomes=906)(onshutdown=677)
906 misc_animation@0,1264 (conducts)(building-part=679,1,-1)(description=#23)(becomes=907)(onshutdown=677)
907 misc_animation@0,1280 (conducts)(building-part=679,1,-1)(description=#23)(becomes=904)(onshutdown=677)
908 misc_animation@0,1296 (conducts)(building-part=688,1,-1)(description=#23)(becomes=909)(onshutdown=686)
909 misc_animation@0,1312 (conducts)(building-part=688,1,-1)(description=#23)(becomes=910)(onshutdown=686)
910 misc_animation@0,1328 (conducts)(building-part=688,1,-1)(description=#23)(becomes=911)(onshutdown=686)
911 misc_animation@0,1344 (conducts)(building-part=688,1,-1)(description=#23)(becomes=908)(onshutdown=686)
912 misc_animation@0,1360 (conducts)(building-part=688,1,0) (description=#23)(becomes=913)(onshutdown=689)
913 misc_animation@0,1376 (conducts)(building-part=688,1,0) (description=#23)(becomes=914)(onshutdown=689)
914 misc_animation@0,1392 (conducts)(building-part=688,1,0) (description=#23)(becomes=915)(onshutdown=689)
915 misc_animation@0,1408 (conducts)(building-part=688,1,0) (description=#23)(becomes=912)(onshutdown=689)
884 misc_animation@0,912 (conducts)(building-part=643,1,-1)(becomes=885)(onshutdown=641)
885 misc_animation@0,928 (conducts)(building-part=643,1,-1)(becomes=886)(onshutdown=641)
886 misc_animation@0,944 (conducts)(building-part=643,1,-1)(becomes=887)(onshutdown=641)
887 misc_animation@0,960 (conducts)(building-part=643,1,-1)(becomes=884)(onshutdown=641)
888 misc_animation@0,976 (conducts)(building-part=643,1,0) (becomes=889)(onshutdown=644)
889 misc_animation@0,992 (conducts)(building-part=643,1,0) (becomes=890)(onshutdown=644)
890 misc_animation@0,1008 (conducts)(building-part=643,1,0) (becomes=891)(onshutdown=644)
891 misc_animation@0,1024 (conducts)(building-part=643,1,0) (becomes=888)(onshutdown=644)
892 misc_animation@0,1040 (conducts)(building-part=652,0,-1)(becomes=893)(onshutdown=649)
893 misc_animation@0,1056 (conducts)(building-part=652,0,-1)(becomes=894)(onshutdown=649)
894 misc_animation@0,1072 (conducts)(building-part=652,0,-1)(becomes=895)(onshutdown=649)
895 misc_animation@0,1088 (conducts)(building-part=652,0,-1)(becomes=892)(onshutdown=649)
896 misc_animation@0,1104 (conducts)(building-part=652,1,-1)(becomes=897)(onshutdown=650)
897 misc_animation@0,1120 (conducts)(building-part=652,1,-1)(becomes=898)(onshutdown=650)
898 misc_animation@0,1136 (conducts)(building-part=652,1,-1)(becomes=899)(onshutdown=650)
899 misc_animation@0,1152 (conducts)(building-part=652,1,-1)(becomes=896)(onshutdown=650)
900 misc_animation@0,1168 (conducts)(building-part=679,0,-1)(becomes=901)(onshutdown=676)
901 misc_animation@0,1184 (conducts)(building-part=679,0,-1)(becomes=902)(onshutdown=676)
902 misc_animation@0,1200 (conducts)(building-part=679,0,-1)(becomes=903)(onshutdown=676)
903 misc_animation@0,1216 (conducts)(building-part=679,0,-1)(becomes=900)(onshutdown=676)
904 misc_animation@0,1232 (conducts)(building-part=679,1,-1)(becomes=905)(onshutdown=677)
905 misc_animation@0,1248 (conducts)(building-part=679,1,-1)(becomes=906)(onshutdown=677)
906 misc_animation@0,1264 (conducts)(building-part=679,1,-1)(becomes=907)(onshutdown=677)
907 misc_animation@0,1280 (conducts)(building-part=679,1,-1)(becomes=904)(onshutdown=677)
908 misc_animation@0,1296 (conducts)(building-part=688,1,-1)(becomes=909)(onshutdown=686)
909 misc_animation@0,1312 (conducts)(building-part=688,1,-1)(becomes=910)(onshutdown=686)
910 misc_animation@0,1328 (conducts)(building-part=688,1,-1)(becomes=911)(onshutdown=686)
911 misc_animation@0,1344 (conducts)(building-part=688,1,-1)(becomes=908)(onshutdown=686)
912 misc_animation@0,1360 (conducts)(building-part=688,1,0) (becomes=913)(onshutdown=689)
913 misc_animation@0,1376 (conducts)(building-part=688,1,0) (becomes=914)(onshutdown=689)
914 misc_animation@0,1392 (conducts)(building-part=688,1,0) (becomes=915)(onshutdown=689)
915 misc_animation@0,1408 (conducts)(building-part=688,1,0) (becomes=912)(onshutdown=689)
# BEGIN COAL PLANT SMOKE #
916 misc_animation@0,1424 (conducts)(building-part=750,1,-1)(becomes=917)(onshutdown=747)
917 misc_animation@0,1440 (conducts)(building-part=750,1,-1)(becomes=918)(onshutdown=747)

2
strings/StatusMessages.properties
View file

@ -29,7 +29,7 @@ zone.19 = Nuclear Power
zone.20 = Draw Bridge
zone.21 = Radar Dish
zone.22 = Fountain
zone.23 = Industrial
zone.23 =
zone.24 = Steelers 38 Bears 3
zone.25 =
zone.26 = Ur 238