Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MSX] Water rework #2509

Merged
merged 7 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified gfx/MShockXotto+/autotiles/t_water_hot_autotile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
151 changes: 151 additions & 0 deletions gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_dp/t_swater_dp.json
Original file line number Diff line number Diff line change
@@ -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" ] }
]
}
]

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
151 changes: 151 additions & 0 deletions gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_swater_sh/t_swater_sh.json
Original file line number Diff line number Diff line change
@@ -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" ] }
]
}
]

Loading
Loading