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

[WIP] Option to use Grass Sheets for Door Curtains #55792

Merged
merged 2 commits into from
Mar 4, 2022
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
19 changes: 19 additions & 0 deletions data/json/construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,25 @@
"pre_special": "check_empty",
"post_terrain": "t_door_curtain_c"
},
{
"type": "construction",
"id": "constr_door_grass_curtain",
"group": "build_door_grass_curtain",
"//": "Door frame not required",
"category": "CONSTRUCT",
"required_skills": [ [ "tailor", 1 ] ],
"time": "30 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
"components": [
[ [ "nail", 4 ], [ "pointy_stick", 2 ], [ "spike", 2 ] ],
[ [ "grass_sheet", 2 ] ],
[ [ "stick", 1 ] ],
[ [ "string_36", 1 ], [ "cordage_36", 1 ], [ "string_6", 6 ], [ "cordage_6", 6 ] ]
],
"pre_note": "Can be deconstructed without tools.",
"pre_special": "check_empty",
"post_terrain": "t_door_grass_curtain_c"
},
{
"type": "construction",
"id": "constr_beaded_door",
Expand Down
5 changes: 5 additions & 0 deletions data/json/construction_group.json
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,11 @@
"id": "build_door_curtain",
"name": "Build Door Curtain"
},
{
"type": "construction_group",
"id": "build_door_grass_curtain",
"name": "Build Door Curtain from Grass"
},
{
"type": "construction_group",
"id": "build_double_glazed_glass_window",
Expand Down
65 changes: 65 additions & 0 deletions data/json/furniture_and_terrain/terrain-doors.json
Original file line number Diff line number Diff line change
Expand Up @@ -1706,6 +1706,71 @@
]
}
},
{
"type": "terrain",
"id": "t_door_grass_curtain_c",
"name": "closed grass curtain",
"description": "Grass yarn sheets acting as a door. Could be easily taken down for supplies or placed somewhere else.",
"symbol": "+",
"looks_like": "t_door_curtain_c",
"color": "dark_gray",
"move_cost": 0,
"coverage": 95,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "DOOR", "NOITEM", "CONNECT_TO_WALL", "EASY_DECONSTRUCT" ],
"open": "t_door_grass_curtain_o",
"deconstruct": {
"ter_set": "t_dirt",
"items": [ { "item": "stick", "count": 1 }, { "item": "grass_sheet", "count": 2 }, { "item": "cordage_6", "count": 6 } ]
},
"bash": {
"str_min": 1,
"str_max": 4,
"sound": "rrrrip!",
"sound_fail": "slap!",
"sound_vol": 6,
"sound_fail_vol": 3,
"ter_set": "t_dirt",
"items": [
{ "item": "grass_sheet", "count": [ 0, 1 ] },
{ "item": "grass_yarn", "count": [ 2, 5 ] },
{ "item": "stick", "count": 1 },
{ "item": "cordage_6", "count": [ 2, 5 ] }
]
}
},
{
"type": "terrain",
"id": "t_door_grass_curtain_o",
"name": "open grass curtain",
"description": "Grass yarn sheets acting as a door. Could be easily taken down for supplies or placed somewhere else. These curtains are open, bundled and tied next to the doorway.",
"symbol": "'",
"looks_like": "t_door_curtain_o",
"color": "dark_gray",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "EASY_DECONSTRUCT" ],
"deconstruct": {
"ter_set": "t_dirt",
"items": [ { "item": "stick", "count": 1 }, { "item": "grass_sheet", "count": 2 }, { "item": "cordage_6", "count": 6 } ]
},
"close": "t_door_grass_curtain_c",
"bash": {
"str_min": 1,
"str_max": 4,
"sound": "rrrrip!",
"sound_fail": "slap!",
"sound_vol": 5,
"sound_fail_vol": 2,
"ter_set": "t_dirt",
"items": [
{ "item": "grass_sheet", "count": [ 0, 1 ] },
{ "item": "grass_yarn", "count": [ 2, 5 ] },
{ "item": "stick", "count": 1 },
{ "item": "cordage_6", "count": [ 2, 5 ] }
]
}
},
{
"type": "terrain",
"id": "t_door_makeshift_o",
Expand Down
16 changes: 14 additions & 2 deletions data/json/portal_storm_effect_on_condition.json
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,13 @@
{
"result": [ "t_door_curtain_o" ],
"valid_terrain": [ "t_door_curtain_c" ],
"message": " A door flies open!",
"message": " A curtain flies open!",
"message_good": false
},
{
"result": [ "t_door_grass_curtain_o" ],
"valid_terrain": [ "t_door_grass_curtain_c" ],
"message": " A curtain flies open!",
"message_good": false
},
{
Expand Down Expand Up @@ -906,7 +912,13 @@
{
"result": [ "t_door_curtain_c" ],
"valid_terrain": [ "t_door_curtain_o" ],
"message": " A door slams shut!",
"message": " A curtain suddenly shuts!",
"message_good": false
},
{
"result": [ "t_door_grass_curtain_c" ],
"valid_terrain": [ "t_door_grass_curtain_o" ],
"message": " A curtain suddenly shuts!",
"message_good": false
},
{
Expand Down