Skip to content

Commit

Permalink
[MSX] Redo some floors and add solid earth (#774)
Browse files Browse the repository at this point in the history
* Mak wood floor less noisy

* Redo dirtfloor

* Add t_soil

* soil variant without bones is more common
  • Loading branch information
Fris0uman authored Aug 1, 2021
1 parent 7fc2c19 commit c167ce5
Show file tree
Hide file tree
Showing 40 changed files with 70 additions and 4 deletions.
Binary file added gfx/MShockXotto+/autotiles/t_soil_autotile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gfx/MShockXotto+/autotiles/t_soil_autotile.xcf
Binary file not shown.
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.
Binary file modified gfx/MShockXotto+/pngs_tiles_32x32/terrain/987_t_door_frame_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id": "t_brick_wall_halfway", "fg": ["2977_t_brick_wall_halfway_0"], "bg": ["986_t_brick_wall_1"]}
{"id": "t_brick_wall_halfway", "fg": ["2977_t_brick_wall_halfway_0"], "bg": ["t_dirtfloor"]}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id": "t_brick_wall_line", "fg": ["2972_t_brick_wall_0"], "bg": ["986_t_brick_wall_1"], "multitile": true, "additional_tiles": [{"id": "unconnected", "fg": ["2972_t_brick_wall_0"], "bg": []}, {"id": "center", "fg": ["2973_t_brick_wall_2"], "bg": []}, {"id": "corner", "fg": ["2974_t_brick_wall_3"], "bg": []}, {"id": "edge", "fg": ["2975_t_brick_wall_4"], "bg": []}, {"id": "end_piece", "fg": ["2976_t_brick_wall_5"], "bg": []}, {"id": "t_connection", "fg": ["2978_t_brick_wall_6"], "bg": []}]}
{"id": "t_brick_wall_line", "fg": ["2972_t_brick_wall_0"], "bg": ["t_dirtfloor"], "multitile": true, "additional_tiles": [{"id": "unconnected", "fg": ["2972_t_brick_wall_0"], "bg": []}, {"id": "center", "fg": ["2973_t_brick_wall_2"], "bg": []}, {"id": "corner", "fg": ["2974_t_brick_wall_3"], "bg": []}, {"id": "edge", "fg": ["2975_t_brick_wall_4"], "bg": []}, {"id": "end_piece", "fg": ["2976_t_brick_wall_5"], "bg": []}, {"id": "t_connection", "fg": ["2978_t_brick_wall_6"], "bg": []}]}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id": ["t_brick_wall", "t_secretdoor_brick_wall_c", "t_sliding_brick_wall_c"], "fg": ["2972_t_brick_wall_0"], "bg": ["986_t_brick_wall_1"], "multitile": true, "additional_tiles": [{"id": "unconnected", "fg": ["2972_t_brick_wall_0"], "bg": []}, {"id": "center", "fg": ["2973_t_brick_wall_2"], "bg": []}, {"id": "corner", "fg": ["2974_t_brick_wall_3"], "bg": []}, {"id": "edge", "fg": ["2975_t_brick_wall_4"], "bg": []}, {"id": "end_piece", "fg": ["2976_t_brick_wall_5"], "bg": []}, {"id": "t_connection", "fg": ["2978_t_brick_wall_6"], "bg": []}]}
{"id": ["t_brick_wall", "t_secretdoor_brick_wall_c", "t_sliding_brick_wall_c"], "fg": ["2972_t_brick_wall_0"], "bg": ["t_dirtfloor"], "multitile": true, "additional_tiles": [{"id": "unconnected", "fg": ["2972_t_brick_wall_0"], "bg": []}, {"id": "center", "fg": ["2973_t_brick_wall_2"], "bg": []}, {"id": "corner", "fg": ["2974_t_brick_wall_3"], "bg": []}, {"id": "edge", "fg": ["2975_t_brick_wall_4"], "bg": []}, {"id": "end_piece", "fg": ["2976_t_brick_wall_5"], "bg": []}, {"id": "t_connection", "fg": ["2978_t_brick_wall_6"], "bg": []}]}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"id": "t_dirtfloor",
"fg": [
{ "weight": 1, "sprite": "t_dirtfloor" },
{ "weight": 1, "sprite": "t_dirtfloor_2" },
{ "weight": 1, "sprite": "t_dirtfloor_3" }
],
"rotates": false,
"bg": [

]
}
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.

This file was deleted.

Binary file modified gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_floor_olight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_soil/t_soil.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"id": "t_soil",
"fg": "t_soil_unconnected",
"multitile": true,
"additional_tiles": [
{ "id": "center", "fg": "t_soil_center" },
{
"id": "corner",
"fg": [
{ "weight": 2, "sprite": [ "t_soil_corner_nw", "t_soil_corner_sw", "t_soil_corner_se", "t_soil_corner_ne" ] },
{ "weight": 1, "sprite": [ "t_soil_corner_nw", "t_soil_corner_sw2", "t_soil_corner_se", "t_soil_corner_ne" ] },
{ "weight": 1, "sprite": [ "t_soil_corner_nw", "t_soil_corner_sw", "t_soil_corner_se2", "t_soil_corner_ne" ] }
]
},
{
"id": "t_connection",
"fg": [
{
"weight": 2,
"sprite": [ "t_soil_t_connection_n", "t_soil_t_connection_w", "t_soil_t_connection_s", "t_soil_t_connection_e" ]
},
{
"weight": 1,
"sprite": [ "t_soil_t_connection_n", "t_soil_t_connection_w", "t_soil_t_connection_s2", "t_soil_t_connection_e" ]
}
]
},
{
"id": "edge",
"fg": [
{ "weight": 2, "sprite": [ "t_soil_edge_ns", "t_soil_edge_ew" ] },
{ "weight": 1, "sprite": [ "t_soil_edge_ns", "t_soil_edge_ew2" ] }
]
},
{
"id": "end_piece",
"fg": [
{ "weight": 2, "sprite": [ "t_soil_end_piece_n", "t_soil_end_piece_w", "t_soil_end_piece_s", "t_soil_end_piece_e" ] },
{
"weight": 1,
"sprite": [ "t_soil_end_piece_n", "t_soil_end_piece_w2", "t_soil_end_piece_s", "t_soil_end_piece_e" ]
},
{
"weight": 1,
"sprite": [ "t_soil_end_piece_n", "t_soil_end_piece_w", "t_soil_end_piece_s2", "t_soil_end_piece_e" ]
},
{
"weight": 1,
"sprite": [ "t_soil_end_piece_n", "t_soil_end_piece_w", "t_soil_end_piece_s", "t_soil_end_piece_e2" ]
}
]
},
{ "id": "unconnected", "fg": [ "t_soil_unconnected", "t_soil_unconnected" ] }
]
}
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.

0 comments on commit c167ce5

Please sign in to comment.