tiles: annotate industrial zone tiles
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@815 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name
parent
4c66df859f
commit
14944850b7
3 changed files with 88 additions and 65 deletions
|
|
@ -628,7 +628,7 @@
|
|||
613 ind_zones@16,0 (conducts)
|
||||
614 ind_zones@32,0 (conducts)
|
||||
615 ind_zones@0,16 (conducts)
|
||||
616 ind_zones@16,16 (zone)(conducts)(building=3x3)(population=0)
|
||||
616 ind_zones@16,16 (zone)(conducts)(building=3x3)(industrial-zone)(population=0)
|
||||
617 ind_zones@32,16 (conducts)
|
||||
618 ind_zones@0,32 (conducts)
|
||||
619 ind_zones@16,32 (conducts)
|
||||
|
|
@ -637,7 +637,7 @@
|
|||
622 ind_zones@16,48 (conducts)
|
||||
623 ind_zones@32,48 (conducts)
|
||||
624 ind_zones@0,64 (conducts)
|
||||
625 ind_zones@16,64 (zone)(conducts)(building=3x3)(population=8)
|
||||
625 ind_zones@16,64 (zone)(conducts)(building=3x3)(industrial-zone)(population=8)
|
||||
626 ind_zones@32,64 (conducts)
|
||||
627 ind_zones@0,80 (conducts)
|
||||
628 ind_zones@16,80 (conducts)
|
||||
|
|
@ -646,7 +646,7 @@
|
|||
631 ind_zones@16,96 (conducts)
|
||||
632 ind_zones@32,96 (conducts)
|
||||
633 ind_zones@0,112 (conducts)
|
||||
634 ind_zones@16,112 (zone)(conducts)(building=3x3)(population=16)
|
||||
634 ind_zones@16,112 (zone)(conducts)(building=3x3)(industrial-zone)(population=16)
|
||||
635 ind_zones@32,112 (conducts)
|
||||
636 ind_zones@0,128 (conducts)
|
||||
637 ind_zones@16,128 (conducts)
|
||||
|
|
@ -655,7 +655,7 @@
|
|||
640 ind_zones@16,144 (conducts)
|
||||
641 ind_zones@32,144 (conducts)(onpower=884)
|
||||
642 ind_zones@0,160 (conducts)
|
||||
643 ind_zones@16,160 (zone)(conducts)(building=3x3)(population=24)
|
||||
643 ind_zones@16,160 (zone)(conducts)(building=3x3)(industrial-zone)(population=24)
|
||||
644 ind_zones@32,160 (conducts)(onpower=888)
|
||||
645 ind_zones@0,176 (conducts)
|
||||
646 ind_zones@16,176 (conducts)
|
||||
|
|
@ -664,7 +664,7 @@
|
|||
649 ind_zones@16,192 (conducts)(onpower=892)
|
||||
650 ind_zones@32,192 (conducts)(onpower=896)
|
||||
651 ind_zones@0,208 (conducts)
|
||||
652 ind_zones@16,208 (zone)(conducts)(building=3x3)(population=32)
|
||||
652 ind_zones@16,208 (zone)(conducts)(building=3x3)(industrial-zone)(population=32)
|
||||
653 ind_zones@32,208 (conducts)
|
||||
654 ind_zones@0,224 (conducts)
|
||||
655 ind_zones@16,224 (conducts)
|
||||
|
|
@ -673,7 +673,7 @@
|
|||
658 ind_zones@16,240 (conducts)
|
||||
659 ind_zones@32,240 (conducts)
|
||||
660 ind_zones@0,256 (conducts)
|
||||
661 ind_zones@16,256 (zone)(conducts)(building=3x3)(population=8)
|
||||
661 ind_zones@16,256 (zone)(conducts)(building=3x3)(industrial-zone)(population=8)
|
||||
662 ind_zones@32,256 (conducts)
|
||||
663 ind_zones@0,272 (conducts)
|
||||
664 ind_zones@16,272 (conducts)
|
||||
|
|
@ -682,7 +682,7 @@
|
|||
667 ind_zones@16,288 (conducts)
|
||||
668 ind_zones@32,288 (conducts)
|
||||
669 ind_zones@0,304 (conducts)
|
||||
670 ind_zones@16,304 (zone)(conducts)(building=3x3)(population=16)
|
||||
670 ind_zones@16,304 (zone)(conducts)(building=3x3)(industrial-zone)(population=16)
|
||||
671 ind_zones@32,304 (conducts)
|
||||
672 ind_zones@0,320 (conducts)
|
||||
673 ind_zones@16,320 (conducts)
|
||||
|
|
@ -691,7 +691,7 @@
|
|||
676 ind_zones@16,336 (conducts)(onpower=900)
|
||||
677 ind_zones@32,336 (conducts)(onpower=904)
|
||||
678 ind_zones@0,352 (conducts)
|
||||
679 ind_zones@16,352 (zone)(conducts)(building=3x3)(population=24)
|
||||
679 ind_zones@16,352 (zone)(conducts)(building=3x3)(industrial-zone)(population=24)
|
||||
680 ind_zones@32,352 (conducts)
|
||||
681 ind_zones@0,368 (conducts)
|
||||
682 ind_zones@16,368 (conducts)
|
||||
|
|
@ -700,7 +700,7 @@
|
|||
685 ind_zones@16,384 (conducts)
|
||||
686 ind_zones@32,384 (conducts)(onpower=908)
|
||||
687 ind_zones@0,400 (conducts)
|
||||
688 ind_zones@16,400 (zone)(conducts)(building=3x3)(population=32)
|
||||
688 ind_zones@16,400 (zone)(conducts)(building=3x3)(industrial-zone)(population=32)
|
||||
689 ind_zones@32,400 (conducts)(onpower=912)
|
||||
690 ind_zones@0,416 (conducts)
|
||||
691 ind_zones@16,416 (conducts)
|
||||
|
|
@ -877,14 +877,14 @@
|
|||
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) (becomes=853)(onshutdown=621)
|
||||
853 misc_animation@0,416 (conducts) (becomes=854)(onshutdown=621)
|
||||
854 misc_animation@0,432 (conducts) (becomes=855)(onshutdown=621)
|
||||
855 misc_animation@0,448 (conducts) (becomes=856)(onshutdown=621)
|
||||
856 misc_animation@0,464 (conducts) (becomes=857)(onshutdown=621)
|
||||
857 misc_animation@0,480 (conducts) (becomes=858)(onshutdown=621)
|
||||
858 misc_animation@0,496 (conducts) (becomes=859)(onshutdown=621)
|
||||
859 misc_animation@0,512 (conducts) (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) (becomes=861)
|
||||
861 misc_animation@0,544 (noburn) (becomes=862)
|
||||
|
|
@ -912,55 +912,55 @@
|
|||
882 misc_animation@0,880
|
||||
883 misc_animation@0,896
|
||||
# BEGIN SMOKE STACKS #
|
||||
884 misc_animation@0,912 (conducts) (becomes=885)(onshutdown=641)
|
||||
885 misc_animation@0,928 (conducts) (becomes=886)(onshutdown=641)
|
||||
886 misc_animation@0,944 (conducts) (becomes=887)(onshutdown=641)
|
||||
887 misc_animation@0,960 (conducts) (becomes=884)(onshutdown=641)
|
||||
888 misc_animation@0,976 (conducts) (becomes=889)(onshutdown=644)
|
||||
889 misc_animation@0,992 (conducts) (becomes=890)(onshutdown=644)
|
||||
890 misc_animation@0,1008 (conducts) (becomes=891)(onshutdown=644)
|
||||
891 misc_animation@0,1024 (conducts) (becomes=888)(onshutdown=644)
|
||||
892 misc_animation@0,1040 (conducts) (becomes=893)(onshutdown=649)
|
||||
893 misc_animation@0,1056 (conducts) (becomes=894)(onshutdown=649)
|
||||
894 misc_animation@0,1072 (conducts) (becomes=895)(onshutdown=649)
|
||||
895 misc_animation@0,1088 (conducts) (becomes=892)(onshutdown=649)
|
||||
896 misc_animation@0,1104 (conducts) (becomes=897)(onshutdown=650)
|
||||
897 misc_animation@0,1120 (conducts) (becomes=898)(onshutdown=650)
|
||||
898 misc_animation@0,1136 (conducts) (becomes=899)(onshutdown=650)
|
||||
899 misc_animation@0,1152 (conducts) (becomes=896)(onshutdown=650)
|
||||
900 misc_animation@0,1168 (conducts) (becomes=901)(onshutdown=676)
|
||||
901 misc_animation@0,1184 (conducts) (becomes=902)(onshutdown=676)
|
||||
902 misc_animation@0,1200 (conducts) (becomes=903)(onshutdown=676)
|
||||
903 misc_animation@0,1216 (conducts) (becomes=900)(onshutdown=676)
|
||||
904 misc_animation@0,1232 (conducts) (becomes=905)(onshutdown=677)
|
||||
905 misc_animation@0,1248 (conducts) (becomes=906)(onshutdown=677)
|
||||
906 misc_animation@0,1264 (conducts) (becomes=907)(onshutdown=677)
|
||||
907 misc_animation@0,1280 (conducts) (becomes=904)(onshutdown=677)
|
||||
908 misc_animation@0,1296 (conducts) (becomes=909)(onshutdown=686)
|
||||
909 misc_animation@0,1312 (conducts) (becomes=910)(onshutdown=686)
|
||||
910 misc_animation@0,1328 (conducts) (becomes=911)(onshutdown=686)
|
||||
911 misc_animation@0,1344 (conducts) (becomes=908)(onshutdown=686)
|
||||
912 misc_animation@0,1360 (conducts) (becomes=913)(onshutdown=689)
|
||||
913 misc_animation@0,1376 (conducts) (becomes=914)(onshutdown=689)
|
||||
914 misc_animation@0,1392 (conducts) (becomes=915)(onshutdown=689)
|
||||
915 misc_animation@0,1408 (conducts) (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) (becomes=917)(onshutdown=747)
|
||||
917 misc_animation@0,1440 (conducts) (becomes=918)(onshutdown=747)
|
||||
918 misc_animation@0,1456 (conducts) (becomes=919)(onshutdown=747)
|
||||
919 misc_animation@0,1472 (conducts) (becomes=916)(onshutdown=747)
|
||||
920 misc_animation@0,1488 (conducts) (becomes=921)(onshutdown=748)
|
||||
921 misc_animation@0,1504 (conducts) (becomes=922)(onshutdown=748)
|
||||
922 misc_animation@0,1520 (conducts) (becomes=923)(onshutdown=748)
|
||||
923 misc_animation@0,1536 (conducts) (becomes=920)(onshutdown=748)
|
||||
924 misc_animation@0,1552 (conducts) (becomes=925)(onshutdown=751)
|
||||
925 misc_animation@0,1568 (conducts) (becomes=926)(onshutdown=751)
|
||||
926 misc_animation@0,1584 (conducts) (becomes=927)(onshutdown=751)
|
||||
927 misc_animation@0,1600 (conducts) (becomes=924)(onshutdown=751)
|
||||
928 misc_animation@0,1616 (conducts) (becomes=929)(onshutdown=752)
|
||||
929 misc_animation@0,1632 (conducts) (becomes=930)(onshutdown=752)
|
||||
930 misc_animation@0,1648 (conducts) (becomes=931)(onshutdown=752)
|
||||
931 misc_animation@0,1664 (conducts) (becomes=928)(onshutdown=752)
|
||||
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)
|
||||
918 misc_animation@0,1456 (conducts)(building-part=750,1,-1) (becomes=919)(onshutdown=747)
|
||||
919 misc_animation@0,1472 (conducts)(building-part=750,1,-1) (becomes=916)(onshutdown=747)
|
||||
920 misc_animation@0,1488 (conducts)(building-part=750,2,-1) (becomes=921)(onshutdown=748)
|
||||
921 misc_animation@0,1504 (conducts)(building-part=750,2,-1) (becomes=922)(onshutdown=748)
|
||||
922 misc_animation@0,1520 (conducts)(building-part=750,2,-1) (becomes=923)(onshutdown=748)
|
||||
923 misc_animation@0,1536 (conducts)(building-part=750,2,-1) (becomes=920)(onshutdown=748)
|
||||
924 misc_animation@0,1552 (conducts)(building-part=750,1,0) (becomes=925)(onshutdown=751)
|
||||
925 misc_animation@0,1568 (conducts)(building-part=750,1,0) (becomes=926)(onshutdown=751)
|
||||
926 misc_animation@0,1584 (conducts)(building-part=750,1,0) (becomes=927)(onshutdown=751)
|
||||
927 misc_animation@0,1600 (conducts)(building-part=750,1,0) (becomes=924)(onshutdown=751)
|
||||
928 misc_animation@0,1616 (conducts)(building-part=750,2,0) (becomes=929)(onshutdown=752)
|
||||
929 misc_animation@0,1632 (conducts)(building-part=750,2,0) (becomes=930)(onshutdown=752)
|
||||
930 misc_animation@0,1648 (conducts)(building-part=750,2,0) (becomes=931)(onshutdown=752)
|
||||
931 misc_animation@0,1664 (conducts)(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) (becomes=933)
|
||||
|
|
|
|||
|
|
@ -663,6 +663,19 @@ public class TileConstants
|
|||
}
|
||||
|
||||
public static boolean isIndustrialZone(int tile)
|
||||
{
|
||||
int tmp = tile & LOMASK;
|
||||
TileSpec ts = Tiles.get(tmp);
|
||||
if (ts != null) {
|
||||
if (ts.owner != null) {
|
||||
ts = ts.owner;
|
||||
}
|
||||
return ts.getBooleanAttribute("industrial-zone");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean isIndustrialZoneOld(int tile)
|
||||
{
|
||||
int tmp = tile & LOMASK;
|
||||
return (tmp >= INDBASE && tmp < PORTBASE)
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ public class Tiles
|
|||
static {
|
||||
try {
|
||||
readTiles();
|
||||
checkTiles();
|
||||
}
|
||||
catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
|
|
@ -100,4 +101,13 @@ public class Tiles
|
|||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
static void checkTiles()
|
||||
{
|
||||
for (int i = 0; i < tiles.length; i++) {
|
||||
if (TileConstants.isIndustrialZone(i) != TileConstants.isIndustrialZoneOld(i)) {
|
||||
System.err.println("industrial zone disagreement: "+i);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue