diff --git a/regression/030_house.nml b/regression/030_house.nml index 023baa95..c4a041a7 100644 --- a/regression/030_house.nml +++ b/regression/030_house.nml @@ -36,9 +36,6 @@ spriteset(brewery_spriteset_ground) { tmpl_ground_tile( 10, 10, "groundtiles.png") //bare tmpl_ground_tile(150, 10, "groundtiles.png") //stones tmpl_ground_tile(220, 10, "groundtiles.png") //snowed - [] /* pad with empty sprites, as all spritesets have to have the same no. of sprites (=6) */ - [] - [] } spriteset(brewery_spriteset_building) { diff --git a/regression/expected/030_house.grf b/regression/expected/030_house.grf index 1dcca057..d727c20b 100644 Binary files a/regression/expected/030_house.grf and b/regression/expected/030_house.grf differ diff --git a/regression/expected/030_house.nfo b/regression/expected/030_house.nfo index 541d06b1..f7a7a229 100644 --- a/regression/expected/030_house.nfo +++ b/regression/expected/030_house.nfo @@ -5,7 +5,7 @@ // Escapes: D= = DR D+ = DF D- = DC Du* = DM D* = DnF Du<< = DnC D<< = DO D& D| Du/ D/ Du% D% // Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags -0 * 4 \d63 +0 * 4 \d61 1 * 54 14 "C" "INFO" "B" "VRSN" \w4 \dx00000000 @@ -24,42 +24,41 @@ // param[127] = 0 5 * 9 0D 7F \D= FF 00 \dx00000000 -6 * 12 01 07 00 FF \wx0000 FF \wx0002 FF \wx0006 +6 * 12 01 07 00 FF \wx0000 FF \wx0001 FF \wx0003 7 groundtiles.png 8bpp 10 10 64 31 -31 0 normal 8 groundtiles.png 8bpp 150 10 64 31 -31 0 normal 9 groundtiles.png 8bpp 220 10 64 31 -31 0 normal -10 * 1 00 -11 * 1 00 -12 * 1 00 -13 brewery.png 8bpp 10 60 64 91 -31 -60 normal nocrop -14 brewery.png 8bpp 80 60 64 91 -31 -60 normal nocrop -15 brewery.png 8bpp 150 60 64 91 -31 -60 normal nocrop -16 brewery_snow.png 8bpp 10 60 64 91 -31 -60 normal nocrop -17 brewery_snow.png 8bpp 80 60 64 91 -31 -60 normal nocrop -18 brewery_snow.png 8bpp 150 60 64 91 -31 -60 normal nocrop +10 * 12 01 07 00 FF \wx0001 FF \wx0001 FF \wx0006 + +11 brewery.png 8bpp 10 60 64 91 -31 -60 normal nocrop +12 brewery.png 8bpp 80 60 64 91 -31 -60 normal nocrop +13 brewery.png 8bpp 150 60 64 91 -31 -60 normal nocrop +14 brewery_snow.png 8bpp 10 60 64 91 -31 -60 normal nocrop +15 brewery_snow.png 8bpp 80 60 64 91 -31 -60 normal nocrop +16 brewery_snow.png 8bpp 150 60 64 91 -31 -60 normal nocrop // param[125] = (param[127] << 16) -19 * 9 0D 7D \D<< 7F FF \dx00000010 +17 * 9 0D 7D \D<< 7F FF \dx00000010 // param[126] = (param[125] + -2147450879) -20 * 9 0D 7E \D+ 7D FF \dx80008001 +18 * 9 0D 7E \D+ 7D FF \dx80008001 -21 * 7 06 +19 * 7 06 7E 04 FF \wx0014 FF // Name: brewery_sprite_layout - feature 07 // building_sprite : register 8B // with_smoke : register 8C -22 * 49 02 07 FF \b67 \dx00000F8D \wx0000 +20 * 49 02 07 FF \b67 \dx00000F8D \wx0000 \dxC0000000 \wx0002 \b0 \b0 80 83 \dx00000000 \wx0003 \b0 \b0 \b0 \b16 \b16 \b48 85 86 \dx00000000 \wx0023 \b8 \b0 \b0 \b11 \b16 \b7 88 89 8A // Name: brewery_sprite_layout@registers - feature 07 -23 * 362 02 07 FF 89 +21 * 362 02 07 FF 89 43 20 \dx000000FF \2cmp 1A 20 \dx00000004 \2& 1A 20 \dx00000001 @@ -111,7 +110,7 @@ FF \wx00FF // // Name: @return_action_0 -24 * 44 02 07 FE 89 +22 * 44 02 07 FE 89 1A 20 \dx00000002 \2sto 1A 20 \dx0000008B \2r 1A 20 \dx00000000 @@ -121,7 +120,7 @@ FF \wx00FF // brewery_sprite_layout // Name: @return_action_1 -25 * 44 02 07 FD 89 +23 * 44 02 07 FD 89 1A 20 \dx00000001 \2sto 1A 20 \dx0000008B \2r 1A 20 \dx00000000 @@ -131,7 +130,7 @@ FF \wx00FF // brewery_sprite_layout // Name: @return_action_2 -26 * 44 02 07 FC 89 +24 * 44 02 07 FC 89 1A 20 \dxFFFFFFFF \2sto 1A 20 \dx0000008B \2r 1A 20 \dx00000000 @@ -141,7 +140,7 @@ FF \wx00FF // brewery_sprite_layout // Name: @return_action_3 -27 * 44 02 07 FB 89 +25 * 44 02 07 FB 89 1A 20 \dx00000000 \2sto 1A 20 \dx0000008B \2r 1A 20 \dx00000001 @@ -151,7 +150,7 @@ FF \wx00FF // brewery_sprite_layout // Name: brewery_layout_1 -28 * 44 02 07 FB 89 +26 * 44 02 07 FB 89 7D FF 10 \dx000000FF \b3 \wx00FE \dx00000000 \dx00000000 // 0 .. 0: @return_action_0; @@ -160,7 +159,7 @@ FF \wx00FB // default: @return_action_3; // Name: @return_action_0 -29 * 44 02 07 FC 89 +27 * 44 02 07 FC 89 1A 20 \dxFFFFFFFF \2sto 1A 20 \dx0000008B \2r 1A 20 \dx00000000 @@ -170,7 +169,7 @@ FF \wx00FF // brewery_sprite_layout // Name: @return_action_1 -30 * 44 02 07 FD 89 +28 * 44 02 07 FD 89 1A 20 \dx00000000 \2sto 1A 20 \dx0000008B \2r 1A 20 \dx00000001 @@ -180,7 +179,7 @@ FF \wx00FF // brewery_sprite_layout // Name: @return_action_2 -31 * 44 02 07 FE 89 +29 * 44 02 07 FE 89 1A 20 \dx00000002 \2sto 1A 20 \dx0000008B \2r 1A 20 \dx00000000 @@ -190,7 +189,7 @@ FF \wx00FF // brewery_sprite_layout // Name: @return_action_3 -32 * 44 02 07 FF 89 +30 * 44 02 07 FF 89 1A 20 \dx00000001 \2sto 1A 20 \dx0000008B \2r 1A 20 \dx00000000 @@ -200,7 +199,7 @@ FF \wx00FF // brewery_sprite_layout // Name: brewery_layout_2 -33 * 44 02 07 FF 89 +31 * 44 02 07 FF 89 7D FF 10 \dx000000FF \b3 \wx00FC \dx00000000 \dx00000000 // 0 .. 0: @return_action_0; @@ -209,21 +208,21 @@ FF \wx00FF // default: @return_action_3; // Name: brewery_choose_layout -34 * 23 02 07 FF 89 +32 * 23 02 07 FF 89 5F 08 \dx00000001 \b1 \wx00FB \dx00000000 \dx00000000 // 0 .. 0: brewery_layout_1; \wx00FF // default: brewery_layout_2; // Name: brewery_next_frame -35 * 23 02 07 FB 89 +33 * 23 02 07 FB 89 46 00 \dx000000FF \b1 \wx80FF \dx00000000 \dx00000000 // 0 .. 0: return 255; \wx80FE // default: return 254; // Name: @return_action_0 -36 * 41 02 07 FE 89 +34 * 41 02 07 FE 89 46 20 \dx000000FF \2cmp 1A 20 \dx00000000 \2& 1A 20 \dx00000001 @@ -233,7 +232,7 @@ FF \wx8000 // Return computed value // Name: brewery_cargo_accepted -37 * 59 02 07 FE 89 +35 * 59 02 07 FE 89 5F 28 \dx00000001 \2u< 1A 20 \dx00000001 \2* 1A 20 \dxFFFFFFFF // expr1 - expr2 @@ -245,34 +244,34 @@ FF \wx80FD // default: return 253; // Name: brewery_check_location -38 * 23 02 07 FD 89 +36 * 23 02 07 FD 89 44 00 \dx000000FF \b1 \wx8001 \dx00000000 \dx00000000 // 0 .. 0: return 1; \wx8000 // default: return 0; // param[125] = 0 -39 * 9 0D 7D \D= FF 00 \dx00000000 +37 * 9 0D 7D \D= FF 00 \dx00000000 -40 * 9 09 00 04 \7c \dx49415247 01 +38 * 9 09 00 04 \7c \dx49415247 01 // param[125] = 1 -41 * 9 0D 7D \D= FF 00 \dx00000001 +39 * 9 0D 7D \D= FF 00 \dx00000001 // param[124] = 0 -42 * 9 0D 7C \D= FF 00 \dx00000000 +40 * 9 0D 7C \D= FF 00 \dx00000000 -43 * 9 09 00 04 \7c \dx41454857 01 +41 * 9 09 00 04 \7c \dx41454857 01 // param[124] = 1 -44 * 9 0D 7C \D= FF 00 \dx00000001 +42 * 9 0D 7C \D= FF 00 \dx00000001 // param[126] = (param[125] | param[124]) -45 * 5 0D 7E \D| 7D 7C +43 * 5 0D 7E \D| 7D 7C -46 * 9 07 7E 04 \7= \dx00000000 02 +44 * 9 07 7E 04 \7= \dx00000000 02 -47 * 183 00 07 \b20 04 FF \wx0000 +45 * 183 00 07 \b20 04 FF \wx0000 08 28 29 2A 2B 12 \wxDC00 \wxDC00 \wxDC00 \wxDC00 09 30 20 20 20 @@ -308,11 +307,11 @@ FF \b2 02 03 -48 * 9 00 07 \b1 01 FF \wx0000 +46 * 9 00 07 \b1 01 FF \wx0000 14 03 // Name: @action3_0 -49 * 57 02 07 FD 89 +47 * 57 02 07 FD 89 1A 20 \dx00000000 \2sto 1A 20 \dx000000FF \2r 0C 00 \dx0000FFFF @@ -322,16 +321,16 @@ FF \wx00FE \dx00000148 \dx00000148 // brewery_cargo_accepted; \wx00FF // brewery_choose_layout; -50 * 9 07 7E 04 \7= \dx00000000 02 +48 * 9 07 7E 04 \7= \dx00000000 02 -51 * 7 03 07 01 00 \b0 +49 * 7 03 07 01 00 \b0 \wx00FD // @action3_0; -52 * 9 00 07 \b1 01 FF \wx0001 +50 * 9 00 07 \b1 01 FF \wx0001 14 02 // Name: @action3_1 -53 * 47 02 07 FD 89 +51 * 47 02 07 FD 89 1A 20 \dx00010100 \2sto 1A 20 \dx000000FF \2r 0C 00 \dx0000FFFF @@ -340,16 +339,16 @@ FF \wx00FE \dx00000148 \dx00000148 // brewery_cargo_accepted; \wx00FF // brewery_choose_layout; -54 * 9 07 7E 04 \7= \dx00000000 02 +52 * 9 07 7E 04 \7= \dx00000000 02 -55 * 7 03 07 01 01 \b0 +53 * 7 03 07 01 01 \b0 \wx00FD // @action3_1; -56 * 9 00 07 \b1 01 FF \wx0002 +54 * 9 00 07 \b1 01 FF \wx0002 14 02 // Name: @action3_2 -57 * 47 02 07 FD 89 +55 * 47 02 07 FD 89 1A 20 \dx00020001 \2sto 1A 20 \dx000000FF \2r 0C 00 \dx0000FFFF @@ -358,16 +357,16 @@ FF \wx00FE \dx00000148 \dx00000148 // brewery_cargo_accepted; \wx00FF // brewery_choose_layout; -58 * 9 07 7E 04 \7= \dx00000000 02 +56 * 9 07 7E 04 \7= \dx00000000 02 -59 * 7 03 07 01 02 \b0 +57 * 7 03 07 01 02 \b0 \wx00FD // @action3_2; -60 * 9 00 07 \b1 01 FF \wx0003 +58 * 9 00 07 \b1 01 FF \wx0003 14 02 // Name: @action3_3 -61 * 47 02 07 FF 89 +59 * 47 02 07 FF 89 1A 20 \dx00030101 \2sto 1A 20 \dx000000FF \2r 0C 00 \dx0000FFFF @@ -376,8 +375,8 @@ FF \wx00FE \dx00000148 \dx00000148 // brewery_cargo_accepted; \wx00FF // brewery_choose_layout; -62 * 9 07 7E 04 \7= \dx00000000 01 +60 * 9 07 7E 04 \7= \dx00000000 01 -63 * 7 03 07 01 03 \b0 +61 * 7 03 07 01 03 \b0 \wx00FF // @action3_3;