diff --git a/gfx/MShockXotto+/autotiles/t_sand_multitile.png b/gfx/MShockXotto+/autotiles/t_sand_multitile.png new file mode 100644 index 0000000000..148f586afe Binary files /dev/null and b/gfx/MShockXotto+/autotiles/t_sand_multitile.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand.json index b4bf9749a8..7f47073709 100644 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand.json +++ b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand.json @@ -1,52 +1,222 @@ -{ - "id": "t_sand", - "fg": "t_sand_unconnected", - "multitile": true, - "additional_tiles": [ - { - "id": "center", - "fg": "t_sand_center" - }, - { - "id": "corner", - "fg": [ - "t_sand_corner_nw", - "t_sand_corner_sw", - "t_sand_corner_se", - "t_sand_corner_ne" - ] - }, - { - "id": "t_connection", - "fg": [ - "t_sand_t_connection_n", - "t_sand_t_connection_w", - "t_sand_t_connection_s", - "t_sand_t_connection_e" - ] - }, - { - "id": "edge", - "fg": [ - "t_sand_edge_ns", - "t_sand_edge_ew" - ] - }, - { - "id": "end_piece", - "fg": [ - "t_sand_end_piece_n", - "t_sand_end_piece_w", - "t_sand_end_piece_s", - "t_sand_end_piece_e" - ] - }, - { - "id": "unconnected", - "fg": [ - "t_sand_unconnected", - "t_sand_unconnected" - ] - } - ] -} +[ + { + "id": "t_sand", + "fg": "t_sand_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": "t_sand_center", + "bg": [ { "weight": 1, "sprite": "t_grass" }, { "weight": 1, "sprite": "t_grass_1" }, { "weight": 1, "sprite": "t_grass_2" } ] + }, + { + "id": "corner", + "fg": [ "t_sand_corner_nw", "t_sand_corner_sw", "t_sand_corner_se", "t_sand_corner_ne" ], + "bg": [ { "weight": 1, "sprite": "t_grass" }, { "weight": 1, "sprite": "t_grass_1" }, { "weight": 1, "sprite": "t_grass_2" } ] + }, + { + "id": "t_connection", + "fg": [ "t_sand_t_connection_n", "t_sand_t_connection_w", "t_sand_t_connection_s", "t_sand_t_connection_e" ], + "bg": [ { "weight": 1, "sprite": "t_grass" }, { "weight": 1, "sprite": "t_grass_1" }, { "weight": 1, "sprite": "t_grass_2" } ] + }, + { + "id": "edge", + "fg": [ "t_sand_edge_ns", "t_sand_edge_ew" ], + "bg": [ { "weight": 1, "sprite": "t_grass" }, { "weight": 1, "sprite": "t_grass_1" }, { "weight": 1, "sprite": "t_grass_2" } ] + }, + { + "id": "end_piece", + "fg": [ "t_sand_end_piece_n", "t_sand_end_piece_w", "t_sand_end_piece_s", "t_sand_end_piece_e" ], + "bg": [ { "weight": 1, "sprite": "t_grass" }, { "weight": 1, "sprite": "t_grass_1" }, { "weight": 1, "sprite": "t_grass_2" } ] + }, + { + "id": "unconnected", + "fg": [ "t_sand_unconnected", "t_sand_unconnected" ], + "bg": [ { "weight": 1, "sprite": "t_grass" }, { "weight": 1, "sprite": "t_grass_1" }, { "weight": 1, "sprite": "t_grass_2" } ] + } + ] + }, + { + "id": "t_sand_season_summer", + "fg": "t_sand_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": "t_sand_center", + "bg": [ + { "weight": 1, "sprite": "t_grass_summer" }, + { "weight": 1, "sprite": "t_grass_summer_1" }, + { "weight": 1, "sprite": "t_grass_summer_2" } + ] + }, + { + "id": "corner", + "fg": [ "t_sand_corner_nw", "t_sand_corner_sw", "t_sand_corner_se", "t_sand_corner_ne" ], + "bg": [ + { "weight": 1, "sprite": "t_grass_summer" }, + { "weight": 1, "sprite": "t_grass_summer_1" }, + { "weight": 1, "sprite": "t_grass_summer_2" } + ] + }, + { + "id": "t_connection", + "fg": [ "t_sand_t_connection_n", "t_sand_t_connection_w", "t_sand_t_connection_s", "t_sand_t_connection_e" ], + "bg": [ + { "weight": 1, "sprite": "t_grass_summer" }, + { "weight": 1, "sprite": "t_grass_summer_1" }, + { "weight": 1, "sprite": "t_grass_summer_2" } + ] + }, + { + "id": "edge", + "fg": [ "t_sand_edge_ns", "t_sand_edge_ew" ], + "bg": [ + { "weight": 1, "sprite": "t_grass_summer" }, + { "weight": 1, "sprite": "t_grass_summer_1" }, + { "weight": 1, "sprite": "t_grass_summer_2" } + ] + }, + { + "id": "end_piece", + "fg": [ "t_sand_end_piece_n", "t_sand_end_piece_w", "t_sand_end_piece_s", "t_sand_end_piece_e" ], + "bg": [ + { "weight": 1, "sprite": "t_grass_summer" }, + { "weight": 1, "sprite": "t_grass_summer_1" }, + { "weight": 1, "sprite": "t_grass_summer_2" } + ] + }, + { + "id": "unconnected", + "fg": [ "t_sand_unconnected", "t_sand_unconnected" ], + "bg": [ + { "weight": 1, "sprite": "t_grass_summer" }, + { "weight": 1, "sprite": "t_grass_summer_1" }, + { "weight": 1, "sprite": "t_grass_summer_2" } + ] + } + ] + }, + { + "id": "t_sand_season_autumn", + "fg": "t_sand_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": "t_sand_center", + "bg": [ + { "weight": 1, "sprite": "t_grass_autumn" }, + { "weight": 1, "sprite": "t_grass_autumn_1" }, + { "weight": 1, "sprite": "t_grass_autumn_2" } + ] + }, + { + "id": "corner", + "fg": [ "t_sand_corner_nw", "t_sand_corner_sw", "t_sand_corner_se", "t_sand_corner_ne" ], + "bg": [ + { "weight": 1, "sprite": "t_grass_autumn" }, + { "weight": 1, "sprite": "t_grass_autumn_1" }, + { "weight": 1, "sprite": "t_grass_autumn_2" } + ] + }, + { + "id": "t_connection", + "fg": [ "t_sand_t_connection_n", "t_sand_t_connection_w", "t_sand_t_connection_s", "t_sand_t_connection_e" ], + "bg": [ + { "weight": 1, "sprite": "t_grass_autumn" }, + { "weight": 1, "sprite": "t_grass_autumn_1" }, + { "weight": 1, "sprite": "t_grass_autumn_2" } + ] + }, + { + "id": "edge", + "fg": [ "t_sand_edge_ns", "t_sand_edge_ew" ], + "bg": [ + { "weight": 1, "sprite": "t_grass_autumn" }, + { "weight": 1, "sprite": "t_grass_autumn_1" }, + { "weight": 1, "sprite": "t_grass_autumn_2" } + ] + }, + { + "id": "end_piece", + "fg": [ "t_sand_end_piece_n", "t_sand_end_piece_w", "t_sand_end_piece_s", "t_sand_end_piece_e" ], + "bg": [ + { "weight": 1, "sprite": "t_grass_autumn" }, + { "weight": 1, "sprite": "t_grass_autumn_1" }, + { "weight": 1, "sprite": "t_grass_autumn_2" } + ] + }, + { + "id": "unconnected", + "fg": [ "t_sand_unconnected", "t_sand_unconnected" ], + "bg": [ + { "weight": 1, "sprite": "t_grass_autumn" }, + { "weight": 1, "sprite": "t_grass_autumn_1" }, + { "weight": 1, "sprite": "t_grass_autumn_2" } + ] + } + ] + }, + { + "id": "t_sand_season_winter", + "fg": "t_sand_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": "t_sand_center", + "bg": [ + { "weight": 100, "sprite": "t_grass_winter" }, + { "weight": 100, "sprite": "t_grass_winter_1" }, + { "weight": 100, "sprite": "t_grass_winter_2" } + ] + }, + { + "id": "corner", + "fg": [ "t_sand_corner_nw", "t_sand_corner_sw", "t_sand_corner_se", "t_sand_corner_ne" ], + "bg": [ + { "weight": 100, "sprite": "t_grass_winter" }, + { "weight": 100, "sprite": "t_grass_winter_1" }, + { "weight": 100, "sprite": "t_grass_winter_2" } + ] + }, + { + "id": "t_connection", + "fg": [ "t_sand_t_connection_n", "t_sand_t_connection_w", "t_sand_t_connection_s", "t_sand_t_connection_e" ], + "bg": [ + { "weight": 100, "sprite": "t_grass_winter" }, + { "weight": 100, "sprite": "t_grass_winter_1" }, + { "weight": 100, "sprite": "t_grass_winter_2" } + ] + }, + { + "id": "edge", + "fg": [ "t_sand_edge_ns", "t_sand_edge_ew" ], + "bg": [ + { "weight": 100, "sprite": "t_grass_winter" }, + { "weight": 100, "sprite": "t_grass_winter_1" }, + { "weight": 100, "sprite": "t_grass_winter_2" } + ] + }, + { + "id": "end_piece", + "fg": [ "t_sand_end_piece_n", "t_sand_end_piece_w", "t_sand_end_piece_s", "t_sand_end_piece_e" ], + "bg": [ + { "weight": 100, "sprite": "t_grass_winter" }, + { "weight": 100, "sprite": "t_grass_winter_1" }, + { "weight": 100, "sprite": "t_grass_winter_2" } + ] + }, + { + "id": "unconnected", + "fg": [ "t_sand_unconnected", "t_sand_unconnected" ], + "bg": [ + { "weight": 100, "sprite": "t_grass_winter" }, + { "weight": 100, "sprite": "t_grass_winter_1" }, + { "weight": 100, "sprite": "t_grass_winter_2" } + ] + } + ] + } +] diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_center.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_center.png index 78d6e6d72b..691772ebcb 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_center.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_center.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_ne.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_ne.png index eff12c08be..64e8e86c01 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_ne.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_ne.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_nw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_nw.png index 49b5854830..26973d4bc6 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_nw.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_nw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_se.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_se.png index 52bd32f5a0..5b19767a5c 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_se.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_se.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_sw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_sw.png index 279a0375f3..75052f5213 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_sw.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_corner_sw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_edge_ew.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_edge_ew.png index 3aaf21eaa8..1e5cc64097 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_edge_ew.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_edge_ew.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_edge_ns.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_edge_ns.png index c7585134f7..d86c1d1355 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_edge_ns.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_edge_ns.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_e.png index 0108a82e37..bce5e9be6a 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_e.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_n.png index dcee9b766d..19dcd238b2 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_n.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_s.png index f86f7106ef..bba0baf985 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_s.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_w.png index a3f83b894b..a82fb83606 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_w.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_end_piece_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_e.png index e7ef36e30a..ec5d06deba 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_e.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_n.png index 020c1f0fa9..74ea73bcc0 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_n.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_s.png index 59af084223..b93cb79547 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_s.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_w.png index 5c2db72062..b1d4f898cf 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_w.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_t_connection_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_unconnected.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_unconnected.png index df0b343492..6dc883d692 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_unconnected.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_sand/t_sand_unconnected.png differ