Skip to content

Commit

Permalink
More MSX and other fillers, winter fixes (#333)
Browse files Browse the repository at this point in the history
* MSX fillers: handle, broken vp, chimes, robot controls, manhole, roller drum, corpse filled pit, sandbag wall, stone slab

* internal door id fix

* bathroom scale filler

* bleeding effect icon moved to the right

* various snow cover changes

* seasonal downspout

* undebrush winter duplicate

* veh_table_wood filler

* vp_workbench 32px downsize filler
  • Loading branch information
int-ua authored Dec 10, 2020
1 parent 4cbbd5a commit 03b3d1a
Show file tree
Hide file tree
Showing 76 changed files with 98 additions and 15 deletions.
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.
Binary file modified gfx/MShockXotto+/pngs_tiles_32x32/terrain/snow/snow_deep.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 modified gfx/MShockXotto+/pngs_tiles_32x32/terrain/t_dirt/t_dirt_winter.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.
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.
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
{"id": "vp_frame_handle", "fg": ["4023_vp_frame_handle_0"], "rotates": true, "multitile": true, "additional_tiles": [{"id": "broken", "fg": ["3987_vp_cargo_space_2"], "bg": ["4023_vp_frame_handle_0"]}], "bg": []}
{
"id": "vp_frame_handle",
"fg": [
"4023_vp_frame_handle_0"
],
"rotates": true,
"multitile": true,
"additional_tiles": [
{
"id": "broken",
"fg": [
"3987_vp_cargo_space_2"
],
"bg": [
"4023_vp_frame_handle_0"
]
}
],
"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.
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id": "f_sandbag_wall", "fg": ["1561_f_sandbag_wall_0"], "rotates": true, "multitile": true, "additional_tiles": [{"id": "unconnected", "fg": ["1561_f_sandbag_wall_0"], "bg": []}, {"id": "center", "fg": ["1567_f_sandbag_wall_1"], "bg": []}, {"id": "corner", "fg": ["1568_f_sandbag_wall_2"], "bg": []}, {"id": "edge", "fg": ["1569_f_sandbag_wall_3"], "bg": []}, {"id": "end_piece", "fg": ["1570_f_sandbag_wall_4"], "bg": []}, {"id": "t_connection", "fg": ["1571_f_sandbag_wall_5"], "bg": []}], "bg": []}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id": "f_slab", "fg": ["1576_f_slab_0"], "bg": []}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id": "vp_chime", "fg": ["1707_vp_chime_0"], "rotates": true, "bg": []}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id": "vp_chimes", "fg": ["1707_vp_chime_0"], "rotates": true, "bg": []}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id": "vp_robot_controls", "fg": ["4131_vp_robot_controls_0"], "rotates": false, "bg": []}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id": "t_manhole", "fg": ["3116_t_manhole_0"], "bg": ["t_pavement"], "rotates": false}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"id": "t_manhole_cover",
"fg": "3117_t_manhole_cover_0",
"bg": "t_pavement"
},
{
"id": "manhole_cover",
"fg": "3117_t_manhole_cover_0",
"bg": []
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id": "t_pit_corpsed", "fg": "t_pit_corpsed", "bg": "t_dirt"}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"id": "vp_frame_handle",
"fg": [
"4023_vp_frame_handle_0"
],
"rotates": true,
"multitile": true,
"additional_tiles": [
{
"id": "broken",
"fg": [
"3987_vp_cargo_space_2"
],
"bg": [
"4023_vp_frame_handle_0"
]
}
],
"bg": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id": "vp_roller_drum", "fg": ["4132_vp_roller_drum_0"], "rotates": true, "multitile": true, "additional_tiles": [{"id": "broken", "fg": ["3987_vp_cargo_space_2"], "bg": ["4132_vp_roller_drum_0"]}], "bg": []}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "bathroom_scale",
"fg": "bathroom_scale",
"bg": []
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
[
{
"id": "t_zebra",
"fg": ["t_zebra"],
"fg": "t_zebra",
"bg": []
}
},
{
"id": "t_zebra_season_winter",
"fg": "snow_shallow_center",
"bg": []
}
]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"id": [ "vp_door_interior" ],
"id": [ "vp_door_internal" ],
"fg": [ "vp_door_interior_rotN", "vp_door_interior_rotW", "vp_door_interior_rotS", "vp_door_interior_rotE" ],
"bg": [ ],
"rotates": true,
Expand All @@ -19,7 +19,7 @@
]
},
{
"id": [ "vp_door", "vp_door_inboard" ],
"id": [ "vp_door", "vp_door_inboard", "vp_door_sliding" ],
"fg": "vp_door_inboard",
"bg": [ ],
"rotates": true,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"id": "vp_veh_table",
"id": ["vp_veh_table", "vp_veh_table_wood"],
"fg": [ "veh_table", "veh_table" ],
"bg": [ "vp_wooden_aisle_vertical", "vp_wooden_aisle_horizontal" ],
"additional_tiles": [ { "id": "broken", "fg": "veh_table_broken", "bg": [ "vp_wooden_aisle_vertical", "vp_wooden_aisle_horizontal" ] } ],
Expand All @@ -9,7 +9,7 @@
},
{
"id": "vp_workbench",
"fg": "f_workbench",
"fg": "vp_workbench",
"bg": "t_metal_floor_unconnected"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,5 @@
"id": "t_underbrush_season_winter",
"fg": [ "t_underbrush" ],
"bg": [ "snow_deep" ]
},
{
"id": "t_underbrush_harvested_winter",
"fg": [ "t_underbrush_harvested" ],
"bg": [ "snow_deep" ]
}
]
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
[
{
"id": "t_gutter_downspout",
"fg": ["t_gutter_downspout"],
"bg": []
}
"fg": "t_gutter_downspout",
"bg": "t_dirt_tall"
},
{
"id": "t_gutter_downspout_season_autumn",
"fg": "t_gutter_downspout",
"bg": "t_dirt_autumn_tall"
},
{
"id": "t_gutter_downspout_season_summer",
"fg": "t_gutter_downspout",
"bg": "t_dirt_summer_tall"
},
{
"id": "t_gutter_downspout_season_winter",
"fg": "t_gutter_downspout",
"bg": "snow_shallow_tall"
}
]

0 comments on commit 03b3d1a

Please sign in to comment.