diff --git a/gfx/MShockXotto+/autotiles/t_swater_dp_autotile.png b/gfx/MShockXotto+/autotiles/t_swater_dp_autotile.png new file mode 100644 index 0000000000..8c4c7496ce Binary files /dev/null and b/gfx/MShockXotto+/autotiles/t_swater_dp_autotile.png differ diff --git a/gfx/MShockXotto+/autotiles/t_swater_sh_autotile.png b/gfx/MShockXotto+/autotiles/t_swater_sh_autotile.png new file mode 100644 index 0000000000..087561d83c Binary files /dev/null and b/gfx/MShockXotto+/autotiles/t_swater_sh_autotile.png differ diff --git a/gfx/MShockXotto+/autotiles/t_water_dp_autotile.png b/gfx/MShockXotto+/autotiles/t_water_dp_autotile.png new file mode 100644 index 0000000000..fbf08b5912 Binary files /dev/null and b/gfx/MShockXotto+/autotiles/t_water_dp_autotile.png differ diff --git a/gfx/MShockXotto+/autotiles/t_water_hot_autotile.aseprite b/gfx/MShockXotto+/autotiles/t_water_hot_autotile.aseprite new file mode 100644 index 0000000000..c565da406a Binary files /dev/null and b/gfx/MShockXotto+/autotiles/t_water_hot_autotile.aseprite differ diff --git a/gfx/MShockXotto+/autotiles/t_water_hot_autotile.png b/gfx/MShockXotto+/autotiles/t_water_hot_autotile.png index 91f010eb9f..37a0e4947e 100644 Binary files a/gfx/MShockXotto+/autotiles/t_water_hot_autotile.png and b/gfx/MShockXotto+/autotiles/t_water_hot_autotile.png differ diff --git a/gfx/MShockXotto+/autotiles/t_water_pool_multitile.png b/gfx/MShockXotto+/autotiles/t_water_pool_multitile.png new file mode 100644 index 0000000000..bb50908d71 Binary files /dev/null and b/gfx/MShockXotto+/autotiles/t_water_pool_multitile.png differ diff --git a/gfx/MShockXotto+/autotiles/t_water_pool_shallow_multitile.aseprite b/gfx/MShockXotto+/autotiles/t_water_pool_shallow_multitile.aseprite new file mode 100644 index 0000000000..949bbe0198 Binary files /dev/null and b/gfx/MShockXotto+/autotiles/t_water_pool_shallow_multitile.aseprite differ diff --git a/gfx/MShockXotto+/autotiles/t_water_pool_shallow_multitile.png b/gfx/MShockXotto+/autotiles/t_water_pool_shallow_multitile.png new file mode 100644 index 0000000000..efd5f988dc Binary files /dev/null and b/gfx/MShockXotto+/autotiles/t_water_pool_shallow_multitile.png differ diff --git a/gfx/MShockXotto+/autotiles/t_water_sh_autotile.png b/gfx/MShockXotto+/autotiles/t_water_sh_autotile.png new file mode 100644 index 0000000000..0bb9492254 Binary files /dev/null and b/gfx/MShockXotto+/autotiles/t_water_sh_autotile.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp.png deleted file mode 100644 index eb179ea974..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp.json new file mode 100644 index 0000000000..cbb1101eb6 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp.json @@ -0,0 +1,151 @@ +[ + { + "id": "t_swater_dp", + "fg": "t_swater_dp_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_swater_dp" }, + { "weight": 4, "sprite": "t_swater_dp_0" }, + { "weight": 4, "sprite": "t_swater_dp_1" }, + { "weight": 4, "sprite": "t_swater_dp_2" }, + { "weight": 1, "sprite": "t_swater_dp_3" }, + { "weight": 1, "sprite": "t_swater_dp_4" } + ], + "bg": [ "t_dirt" ] + }, + { + "id": "corner", + "fg": [ "t_swater_dp_corner_nw", "t_swater_dp_corner_sw", "t_swater_dp_corner_se", "t_swater_dp_corner_ne" ], + "bg": [ "t_dirt" ] + }, + { + "id": "t_connection", + "fg": [ "t_swater_dp_t_connection_n", "t_swater_dp_t_connection_w", "t_swater_dp_t_connection_s", "t_swater_dp_t_connection_e" ], + "bg": [ "t_dirt" ] + }, + { "id": "edge", "fg": [ "t_swater_dp_edge_ns", "t_swater_dp_edge_ew" ], "bg": [ "t_dirt" ] }, + { + "id": "end_piece", + "fg": [ "t_swater_dp_end_piece_n", "t_swater_dp_end_piece_w", "t_swater_dp_end_piece_s", "t_swater_dp_end_piece_e" ], + "bg": [ "t_dirt" ] + }, + { "id": "unconnected", "fg": [ "t_swater_dp_unconnected", "t_swater_dp_unconnected" ], "bg": [ "t_dirt" ] } + ] + }, + { + "id": "t_swater_dp_season_winter", + "fg": "t_swater_dp_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_swater_dp" }, + { "weight": 4, "sprite": "t_swater_dp_0" }, + { "weight": 4, "sprite": "t_swater_dp_1" }, + { "weight": 4, "sprite": "t_swater_dp_2" }, + { "weight": 1, "sprite": "t_swater_dp_3" }, + { "weight": 1, "sprite": "t_swater_dp_4" } + ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "corner", + "fg": [ "t_swater_dp_corner_nw", "t_swater_dp_corner_sw", "t_swater_dp_corner_se", "t_swater_dp_corner_ne" ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "t_connection", + "fg": [ "t_swater_dp_t_connection_n", "t_swater_dp_t_connection_w", "t_swater_dp_t_connection_s", "t_swater_dp_t_connection_e" ], + "bg": [ "snow_shallow_center" ] + }, + { "id": "edge", "fg": [ "t_swater_dp_edge_ns", "t_swater_dp_edge_ew" ], "bg": [ "snow_shallow_center" ] }, + { + "id": "end_piece", + "fg": [ "t_swater_dp_end_piece_n", "t_swater_dp_end_piece_w", "t_swater_dp_end_piece_s", "t_swater_dp_end_piece_e" ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "unconnected", + "fg": [ "t_swater_dp_unconnected", "t_swater_dp_unconnected" ], + "bg": [ "snow_shallow_center" ] + } + ] + }, + { + "id": "t_swater_dp_season_summer", + "fg": "t_swater_dp_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_swater_dp" }, + { "weight": 4, "sprite": "t_swater_dp_0" }, + { "weight": 4, "sprite": "t_swater_dp_1" }, + { "weight": 4, "sprite": "t_swater_dp_2" }, + { "weight": 1, "sprite": "t_swater_dp_3" }, + { "weight": 1, "sprite": "t_swater_dp_4" } + ], + "bg": [ "t_dirt_summer" ] + }, + { + "id": "corner", + "fg": [ "t_swater_dp_corner_nw", "t_swater_dp_corner_sw", "t_swater_dp_corner_se", "t_swater_dp_corner_ne" ], + "bg": [ "t_dirt_summer" ] + }, + { + "id": "t_connection", + "fg": [ "t_swater_dp_t_connection_n", "t_swater_dp_t_connection_w", "t_swater_dp_t_connection_s", "t_swater_dp_t_connection_e" ], + "bg": [ "t_dirt_summer" ] + }, + { "id": "edge", "fg": [ "t_swater_dp_edge_ns", "t_swater_dp_edge_ew" ], "bg": [ "t_dirt_summer" ] }, + { + "id": "end_piece", + "fg": [ "t_swater_dp_end_piece_n", "t_swater_dp_end_piece_w", "t_swater_dp_end_piece_s", "t_swater_dp_end_piece_e" ], + "bg": [ "t_dirt_summer" ] + }, + { "id": "unconnected", "fg": [ "t_swater_dp_unconnected", "t_swater_dp_unconnected" ], "bg": [ "t_dirt_summer" ] } + ] + }, + { + "id": "t_swater_dp_season_autumn", + "fg": "t_swater_dp_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_swater_dp" }, + { "weight": 4, "sprite": "t_swater_dp_0" }, + { "weight": 4, "sprite": "t_swater_dp_1" }, + { "weight": 4, "sprite": "t_swater_dp_2" }, + { "weight": 1, "sprite": "t_swater_dp_3" }, + { "weight": 1, "sprite": "t_swater_dp_4" } + ], + "bg": [ "t_dirt_autumn" ] + }, + { + "id": "corner", + "fg": [ "t_swater_dp_corner_nw", "t_swater_dp_corner_sw", "t_swater_dp_corner_se", "t_swater_dp_corner_ne" ], + "bg": [ "t_dirt_autumn" ] + }, + { + "id": "t_connection", + "fg": [ "t_swater_dp_t_connection_n", "t_swater_dp_t_connection_w", "t_swater_dp_t_connection_s", "t_swater_dp_t_connection_e" ], + "bg": [ "t_dirt_autumn" ] + }, + { "id": "edge", "fg": [ "t_swater_dp_edge_ns", "t_swater_dp_edge_ew" ], "bg": [ "t_dirt_autumn" ] }, + { + "id": "end_piece", + "fg": [ "t_swater_dp_end_piece_n", "t_swater_dp_end_piece_w", "t_swater_dp_end_piece_s", "t_swater_dp_end_piece_e" ], + "bg": [ "t_dirt_autumn" ] + }, + { "id": "unconnected", "fg": [ "t_swater_dp_unconnected", "t_swater_dp_unconnected" ], "bg": [ "t_dirt_autumn" ] } + ] + } +] + diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp.png new file mode 100644 index 0000000000..c3f6acbadb Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_0.png new file mode 100644 index 0000000000..f073653bc1 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_0.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_1.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_1.png new file mode 100644 index 0000000000..9748517713 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_1.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_2.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_2.png new file mode 100644 index 0000000000..06811612a7 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_2.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_3.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_3.png new file mode 100644 index 0000000000..474f17960e Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_3.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_4.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_4.png new file mode 100644 index 0000000000..e517c366aa Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_4.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_ne.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_ne.png new file mode 100644 index 0000000000..66328f1066 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_ne.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_nw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_nw.png new file mode 100644 index 0000000000..1ad7948eae Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_nw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_se.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_se.png new file mode 100644 index 0000000000..689d9b2ec9 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_se.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_sw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_sw.png new file mode 100644 index 0000000000..fa00d880ee Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_corner_sw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_edge_ew.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_edge_ew.png new file mode 100644 index 0000000000..1c3f5649c2 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_edge_ew.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_edge_ns.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_edge_ns.png new file mode 100644 index 0000000000..164e37bf19 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_edge_ns.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_e.png new file mode 100644 index 0000000000..d8c60d8faa Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_n.png new file mode 100644 index 0000000000..d1ac8ac4f3 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_s.png new file mode 100644 index 0000000000..39aaf78e07 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_w.png new file mode 100644 index 0000000000..5b36acfe4e Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_end_piece_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_e.png new file mode 100644 index 0000000000..194ef8f02e Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_n.png new file mode 100644 index 0000000000..f13c0d03eb Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_s.png new file mode 100644 index 0000000000..b8b4d4898c Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_w.png new file mode 100644 index 0000000000..8df26e36dd Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_t_connection_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_unconnected.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_unconnected.png new file mode 100644 index 0000000000..954f994e77 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp_unconnected.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_2.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_2.png deleted file mode 100644 index 86ae34ebaa..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_2.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_2.xcf b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_2.xcf deleted file mode 100644 index 465c232617..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_2.xcf and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_3.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_3.png deleted file mode 100644 index e4c77d1084..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_3.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_3.xcf b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_3.xcf deleted file mode 100644 index 2183ca1d1f..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_3.xcf and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_4.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_4.png deleted file mode 100644 index 571f8641f8..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_4.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_4.xcf b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_4.xcf deleted file mode 100644 index 7891a1f025..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_4.xcf and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_5.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_5.png deleted file mode 100644 index 3aa137a4a7..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_5.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_5.xcf b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_5.xcf deleted file mode 100644 index a46d49c3a1..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp_5.xcf and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh.json new file mode 100644 index 0000000000..e2264015bb --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh.json @@ -0,0 +1,151 @@ +[ + { + "id": "t_swater_sh", + "fg": "t_swater_sh_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_swater_sh" }, + { "weight": 4, "sprite": "t_swater_sh_0" }, + { "weight": 4, "sprite": "t_swater_sh_1" }, + { "weight": 4, "sprite": "t_swater_sh_2" }, + { "weight": 1, "sprite": "t_swater_sh_3" }, + { "weight": 1, "sprite": "t_swater_sh_4" } + ], + "bg": [ "t_dirt" ] + }, + { + "id": "corner", + "fg": [ "t_swater_sh_corner_nw", "t_swater_sh_corner_sw", "t_swater_sh_corner_se", "t_swater_sh_corner_ne" ], + "bg": [ "t_dirt" ] + }, + { + "id": "t_connection", + "fg": [ "t_swater_sh_t_connection_n", "t_swater_sh_t_connection_w", "t_swater_sh_t_connection_s", "t_swater_sh_t_connection_e" ], + "bg": [ "t_dirt" ] + }, + { "id": "edge", "fg": [ "t_swater_sh_edge_ns", "t_swater_sh_edge_ew" ], "bg": [ "t_dirt" ] }, + { + "id": "end_piece", + "fg": [ "t_swater_sh_end_piece_n", "t_swater_sh_end_piece_w", "t_swater_sh_end_piece_s", "t_swater_sh_end_piece_e" ], + "bg": [ "t_dirt" ] + }, + { "id": "unconnected", "fg": [ "t_swater_sh_unconnected", "t_swater_sh_unconnected" ], "bg": [ "t_dirt" ] } + ] + }, + { + "id": "t_swater_sh_season_winter", + "fg": "t_swater_sh_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_swater_sh" }, + { "weight": 4, "sprite": "t_swater_sh_0" }, + { "weight": 4, "sprite": "t_swater_sh_1" }, + { "weight": 4, "sprite": "t_swater_sh_2" }, + { "weight": 1, "sprite": "t_swater_sh_3" }, + { "weight": 1, "sprite": "t_swater_sh_4" } + ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "corner", + "fg": [ "t_swater_sh_corner_nw", "t_swater_sh_corner_sw", "t_swater_sh_corner_se", "t_swater_sh_corner_ne" ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "t_connection", + "fg": [ "t_swater_sh_t_connection_n", "t_swater_sh_t_connection_w", "t_swater_sh_t_connection_s", "t_swater_sh_t_connection_e" ], + "bg": [ "snow_shallow_center" ] + }, + { "id": "edge", "fg": [ "t_swater_sh_edge_ns", "t_swater_sh_edge_ew" ], "bg": [ "snow_shallow_center" ] }, + { + "id": "end_piece", + "fg": [ "t_swater_sh_end_piece_n", "t_swater_sh_end_piece_w", "t_swater_sh_end_piece_s", "t_swater_sh_end_piece_e" ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "unconnected", + "fg": [ "t_swater_sh_unconnected", "t_swater_sh_unconnected" ], + "bg": [ "snow_shallow_center" ] + } + ] + }, + { + "id": "t_swater_sh_season_summer", + "fg": "t_swater_sh_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_swater_sh" }, + { "weight": 4, "sprite": "t_swater_sh_0" }, + { "weight": 4, "sprite": "t_swater_sh_1" }, + { "weight": 4, "sprite": "t_swater_sh_2" }, + { "weight": 1, "sprite": "t_swater_sh_3" }, + { "weight": 1, "sprite": "t_swater_sh_4" } + ], + "bg": [ "t_dirt_summer" ] + }, + { + "id": "corner", + "fg": [ "t_swater_sh_corner_nw", "t_swater_sh_corner_sw", "t_swater_sh_corner_se", "t_swater_sh_corner_ne" ], + "bg": [ "t_dirt_summer" ] + }, + { + "id": "t_connection", + "fg": [ "t_swater_sh_t_connection_n", "t_swater_sh_t_connection_w", "t_swater_sh_t_connection_s", "t_swater_sh_t_connection_e" ], + "bg": [ "t_dirt_summer" ] + }, + { "id": "edge", "fg": [ "t_swater_sh_edge_ns", "t_swater_sh_edge_ew" ], "bg": [ "t_dirt_summer" ] }, + { + "id": "end_piece", + "fg": [ "t_swater_sh_end_piece_n", "t_swater_sh_end_piece_w", "t_swater_sh_end_piece_s", "t_swater_sh_end_piece_e" ], + "bg": [ "t_dirt_summer" ] + }, + { "id": "unconnected", "fg": [ "t_swater_sh_unconnected", "t_swater_sh_unconnected" ], "bg": [ "t_dirt_summer" ] } + ] + }, + { + "id": "t_swater_sh_season_autumn", + "fg": "t_swater_sh_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_swater_sh" }, + { "weight": 4, "sprite": "t_swater_sh_0" }, + { "weight": 4, "sprite": "t_swater_sh_1" }, + { "weight": 4, "sprite": "t_swater_sh_2" }, + { "weight": 1, "sprite": "t_swater_sh_3" }, + { "weight": 1, "sprite": "t_swater_sh_4" } + ], + "bg": [ "t_dirt_autumn" ] + }, + { + "id": "corner", + "fg": [ "t_swater_sh_corner_nw", "t_swater_sh_corner_sw", "t_swater_sh_corner_se", "t_swater_sh_corner_ne" ], + "bg": [ "t_dirt_autumn" ] + }, + { + "id": "t_connection", + "fg": [ "t_swater_sh_t_connection_n", "t_swater_sh_t_connection_w", "t_swater_sh_t_connection_s", "t_swater_sh_t_connection_e" ], + "bg": [ "t_dirt_autumn" ] + }, + { "id": "edge", "fg": [ "t_swater_sh_edge_ns", "t_swater_sh_edge_ew" ], "bg": [ "t_dirt_autumn" ] }, + { + "id": "end_piece", + "fg": [ "t_swater_sh_end_piece_n", "t_swater_sh_end_piece_w", "t_swater_sh_end_piece_s", "t_swater_sh_end_piece_e" ], + "bg": [ "t_dirt_autumn" ] + }, + { "id": "unconnected", "fg": [ "t_swater_sh_unconnected", "t_swater_sh_unconnected" ], "bg": [ "t_dirt_autumn" ] } + ] + } +] + diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh.png new file mode 100644 index 0000000000..b529b915a8 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_0.png new file mode 100644 index 0000000000..289cf6ad72 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_0.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_1.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_1.png new file mode 100644 index 0000000000..bb5025713e Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_1.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_2.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_2.png new file mode 100644 index 0000000000..add0b4a43a Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_2.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_3.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_3.png new file mode 100644 index 0000000000..00f12894d4 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_3.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_4.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_4.png new file mode 100644 index 0000000000..68fb3c7978 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_4.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_ne.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_ne.png new file mode 100644 index 0000000000..8c7ff3a30c Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_ne.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_nw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_nw.png new file mode 100644 index 0000000000..f4116640c7 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_nw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_se.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_se.png new file mode 100644 index 0000000000..d62c7796a4 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_se.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_sw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_sw.png new file mode 100644 index 0000000000..82b2d42d52 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_corner_sw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_edge_ew.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_edge_ew.png new file mode 100644 index 0000000000..e9c63c40b1 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_edge_ew.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_edge_ns.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_edge_ns.png new file mode 100644 index 0000000000..6c7b5377e8 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_edge_ns.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_e.png new file mode 100644 index 0000000000..39dcf23110 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_n.png new file mode 100644 index 0000000000..f1e7d7ce0e Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_s.png new file mode 100644 index 0000000000..d0dad376e5 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_w.png new file mode 100644 index 0000000000..44f94e9c0a Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_end_piece_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_e.png new file mode 100644 index 0000000000..4272f76288 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_n.png new file mode 100644 index 0000000000..435c1583a8 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_s.png new file mode 100644 index 0000000000..d525f26026 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_w.png new file mode 100644 index 0000000000..14514269a1 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_t_connection_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_unconnected.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_unconnected.png new file mode 100644 index 0000000000..b9c76f7de3 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh_unconnected.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp.json new file mode 100644 index 0000000000..df6cd5f708 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp.json @@ -0,0 +1,151 @@ +[ + { + "id": "t_water_dp", + "fg": "t_water_dp_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_water_dp" }, + { "weight": 4, "sprite": "t_water_dp_0" }, + { "weight": 4, "sprite": "t_water_dp_1" }, + { "weight": 4, "sprite": "t_water_dp_2" }, + { "weight": 1, "sprite": "t_water_dp_3" }, + { "weight": 1, "sprite": "t_water_dp_4" } + ], + "bg": [ "t_dirt" ] + }, + { + "id": "corner", + "fg": [ "t_water_dp_corner_nw", "t_water_dp_corner_sw", "t_water_dp_corner_se", "t_water_dp_corner_ne" ], + "bg": [ "t_dirt" ] + }, + { + "id": "t_connection", + "fg": [ "t_water_dp_t_connection_n", "t_water_dp_t_connection_w", "t_water_dp_t_connection_s", "t_water_dp_t_connection_e" ], + "bg": [ "t_dirt" ] + }, + { "id": "edge", "fg": [ "t_water_dp_edge_ns", "t_water_dp_edge_ew" ], "bg": [ "t_dirt" ] }, + { + "id": "end_piece", + "fg": [ "t_water_dp_end_piece_n", "t_water_dp_end_piece_w", "t_water_dp_end_piece_s", "t_water_dp_end_piece_e" ], + "bg": [ "t_dirt" ] + }, + { "id": "unconnected", "fg": [ "t_water_dp_unconnected", "t_water_dp_unconnected" ], "bg": [ "t_dirt" ] } + ] + }, + { + "id": "t_water_dp_season_winter", + "fg": "t_water_dp_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_water_dp" }, + { "weight": 4, "sprite": "t_water_dp_0" }, + { "weight": 4, "sprite": "t_water_dp_1" }, + { "weight": 4, "sprite": "t_water_dp_2" }, + { "weight": 1, "sprite": "t_water_dp_3" }, + { "weight": 1, "sprite": "t_water_dp_4" } + ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "corner", + "fg": [ "t_water_dp_corner_nw", "t_water_dp_corner_sw", "t_water_dp_corner_se", "t_water_dp_corner_ne" ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "t_connection", + "fg": [ "t_water_dp_t_connection_n", "t_water_dp_t_connection_w", "t_water_dp_t_connection_s", "t_water_dp_t_connection_e" ], + "bg": [ "snow_shallow_center" ] + }, + { "id": "edge", "fg": [ "t_water_dp_edge_ns", "t_water_dp_edge_ew" ], "bg": [ "snow_shallow_center" ] }, + { + "id": "end_piece", + "fg": [ "t_water_dp_end_piece_n", "t_water_dp_end_piece_w", "t_water_dp_end_piece_s", "t_water_dp_end_piece_e" ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "unconnected", + "fg": [ "t_water_dp_unconnected", "t_water_dp_unconnected" ], + "bg": [ "snow_shallow_center" ] + } + ] + }, + { + "id": "t_water_dp_season_summer", + "fg": "t_water_dp_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_water_dp" }, + { "weight": 4, "sprite": "t_water_dp_0" }, + { "weight": 4, "sprite": "t_water_dp_1" }, + { "weight": 4, "sprite": "t_water_dp_2" }, + { "weight": 1, "sprite": "t_water_dp_3" }, + { "weight": 1, "sprite": "t_water_dp_4" } + ], + "bg": [ "t_dirt_summer" ] + }, + { + "id": "corner", + "fg": [ "t_water_dp_corner_nw", "t_water_dp_corner_sw", "t_water_dp_corner_se", "t_water_dp_corner_ne" ], + "bg": [ "t_dirt_summer" ] + }, + { + "id": "t_connection", + "fg": [ "t_water_dp_t_connection_n", "t_water_dp_t_connection_w", "t_water_dp_t_connection_s", "t_water_dp_t_connection_e" ], + "bg": [ "t_dirt_summer" ] + }, + { "id": "edge", "fg": [ "t_water_dp_edge_ns", "t_water_dp_edge_ew" ], "bg": [ "t_dirt_summer" ] }, + { + "id": "end_piece", + "fg": [ "t_water_dp_end_piece_n", "t_water_dp_end_piece_w", "t_water_dp_end_piece_s", "t_water_dp_end_piece_e" ], + "bg": [ "t_dirt_summer" ] + }, + { "id": "unconnected", "fg": [ "t_water_dp_unconnected", "t_water_dp_unconnected" ], "bg": [ "t_dirt_summer" ] } + ] + }, + { + "id": "t_water_dp_season_autumn", + "fg": "t_water_dp_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_water_dp" }, + { "weight": 4, "sprite": "t_water_dp_0" }, + { "weight": 4, "sprite": "t_water_dp_1" }, + { "weight": 4, "sprite": "t_water_dp_2" }, + { "weight": 1, "sprite": "t_water_dp_3" }, + { "weight": 1, "sprite": "t_water_dp_4" } + ], + "bg": [ "t_dirt_autumn" ] + }, + { + "id": "corner", + "fg": [ "t_water_dp_corner_nw", "t_water_dp_corner_sw", "t_water_dp_corner_se", "t_water_dp_corner_ne" ], + "bg": [ "t_dirt_autumn" ] + }, + { + "id": "t_connection", + "fg": [ "t_water_dp_t_connection_n", "t_water_dp_t_connection_w", "t_water_dp_t_connection_s", "t_water_dp_t_connection_e" ], + "bg": [ "t_dirt_autumn" ] + }, + { "id": "edge", "fg": [ "t_water_dp_edge_ns", "t_water_dp_edge_ew" ], "bg": [ "t_dirt_autumn" ] }, + { + "id": "end_piece", + "fg": [ "t_water_dp_end_piece_n", "t_water_dp_end_piece_w", "t_water_dp_end_piece_s", "t_water_dp_end_piece_e" ], + "bg": [ "t_dirt_autumn" ] + }, + { "id": "unconnected", "fg": [ "t_water_dp_unconnected", "t_water_dp_unconnected" ], "bg": [ "t_dirt_autumn" ] } + ] + } +] + diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp.png new file mode 100644 index 0000000000..c88023446f Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_0.png new file mode 100644 index 0000000000..0822e216b4 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_0.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_1.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_1.png new file mode 100644 index 0000000000..35477c5ec8 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_1.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_2.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_2.png new file mode 100644 index 0000000000..f0e3c728c8 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_2.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_3.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_3.png new file mode 100644 index 0000000000..193b9a5711 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_3.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_4.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_4.png new file mode 100644 index 0000000000..cefa8c2a8f Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_4.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_ne.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_ne.png new file mode 100644 index 0000000000..e75ad039d5 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_ne.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_nw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_nw.png new file mode 100644 index 0000000000..0d4198fbc3 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_nw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_se.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_se.png new file mode 100644 index 0000000000..3c53abfc1c Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_se.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_sw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_sw.png new file mode 100644 index 0000000000..017e816ae2 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_corner_sw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_edge_ew.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_edge_ew.png new file mode 100644 index 0000000000..f0644b55f9 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_edge_ew.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_edge_ns.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_edge_ns.png new file mode 100644 index 0000000000..d332317932 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_edge_ns.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_e.png new file mode 100644 index 0000000000..8915d42b0a Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_n.png new file mode 100644 index 0000000000..db938b9cd6 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_s.png new file mode 100644 index 0000000000..3b4a7cb3b2 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_w.png new file mode 100644 index 0000000000..28bbc9622e Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_end_piece_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_e.png new file mode 100644 index 0000000000..103ccf9a13 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_n.png new file mode 100644 index 0000000000..7f45f94556 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_s.png new file mode 100644 index 0000000000..53779daf4c Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_w.png new file mode 100644 index 0000000000..08744d00ff Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_t_connection_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_unconnected.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_unconnected.png new file mode 100644 index 0000000000..9062131b58 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp/t_water_dp_unconnected.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_0.json deleted file mode 100644 index 4128294372..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_0.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": [ - "t_water_dp", - "t_swater_dp" - ], - "fg": [ - "t_swater_dp" - ], - "rotates": false, - "multitile": true, - "additional_tiles": [ - { "id": "center", "fg": [ "t_swater_dp" ], "bg": [ "t_dirt" ] }, - { "id": "corner", "fg": [ "t_swater_dp_2" ], "bg": [ "t_dirt" ] }, - { "id": "edge", "fg": [ "t_swater_dp_3" ], "bg": [ "t_dirt" ] }, - { "id": "end_piece", "fg": [ "t_swater_dp_4" ], "bg": [ "t_dirt" ] }, - { "id": "unconnected", "fg": [ "t_swater_dp_5" ], "bg": [ "t_dirt" ] } - ], - "bg": [ - "t_dirt" - ] -} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_season_autumn.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_season_autumn.json deleted file mode 100644 index 34410bb25c..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_season_autumn.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": [ - "t_water_dp_season_autumn", - "t_swater_dp_season_autumn" - ], - "fg": [ - "t_swater_dp" - ], - "rotates": false, - "multitile": true, - "additional_tiles": [ - { "id": "center", "fg": [ "t_swater_dp" ], "bg": [ "t_dirt_autumn" ] }, - { "id": "corner", "fg": [ "t_swater_dp_2" ], "bg": [ "t_dirt_autumn" ] }, - { "id": "edge", "fg": [ "t_swater_dp_3" ], "bg": [ "t_dirt_autumn" ] }, - { "id": "end_piece", "fg": [ "t_swater_dp_4" ], "bg": [ "t_dirt_autumn" ] }, - { "id": "unconnected", "fg": [ "t_swater_dp_5" ], "bg": [ "t_dirt_autumn" ] } - ], - "bg": [ - "t_dirt_autumn" - ] -} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_season_summer.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_season_summer.json deleted file mode 100644 index dfdee6471b..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_season_summer.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": [ - "t_water_dp_season_summer", - "t_swater_dp_season_summer" - ], - "fg": [ - "t_swater_dp" - ], - "rotates": false, - "multitile": true, - "additional_tiles": [ - { "id": "center", "fg": [ "t_swater_dp" ], "bg": [ "t_dirt_summer" ] }, - { "id": "corner", "fg": [ "t_swater_dp_2" ], "bg": [ "t_dirt_summer" ] }, - { "id": "edge", "fg": [ "t_swater_dp_3" ], "bg": [ "t_dirt_summer" ] }, - { "id": "end_piece", "fg": [ "t_swater_dp_4" ], "bg": [ "t_dirt_summer" ] }, - { "id": "unconnected", "fg": [ "t_swater_dp_5" ], "bg": [ "t_dirt_summer" ] } - ], - "bg": [ - "t_dirt_summer" - ] -} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_season_winter_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_season_winter_0.json deleted file mode 100644 index cb843b5696..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_dp_season_winter_0.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": [ - "t_water_season_winter_dp", - "t_swater_season_winter_dp" - ], - "fg": [ - "t_swater_dp" - ], - "rotates": false, - "multitile": true, - "additional_tiles": [ - { "id": "center", "fg": [ "t_swater_dp" ], "bg": [ "snow_shallow_center" ] }, - { "id": "corner", "fg": [ "t_swater_dp_2" ], "bg": [ "snow_shallow_center" ] }, - { "id": "edge", "fg": [ "t_swater_dp_3" ], "bg": [ "snow_shallow_center" ] }, - { "id": "end_piece", "fg": [ "t_swater_dp_4" ], "bg": [ "snow_shallow_center" ] }, - { "id": "unconnected", "fg": [ "t_swater_dp_5" ], "bg": [ "snow_shallow_center" ] } - ], - "bg": [ - "snow_shallow_center" - ] -} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot.json index d6bf267c57..3cb27f44cb 100644 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot.json +++ b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot.json @@ -5,7 +5,14 @@ "additional_tiles": [ { "id": "center", - "fg": "t_water_hot_center" + "fg": [ + { "weight": 4, "sprite": "t_water_hot" }, + { "weight": 4, "sprite": "t_water_hot_0" }, + { "weight": 4, "sprite": "t_water_hot_1" }, + { "weight": 4, "sprite": "t_water_hot_2" }, + { "weight": 1, "sprite": "t_water_hot_3" }, + { "weight": 1, "sprite": "t_water_hot_4" } + ] }, { "id": "corner", diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot.png new file mode 100644 index 0000000000..dc7d562a04 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_0.png new file mode 100644 index 0000000000..aa34d856b2 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_0.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_2.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_2.png new file mode 100644 index 0000000000..80e342b3c5 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_2.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_3.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_3.png new file mode 100644 index 0000000000..192bc5ab8e Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_3.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_4.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_4.png new file mode 100644 index 0000000000..e769da74a3 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_4.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_center.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_center.png deleted file mode 100644 index de72bb8f9b..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_center.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_ne.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_ne.png index a315013522..773238c3bd 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_ne.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_ne.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_nw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_nw.png index 95cff5c315..0f960fb2f9 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_nw.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_nw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_se.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_se.png index 9dbe8c0595..751102dc36 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_se.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_se.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_sw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_sw.png index f23aaabf89..69d9ebf9eb 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_sw.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_corner_sw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_edge_ew.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_edge_ew.png index a041b94b72..33b09ee6e1 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_edge_ew.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_edge_ew.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_edge_ns.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_edge_ns.png index 91af8d44f6..7a555d0de8 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_edge_ns.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_edge_ns.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_e.png index 14c8a89c76..b76274c70b 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_e.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_n.png index dd33984556..8936509724 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_n.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_s.png index 096af87af9..3eae9e66ee 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_s.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_w.png index e94ffd5e29..c479fe792e 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_w.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_end_piece_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_e.png index 32614f695c..4d7cde031d 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_e.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_n.png index 72ff11dcad..e99cff5ed7 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_n.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_s.png index 4fdbd1332b..379f6d1000 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_s.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_w.png index bccf445281..42df83d522 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_w.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_t_connection_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_unconnected.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_unconnected.png index f2e2cbcee5..a0a3bf2cc1 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_unconnected.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot/t_water_hot_unconnected.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot_1.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot_1.png new file mode 100644 index 0000000000..eebfb15402 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_hot_1.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool.json new file mode 100644 index 0000000000..9dc9a349be --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool.json @@ -0,0 +1,40 @@ +{ + "id": [ + "t_water_pool", + "t_water_pool_outdoor" + ], + "fg": "t_water_pool_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_water_pool" }, + { "weight": 4, "sprite": "t_water_pool_0" }, + { "weight": 4, "sprite": "t_water_pool_1" }, + { "weight": 4, "sprite": "t_water_pool_2" }, + { "weight": 1, "sprite": "t_water_pool_3" }, + { "weight": 1, "sprite": "t_water_pool_4" } + ] + }, + { + "id": "corner", + "fg": [ "t_water_pool_corner_nw", "t_water_pool_corner_sw", "t_water_pool_corner_se", "t_water_pool_corner_ne" ] + }, + { + "id": "t_connection", + "fg": [ + "t_water_pool_t_connection_n", + "t_water_pool_t_connection_w", + "t_water_pool_t_connection_s", + "t_water_pool_t_connection_e" + ] + }, + { "id": "edge", "fg": [ "t_water_pool_edge_ns", "t_water_pool_edge_ew" ] }, + { + "id": "end_piece", + "fg": [ "t_water_pool_end_piece_n", "t_water_pool_end_piece_w", "t_water_pool_end_piece_s", "t_water_pool_end_piece_e" ] + }, + { "id": "unconnected", "fg": [ "t_water_pool_unconnected", "t_water_pool_unconnected" ] } + ] +} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool.png new file mode 100644 index 0000000000..03e3744256 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_0.png new file mode 100644 index 0000000000..4d98541330 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_0.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_1.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_1.png new file mode 100644 index 0000000000..0ffb45fa5f Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_1.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_2.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_2.png new file mode 100644 index 0000000000..70c9bf7fe5 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_2.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_3.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_3.png new file mode 100644 index 0000000000..e56d084983 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_3.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_4.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_4.png new file mode 100644 index 0000000000..157123890f Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_4.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_ne.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_ne.png new file mode 100644 index 0000000000..68181673a7 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_ne.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_nw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_nw.png new file mode 100644 index 0000000000..1150d9c363 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_nw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_se.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_se.png new file mode 100644 index 0000000000..bea6f4c90f Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_se.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_sw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_sw.png new file mode 100644 index 0000000000..5221a81147 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_corner_sw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_edge_ew.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_edge_ew.png new file mode 100644 index 0000000000..5ba0d3a7ff Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_edge_ew.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_edge_ns.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_edge_ns.png new file mode 100644 index 0000000000..85fd4147d1 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_edge_ns.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_e.png new file mode 100644 index 0000000000..ad91416e19 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_n.png new file mode 100644 index 0000000000..c937dd8a14 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_s.png new file mode 100644 index 0000000000..157b38c7f7 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_w.png new file mode 100644 index 0000000000..17546d8b35 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_end_piece_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_e.png new file mode 100644 index 0000000000..6f36224887 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_n.png new file mode 100644 index 0000000000..42a9df2feb Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_s.png new file mode 100644 index 0000000000..2de84ef237 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_w.png new file mode 100644 index 0000000000..7acf159ad4 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_t_connection_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_unconnected.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_unconnected.png new file mode 100644 index 0000000000..7a11567557 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool/t_water_pool_unconnected.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool.json deleted file mode 100644 index a68460ef93..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "t_water_pool", - "fg": "t_water_pool_unconnected", - "multitile": true, - "additional_tiles": [ - { - "id": "center", - "fg": "t_water_pool_center" - }, - { - "id": "corner", - "fg": [ - "t_water_pool_corner_nw", - "t_water_pool_corner_sw", - "t_water_pool_corner_se", - "t_water_pool_corner_ne" - ] - }, - { - "id": "t_connection", - "fg": [ - "t_water_pool_t_connection_n", - "t_water_pool_t_connection_w", - "t_water_pool_t_connection_s", - "t_water_pool_t_connection_e" - ] - }, - { - "id": "edge", - "fg": [ - "t_water_pool_edge_ns", - "t_water_pool_edge_ew" - ] - }, - { - "id": "end_piece", - "fg": [ - "t_water_pool_end_piece_n", - "t_water_pool_end_piece_w", - "t_water_pool_end_piece_s", - "t_water_pool_end_piece_e" - ] - }, - { - "id": "unconnected", - "fg": [ - "t_water_pool_unconnected", - "t_water_pool_unconnected" - ] - } - ] -} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_center.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_center.png deleted file mode 100644 index fbadedba2e..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_center.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_ne.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_ne.png deleted file mode 100644 index 7c27c86e2b..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_ne.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_nw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_nw.png deleted file mode 100644 index 73e3da4f94..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_nw.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_se.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_se.png deleted file mode 100644 index 91155ea622..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_se.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_sw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_sw.png deleted file mode 100644 index a3a2dc1a63..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_corner_sw.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_edge_ew.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_edge_ew.png deleted file mode 100644 index 3b0d8caff4..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_edge_ew.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_edge_ns.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_edge_ns.png deleted file mode 100644 index f0f1b6cd5b..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_edge_ns.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_e.png deleted file mode 100644 index b8002a05d6..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_e.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_n.png deleted file mode 100644 index 6dc4598d68..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_n.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_s.png deleted file mode 100644 index 4fe079f912..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_s.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_w.png deleted file mode 100644 index 669ae0cf63..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_end_piece_w.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_outdoors.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_outdoors.json deleted file mode 100644 index 9dfd14290c..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_outdoors.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "t_water_pool_outdoors", - "fg": "t_water_pool_unconnected", - "multitile": true, - "additional_tiles": [ - { - "id": "center", - "fg": "t_water_pool_center" - }, - { - "id": "corner", - "fg": [ - "t_water_pool_corner_nw", - "t_water_pool_corner_sw", - "t_water_pool_corner_se", - "t_water_pool_corner_ne" - ] - }, - { - "id": "t_connection", - "fg": [ - "t_water_pool_t_connection_n", - "t_water_pool_t_connection_w", - "t_water_pool_t_connection_s", - "t_water_pool_t_connection_e" - ] - }, - { - "id": "edge", - "fg": [ - "t_water_pool_edge_ns", - "t_water_pool_edge_ew" - ] - }, - { - "id": "end_piece", - "fg": [ - "t_water_pool_end_piece_n", - "t_water_pool_end_piece_w", - "t_water_pool_end_piece_s", - "t_water_pool_end_piece_e" - ] - }, - { - "id": "unconnected", - "fg": [ - "t_water_pool_unconnected", - "t_water_pool_unconnected" - ] - } - ] -} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow.json index a2d0d0e01a..97746d5e7d 100644 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow.json +++ b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow.json @@ -1,11 +1,21 @@ { - "id": "t_water_pool_shallow", + "id": [ + "t_water_pool_shallow", + "t_water_pool_shallow_outdoors" + ], "fg": "t_water_pool_shallow_unconnected", "multitile": true, "additional_tiles": [ { "id": "center", - "fg": "t_water_pool_shallow_center" + "fg": [ + { "weight": 4, "sprite": "t_water_pool_shallow" }, + { "weight": 4, "sprite": "t_water_pool_shallow_0" }, + { "weight": 4, "sprite": "t_water_pool_shallow_1" }, + { "weight": 4, "sprite": "t_water_pool_shallow_2" }, + { "weight": 1, "sprite": "t_water_pool_shallow_3" }, + { "weight": 1, "sprite": "t_water_pool_shallow_4" } + ] }, { "id": "corner", @@ -25,13 +35,7 @@ "t_water_pool_shallow_t_connection_e" ] }, - { - "id": "edge", - "fg": [ - "t_water_pool_shallow_edge_ns", - "t_water_pool_shallow_edge_ew" - ] - }, + { "id": "edge", "fg": [ "t_water_pool_shallow_edge_ns", "t_water_pool_shallow_edge_ew" ] }, { "id": "end_piece", "fg": [ @@ -41,12 +45,6 @@ "t_water_pool_shallow_end_piece_e" ] }, - { - "id": "unconnected", - "fg": [ - "t_water_pool_shallow_unconnected", - "t_water_pool_shallow_unconnected" - ] - } + { "id": "unconnected", "fg": [ "t_water_pool_shallow_unconnected", "t_water_pool_shallow_unconnected" ] } ] } diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow.png new file mode 100644 index 0000000000..d8c2888b0f Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_0.png new file mode 100644 index 0000000000..1de2e8ad61 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_0.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_1.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_1.png new file mode 100644 index 0000000000..a775c68239 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_1.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_2.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_2.png new file mode 100644 index 0000000000..b559af0018 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_2.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_3.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_3.png new file mode 100644 index 0000000000..0dccaa1231 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_3.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_4.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_4.png new file mode 100644 index 0000000000..d1ffbc7f2d Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_4.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_center.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_center.png deleted file mode 100644 index b5da6ac4a5..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_center.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_ne.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_ne.png index 80b0b32746..345316ad28 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_ne.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_ne.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_nw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_nw.png index 4714ee4fa6..df75d1a423 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_nw.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_nw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_se.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_se.png index ca20ee60a3..ee44196213 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_se.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_se.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_sw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_sw.png index c0b11b2703..3862c56985 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_sw.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_corner_sw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_edge_ew.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_edge_ew.png index 50bb36a60c..67ebb48f2b 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_edge_ew.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_edge_ew.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_edge_ns.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_edge_ns.png index a7aba828ba..639c59c890 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_edge_ns.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_edge_ns.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_e.png index 9318f43e49..b58d87591b 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_e.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_n.png index 73f999f39c..abab2a914c 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_n.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_s.png index f94fbcdede..928dcff650 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_s.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_w.png index ebd8802818..f64d8e86ee 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_w.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_end_piece_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_outdoors.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_outdoors.json deleted file mode 100644 index 212e8b9bd9..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_outdoors.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "id": "t_water_pool_shallow_outdoors", - "fg": "t_water_pool_shallow_unconnected", - "multitile": true, - "additional_tiles": [ - { - "id": "center", - "fg": "t_water_pool_shallow_center" - }, - { - "id": "corner", - "fg": [ - "t_water_pool_shallow_corner_nw", - "t_water_pool_shallow_corner_sw", - "t_water_pool_shallow_corner_se", - "t_water_pool_shallow_corner_ne" - ] - }, - { - "id": "t_connection", - "fg": [ - "t_water_pool_shallow_t_connection_n", - "t_water_pool_shallow_t_connection_w", - "t_water_pool_shallow_t_connection_s", - "t_water_pool_shallow_t_connection_e" - ] - }, - { - "id": "edge", - "fg": [ - "t_water_pool_shallow_edge_ns", - "t_water_pool_shallow_edge_ew" - ] - }, - { - "id": "end_piece", - "fg": [ - "t_water_pool_shallow_end_piece_n", - "t_water_pool_shallow_end_piece_w", - "t_water_pool_shallow_end_piece_s", - "t_water_pool_shallow_end_piece_e" - ] - }, - { - "id": "unconnected", - "fg": [ - "t_water_pool_shallow_unconnected", - "t_water_pool_shallow_unconnected" - ] - } - ] -} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_e.png index 17dbdd440b..236f78a139 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_e.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_n.png index 6b0abd709c..739966f79c 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_n.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_s.png index 0c69361ea4..485db8ddc2 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_s.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_w.png index a691e46bf7..66b1d5e65c 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_w.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_t_connection_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_unconnected.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_unconnected.png index 751ddcb4fd..1e6ed7b1e4 100644 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_unconnected.png and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_shallow_unconnected.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_e.png deleted file mode 100644 index 71fadf6bf2..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_e.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_n.png deleted file mode 100644 index f09fdb72ba..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_n.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_s.png deleted file mode 100644 index 74a9db719d..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_s.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_w.png deleted file mode 100644 index 7129ad2c38..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_t_connection_w.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_unconnected.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_unconnected.png deleted file mode 100644 index ae37e452db..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_pool_shallow/t_water_pool_unconnected.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh.png deleted file mode 100644 index e55b126a8a..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh.json new file mode 100644 index 0000000000..5ba5841c20 --- /dev/null +++ b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh.json @@ -0,0 +1,150 @@ +[ + { + "id": "t_water_sh", + "fg": "t_water_sh_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_water_sh" }, + { "weight": 4, "sprite": "t_water_sh0" }, + { "weight": 4, "sprite": "t_water_sh1" }, + { "weight": 4, "sprite": "t_water_sh2" }, + { "weight": 1, "sprite": "t_water_sh3" }, + { "weight": 1, "sprite": "t_water_sh4" } + ], + "bg": [ "t_dirt" ] + }, + { + "id": "corner", + "fg": [ "t_water_sh_corner_nw", "t_water_sh_corner_sw", "t_water_sh_corner_se", "t_water_sh_corner_ne" ], + "bg": [ "t_dirt" ] + }, + { + "id": "t_connection", + "fg": [ "t_water_sh_t_connection_n", "t_water_sh_t_connection_w", "t_water_sh_t_connection_s", "t_water_sh_t_connection_e" ], + "bg": [ "t_dirt" ] + }, + { "id": "edge", "fg": [ "t_water_sh_edge_ns", "t_water_sh_edge_ew" ], "bg": [ "t_dirt" ] }, + { + "id": "end_piece", + "fg": [ "t_water_sh_end_piece_n", "t_water_sh_end_piece_w", "t_water_sh_end_piece_s", "t_water_sh_end_piece_e" ], + "bg": [ "t_dirt" ] + }, + { "id": "unconnected", "fg": [ "t_water_sh_unconnected", "t_water_sh_unconnected" ], "bg": [ "t_dirt" ] } + ] + }, + { + "id": "t_water_sh_season_winter", + "fg": "t_water_sh_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_water_sh" }, + { "weight": 4, "sprite": "t_water_sh0" }, + { "weight": 4, "sprite": "t_water_sh1" }, + { "weight": 4, "sprite": "t_water_sh2" }, + { "weight": 1, "sprite": "t_water_sh3" }, + { "weight": 1, "sprite": "t_water_sh4" } + ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "corner", + "fg": [ "t_water_sh_corner_nw", "t_water_sh_corner_sw", "t_water_sh_corner_se", "t_water_sh_corner_ne" ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "t_connection", + "fg": [ "t_water_sh_t_connection_n", "t_water_sh_t_connection_w", "t_water_sh_t_connection_s", "t_water_sh_t_connection_e" ], + "bg": [ "snow_shallow_center" ] + }, + { "id": "edge", "fg": [ "t_water_sh_edge_ns", "t_water_sh_edge_ew" ], "bg": [ "snow_shallow_center" ] }, + { + "id": "end_piece", + "fg": [ "t_water_sh_end_piece_n", "t_water_sh_end_piece_w", "t_water_sh_end_piece_s", "t_water_sh_end_piece_e" ], + "bg": [ "snow_shallow_center" ] + }, + { + "id": "unconnected", + "fg": [ "t_water_sh_unconnected", "t_water_sh_unconnected" ], + "bg": [ "snow_shallow_center" ] + } + ] + }, + { + "id": "t_water_sh_season_summer", + "fg": "t_water_sh_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_water_sh" }, + { "weight": 4, "sprite": "t_water_sh0" }, + { "weight": 4, "sprite": "t_water_sh1" }, + { "weight": 4, "sprite": "t_water_sh2" }, + { "weight": 1, "sprite": "t_water_sh3" }, + { "weight": 1, "sprite": "t_water_sh4" } + ], + "bg": [ "t_dirt_summer" ] + }, + { + "id": "corner", + "fg": [ "t_water_sh_corner_nw", "t_water_sh_corner_sw", "t_water_sh_corner_se", "t_water_sh_corner_ne" ], + "bg": [ "t_dirt_summer" ] + }, + { + "id": "t_connection", + "fg": [ "t_water_sh_t_connection_n", "t_water_sh_t_connection_w", "t_water_sh_t_connection_s", "t_water_sh_t_connection_e" ], + "bg": [ "t_dirt_summer" ] + }, + { "id": "edge", "fg": [ "t_water_sh_edge_ns", "t_water_sh_edge_ew" ], "bg": [ "t_dirt_summer" ] }, + { + "id": "end_piece", + "fg": [ "t_water_sh_end_piece_n", "t_water_sh_end_piece_w", "t_water_sh_end_piece_s", "t_water_sh_end_piece_e" ], + "bg": [ "t_dirt_summer" ] + }, + { "id": "unconnected", "fg": [ "t_water_sh_unconnected", "t_water_sh_unconnected" ], "bg": [ "t_dirt_summer" ] } + ] + }, + { + "id": "t_water_sh_season_autumn", + "fg": "t_water_sh_unconnected", + "multitile": true, + "additional_tiles": [ + { + "id": "center", + "fg": [ + { "weight": 4, "sprite": "t_water_sh" }, + { "weight": 4, "sprite": "t_water_sh0" }, + { "weight": 4, "sprite": "t_water_sh1" }, + { "weight": 4, "sprite": "t_water_sh2" }, + { "weight": 1, "sprite": "t_water_sh3" }, + { "weight": 1, "sprite": "t_water_sh4" } + ], + "bg": [ "t_dirt_autumn" ] + }, + { + "id": "corner", + "fg": [ "t_water_sh_corner_nw", "t_water_sh_corner_sw", "t_water_sh_corner_se", "t_water_sh_corner_ne" ], + "bg": [ "t_dirt_autumn" ] + }, + { + "id": "t_connection", + "fg": [ "t_water_sh_t_connection_n", "t_water_sh_t_connection_w", "t_water_sh_t_connection_s", "t_water_sh_t_connection_e" ], + "bg": [ "t_dirt_autumn" ] + }, + { "id": "edge", "fg": [ "t_water_sh_edge_ns", "t_water_sh_edge_ew" ], "bg": [ "t_dirt_autumn" ] }, + { + "id": "end_piece", + "fg": [ "t_water_sh_end_piece_n", "t_water_sh_end_piece_w", "t_water_sh_end_piece_s", "t_water_sh_end_piece_e" ], + "bg": [ "t_dirt_autumn" ] + }, + { "id": "unconnected", "fg": [ "t_water_sh_unconnected", "t_water_sh_unconnected" ], "bg": [ "t_dirt_autumn" ] } + ] + } +] diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh.png new file mode 100644 index 0000000000..fa07923b5c Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh0.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh0.png new file mode 100644 index 0000000000..158d2d7587 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh0.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh1.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh1.png new file mode 100644 index 0000000000..e247581e9b Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh1.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh2.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh2.png new file mode 100644 index 0000000000..516ead070b Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh2.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh3.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh3.png new file mode 100644 index 0000000000..efd4f720ff Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh3.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh4.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh4.png new file mode 100644 index 0000000000..bbdf5c29e1 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh4.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_ne.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_ne.png new file mode 100644 index 0000000000..e0e70ae854 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_ne.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_nw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_nw.png new file mode 100644 index 0000000000..6ed6e414f4 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_nw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_se.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_se.png new file mode 100644 index 0000000000..6033d0ea07 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_se.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_sw.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_sw.png new file mode 100644 index 0000000000..de1302ee2e Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_corner_sw.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_edge_ew.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_edge_ew.png new file mode 100644 index 0000000000..ad4ad7adfd Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_edge_ew.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_edge_ns.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_edge_ns.png new file mode 100644 index 0000000000..91ce459a5f Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_edge_ns.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_e.png new file mode 100644 index 0000000000..2b28055852 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_n.png new file mode 100644 index 0000000000..3063d217fc Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_s.png new file mode 100644 index 0000000000..baec81f558 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_w.png new file mode 100644 index 0000000000..3e3a2821e1 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_end_piece_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_e.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_e.png new file mode 100644 index 0000000000..f036e327a3 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_e.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_n.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_n.png new file mode 100644 index 0000000000..ec3812cb75 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_n.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_s.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_s.png new file mode 100644 index 0000000000..35ab4882a7 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_s.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_w.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_w.png new file mode 100644 index 0000000000..3114539744 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_t_connection_w.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_unconnected.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_unconnected.png new file mode 100644 index 0000000000..7bb74be938 Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh/t_water_sh_unconnected.png differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_0.json deleted file mode 100644 index 84175fea19..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_0.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": ["t_water_sh", "t_swater_sh"], - "fg": [ - "t_water_sh" - ], - "bg": [ - "t_dirt" - ], - "rotates": false, - "multitile": true, - "additional_tiles": [ - { "id": "corner", "fg": [ "t_water_sh_2" ], "bg": [ "t_dirt" ] }, - { "id": "edge", "fg": [ "t_water_sh_3" ], "bg": [ "t_dirt" ] }, - { "id": "end_piece", "fg": [ "t_water_sh_4" ], "bg": [ "t_dirt" ] }, - { "id": "center", "fg": [ "t_water_sh" ], "bg": [ "t_dirt" ] }, - { "id": "t_connection", "fg": [ "t_water_sh" ], "bg": [ "t_dirt" ] }, - { "id": "unconnected", "fg": [ "t_water_sh_6" ], "bg": [ "t_dirt" ] } - ] -} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_2.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_2.png deleted file mode 100644 index 8a03075cf2..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_2.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_2.xcf b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_2.xcf deleted file mode 100644 index cd451f667d..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_2.xcf and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_3.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_3.png deleted file mode 100644 index e6d473592b..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_3.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_3.xcf b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_3.xcf deleted file mode 100644 index 1e50833996..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_3.xcf and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_4.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_4.png deleted file mode 100644 index 6fe10dd315..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_4.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_4.xcf b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_4.xcf deleted file mode 100644 index f43d48aaf6..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_4.xcf and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_6.png b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_6.png deleted file mode 100644 index ce77016422..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_6.png and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_6.xcf b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_6.xcf deleted file mode 100644 index 78779f548a..0000000000 Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_6.xcf and /dev/null differ diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_season_autumn.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_season_autumn.json deleted file mode 100644 index f0a0084d0e..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_season_autumn.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": ["t_water_sh_season_autumn","t_swater_sh_season_autumn"], - "fg": [ - "t_water_sh" - ], - "bg": [ - "t_dirt_autumn" - ], - "rotates": false, - "multitile": true, - "additional_tiles": [ - { "id": "corner", "fg": [ "t_water_sh_2" ], "bg": [ "t_dirt_autumn" ] }, - { "id": "edge", "fg": [ "t_water_sh_3" ], "bg": [ "t_dirt_autumn" ] }, - { "id": "end_piece", "fg": [ "t_water_sh_4" ], "bg": [ "t_dirt_autumn" ] }, - { "id": "center", "fg": [ "t_water_sh" ], "bg": [ "t_dirt_autumn" ] }, - { "id": "t_connection", "fg": [ "t_water_sh" ], "bg": [ "t_dirt_autumn" ] }, - { "id": "unconnected", "fg": [ "t_water_sh_6" ], "bg": [ "t_dirt_autumn" ] } - ] -} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_season_summer.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_season_summer.json deleted file mode 100644 index cb6ec88464..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_season_summer.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": ["t_water_sh_season_summer","t_swater_sh_season_summer"], - "fg": [ - "t_water_sh" - ], - "bg": [ - "t_dirt_summer" - ], - "rotates": false, - "multitile": true, - "additional_tiles": [ - { "id": "corner", "fg": [ "t_water_sh_2" ], "bg": [ "t_dirt_summer" ] }, - { "id": "edge", "fg": [ "t_water_sh_3" ], "bg": [ "t_dirt_summer" ] }, - { "id": "end_piece", "fg": [ "t_water_sh_4" ], "bg": [ "t_dirt_summer" ] }, - { "id": "center", "fg": [ "t_water_sh" ], "bg": [ "t_dirt_summer" ] }, - { "id": "t_connection", "fg": [ "t_water_sh" ], "bg": [ "t_dirt_summer" ] }, - { "id": "unconnected", "fg": [ "t_water_sh_6" ], "bg": [ "t_dirt_summer" ] } - ] -} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_season_winter.json b/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_season_winter.json deleted file mode 100644 index c79aa721ab..0000000000 --- a/gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_water_sh_season_winter.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": ["t_water_sh_season_winter","t_swater_sh_season_winter"], - "fg": [ - "t_water_sh" - ], - "bg": [ - "snow_shallow_center" - ], - "rotates": false, - "multitile": true, - "additional_tiles": [ - { "id": "corner", "fg": [ "t_water_sh_2" ], "bg": [ "snow_shallow_center" ] }, - { "id": "edge", "fg": [ "t_water_sh_3" ], "bg": [ "snow_shallow_center" ] }, - { "id": "end_piece", "fg": [ "t_water_sh_4" ], "bg": ["snow_shallow_center" ] }, - { "id": "center", "fg": [ "t_water_sh" ], "bg": [ "snow_shallow_center" ] }, - { "id": "t_connection", "fg": [ "t_water_sh" ], "bg": [ "snow_shallow_center" ] }, - { "id": "unconnected", "fg": [ "t_water_sh_6" ], "bg": [ "snow_shallow_center" ] } - ] -}