diff --git a/src/testing.pnml b/src/testing.pnml index 2d71797..d7c5a19 100644 --- a/src/testing.pnml +++ b/src/testing.pnml @@ -73,6 +73,10 @@ spriteset (s_shelter_##num, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) {\ NE: template_platform_zero(1, "shelters/" + name)\ SE: template_platform_zero(2, "shelters/" + name)\ SW: template_platform_zero(3, "shelters/" + name)\ + NW_snow: template_platform_zero(0, "shelters/" + name + "_snow")\ + NE_snow: template_platform_zero(1, "shelters/" + name + "_snow")\ + SE_snow: template_platform_zero(2, "shelters/" + name + "_snow")\ + SW_snow: template_platform_zero(3, "shelters/" + name + "_snow")\ } NORMAL_PLATFORM_SPRITESET(0, "concrete") @@ -105,6 +109,9 @@ spriteset (s_test_fence, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) { ((!getbits(LOAD_TEMP(TEMP_NEARBY_TILE_STATION), TILE_X_SW, 1) | getbits(LOAD_TEMP(TILE_X_SW), SPLAT_BIT, 1) & getbits(LOAD_TEMP(TEMP_NEARBY_TILE_GRF), TILE_X_SW, 1)) << 0|\ (!getbits(LOAD_TEMP(TEMP_NEARBY_TILE_STATION), TILE_X_NE, 1) | getbits(LOAD_TEMP(TILE_X_NE), SPLAT_BIT, 1) & getbits(LOAD_TEMP(TEMP_NEARBY_TILE_GRF), TILE_X_NE, 1)) << 1) +#define SNOW \ + (terrain_type == TILETYPE_SNOW) + #define NONE 0 #define GRASS 1 #define CEMENT 2 @@ -131,6 +138,10 @@ spritelayout sp_test_x_##num(hide_platform_nw, hide_platform_se, hide_shelter, g sprite: CUSTOM(1, 0);\ hide_sprite: !!(GET_NPLAT_FORMATION % 3) || hide_shelter;\ }\ + childsprite { /* shelter */ \ + sprite: CUSTOM(1, 4);\ + hide_sprite: !!(GET_NPLAT_FORMATION % 3) || hide_shelter || !SNOW;\ + }\ building { /* platform */ \ sprite: CUSTOM(0, 2 + GET_SPLAT_FORMATION % 3 * 4);\ PLATFORM_BBOX_SE \ @@ -140,6 +151,10 @@ spritelayout sp_test_x_##num(hide_platform_nw, hide_platform_se, hide_shelter, g sprite: CUSTOM(1, 2);\ hide_sprite: !!(GET_SPLAT_FORMATION % 3) || hide_shelter;\ }\ + childsprite { /* shelter */ \ + sprite: CUSTOM(1, 6);\ + hide_sprite: !!(GET_SPLAT_FORMATION % 3) || hide_shelter || !SNOW;\ + }\ } #define NORMAL_PLATFORM_SPRITELAYOUT_Y(num, GROUND_TYPE) \ @@ -164,6 +179,10 @@ spritelayout sp_test_y_##num(hide_platform_ne, hide_platform_sw, hide_shelter, g sprite: CUSTOM(1, 1); \ hide_sprite: !!(GET_NPLAT_FORMATION % 3) || hide_shelter; \ } \ + childsprite { \ + sprite: CUSTOM(1, 5); \ + hide_sprite: !!(GET_NPLAT_FORMATION % 3) || hide_shelter || !SNOW; \ + } \ building { \ sprite: CUSTOM(0, 3 + GET_SPLAT_FORMATION % 3 * 4); \ PLATFORM_BBOX_SW \ @@ -173,6 +192,10 @@ spritelayout sp_test_y_##num(hide_platform_ne, hide_platform_sw, hide_shelter, g sprite: CUSTOM(1, 3); \ hide_sprite: !!(GET_SPLAT_FORMATION % 3) || hide_shelter; \ } \ + childsprite { \ + sprite: CUSTOM(1, 7); \ + hide_sprite: !!(GET_SPLAT_FORMATION % 3) || hide_shelter || !SNOW; \ + } \ } NORMAL_PLATFORM_SPRITELAYOUT_X(0, GROUNDSPRITE_RAIL_X) diff --git a/vox/shelters/shelter1_snow.vox b/vox/shelters/shelter1_snow.vox new file mode 100644 index 0000000..b4a3a6b Binary files /dev/null and b/vox/shelters/shelter1_snow.vox differ diff --git a/vox/shelters/shelter2_snow.vox b/vox/shelters/shelter2_snow.vox new file mode 100644 index 0000000..13b231c Binary files /dev/null and b/vox/shelters/shelter2_snow.vox differ diff --git a/vox/ttd_palette.json b/vox/ttd_palette.json index 4704bd9..5993e65 100644 --- a/vox/ttd_palette.json +++ b/vox/ttd_palette.json @@ -968,44 +968,28 @@ 252 ], [ - 16, - 64, - 96 + 186, 227, 242 ], [ - 24, - 80, - 108 + 193, 230, 243 ], [ - 40, - 96, - 120 + 199, 232, 245 ], [ - 52, - 112, - 132 + 205, 235, 246 ], [ - 80, - 140, - 160 + 211, 237, 247 ], [ - 116, - 172, - 192 + 218, 240, 248 ], [ - 156, - 204, - 220 + 224, 242, 249 ], [ - 204, - 240, - 252 + 230, 245, 250 ], [ 172, @@ -1478,4 +1462,4 @@ 255 ] ] -} \ No newline at end of file +}