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.

Sign up for GitHub

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

Jump to bottom

Adds junk barrier -> junk wall #27036

Merged
merged 13 commits into from Dec 20, 2018
Merged

Adds junk barrier -> junk wall #27036

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
990793a
Adds junk barrier -> junk wall
I-am-Erk Dec 10, 2018
e8dd89a
Add an alternative recipe using welder
I-am-Erk Dec 10, 2018
d682a93
Lint terrain and construction files
I-am-Erk Dec 10, 2018
46a6843
Unlint construction.json
I-am-Erk Dec 10, 2018
f80c0ee
Add junk floors
I-am-Erk Dec 10, 2018
95ad279
Fix minor errors
I-am-Erk Dec 10, 2018
b0a5e00
Apply suggestions from code review
kevingranade Dec 14, 2018
02a7094
Update data/json/terrain.json
Night-Pryanik Dec 19, 2018
0ae520a
Update data/json/terrain.json
Night-Pryanik Dec 19, 2018
860e902
Update data/json/terrain.json
Night-Pryanik Dec 19, 2018
bfc1ff5
Remove a merge artifact.
kevingranade Dec 20, 2018
69bce7c
Use welding standard
kevingranade Dec 20, 2018
d49bcea
Whoopsie
kevingranade Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
107 changes: 106 additions & 1 deletion data/json/construction.json
View file
Open in desktop
Expand Up @@ -2391,6 +2391,15 @@
"pre_note" : "Firewood or other flammable materials on a nearby tile marked in this way may be used to automatically refuel fires. This will be done to maintain light during long-running tasks that require it such as crafting or reading, but not (for example) if you are simply waiting nearby.",
"pre_special" : "check_no_trap",
"post_special" : "done_mark_firewood"
},{
"type" : "construction",
"description" : "Mark practice target",
"category" : "OTHER",
"required_skills" : [],
"time" : 0,
"pre_note" : "Mark a spot for target practice. Firing will automatically target the first practice target location found in gun range, if no enemies are around.",
"pre_special" : "check_no_trap",
"post_special" : "done_mark_practice_target"
},{
"type" : "construction",
"description" : "Build Butchering Rack",
Expand All @@ -2409,5 +2418,101 @@
"pre_note" : "Can be deconstructed without tools.",
"pre_special" : "check_empty",
"post_terrain" : "f_butcher_rack"
}
},
{
"type": "construction",
"description": "Build Junk Metal Barrier",
"category": "CONSTRUCT",
"required_skills": [ [ "fabrication", 4 ] ],
"time": 120,
"qualities": [
[ { "id": "DIG", "level": 1 } ],
[ { "id": "HAMMER", "level": 1 } ],
[ { "id": "WRENCH", "level": 2 } ],
[ { "id": "DRILL", "level": 1 } ]
],
"components": [
[ [ "pipe", 6 ], [ "frame", 1 ], [ "xlframe", 1 ] ],
[ [ "wire", 8 ], [ "spike", 8 ], [ "nail", 16 ] ],
[ [ "scrap", 40 ], [ "sheet_metal", 1 ], [ "sheet_metal_small", 20 ] ]
],
"pre_terrain": "t_pit",
"post_terrain": "t_junk_palisade"
},
{
"type": "construction",
"description": "Reinforce Junk Metal Wall using bolts",
"category": "CONSTRUCT",
"required_skills": [ [ "fabrication", 4 ] ],
"time": 120,
"qualities": [
[ { "id": "SAW_M", "level": 1 } ],
[ { "id": "HAMMER", "level": 1 } ],
[ { "id": "WRENCH", "level": 2 } ],
[ { "id": "DRILL", "level": 1 } ]
],
"components": [
[ [ "wire", 16 ], [ "spike", 16 ], [ "nail", 32 ] ],
[ [ "sheet_metal_small", 20 ], [ "scrap", 40 ] ],
[
[ "sheet_metal", 4 ],
[ "steel_plate", 2 ],
[ "frame", 2 ],
[ "hdframe", 1 ],
[ "xlframe", 4 ],
[ "pipe", 12 ]
]
],
"pre_terrain": "t_junk_palisade",
"post_terrain": "t_junk_wall"
},
{
"type": "construction",
"description": "Reinforce Junk Metal Wall using spot-welds",
"category": "CONSTRUCT",
"required_skills": [ [ "fabrication", 4 ] ],
"time": 90,
"qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "GLARE", "level": 2 } ] ],
"tools": [ [ [ "oxy_torch", 4 ], [ "welder", 20 ], [ "welder_crude", 30 ], [ "toolset", 30 ] ] ],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can replace this with welding_standard requirement.

"components": [
[ [ "sheet_metal_small", 15 ], [ "scrap", 30 ] ],
[
[ "sheet_metal", 4 ],
[ "steel_plate", 2 ],
[ "frame", 2 ],
[ "hdframe", 1 ],
[ "xlframe", 4 ],
[ "pipe", 12 ]
]
],
"pre_terrain": "t_junk_palisade",
"post_terrain": "t_junk_wall"
},
{
"type": "construction",
"description": "Build Junk Metal Floor",
"category": "CONSTRUCT",
"required_skills": [ [ "fabrication", 4 ] ],
"time": 120,
"qualities": [
[ { "id": "SAW_M", "level": 1 } ],
[ { "id": "HAMMER", "level": 1 } ],
[ { "id": "WRENCH", "level": 2 } ],
[ { "id": "DRILL", "level": 1 } ]
],
"components": [
[ [ "wire", 16 ], [ "spike", 16 ], [ "nail", 32 ] ],
[ [ "sheet_metal_small", 20 ], [ "scrap", 40 ] ],
[
[ "sheet_metal", 4 ],
[ "steel_plate", 2 ],
[ "frame", 2 ],
[ "hdframe", 1 ],
[ "xlframe", 4 ],
[ "pipe", 12 ]
]
],
"pre_special" : "check_empty",
"post_terrain": "t_junk_floor"
}
]
64 changes: 64 additions & 0 deletions data/json/terrain.json
View file
Open in desktop
Expand Up @@ -7923,5 +7923,69 @@
"ter_set": "t_pit_shallow",
"items": [ { "item": "rock", "count": 8 }, { "item": "stick", "count": [ 8, 12 ] } ]
}
},
{
"type": "terrain",
"id": "t_junk_palisade",
"name": "junk metal barrier",
"looks_like": "t_scrap_wall_halfway",
I-am-Erk marked this conversation as resolved.
Show resolved Hide resolved
"description": "A simple wall of rusty scrap metal bolted and wire-tied to a makeshift frame. Very fashionable in post-apocalyptic shantytowns. This one isn't quite strong enough to support a roof, but could be reinforced.",
I-am-Erk marked this conversation as resolved.
Show resolved Hide resolved
"symbol": "LINE_OXOX",
"color": "dark_gray",
"move_cost": 0,
"flags": [ "NOITEM", "WALL", "AUTO_WALL_SYMBOL", "MINEABLE" ],
"connects_to": "WALL",
"bash": {
"str_min": 30,
"str_max": 200,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_pit_shallow",
"items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 1, 40 ] } ]
}
},
{
"type": "terrain",
"id": "t_junk_wall",
"name": "junk metal wall",
"looks_like": "t_scrap_wall",
I-am-Erk marked this conversation as resolved.
Show resolved Hide resolved
"description": "A wall of rusty scrap metal bolted and wire-tied to a sturdy frame. Very fashionable in post-apocalyptic shantytowns. Can support a roof.",
I-am-Erk marked this conversation as resolved.
Show resolved Hide resolved
"symbol": "LINE_OXOX",
"color": "dark_gray",
"move_cost": 0,
"flags": [ "NOITEM", "WALL", "SUPPORTS_ROOF", "AUTO_WALL_SYMBOL", "MINEABLE" ],
"connects_to": "WALL",
"bash": {
"str_min": 60,
"str_max": 200,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_pit_shallow",
"items": [
{ "item": "pipe", "count": [ 1, 6 ] },
{ "item": "scrap", "count": [ 1, 40 ] },
{ "item": "sheet_metal", "count": [ 1, 2 ] },
{ "item": "steel_chunk", "count": [ 1, 30 ] }
]
}
},
{
"type": "terrain",
"id": "t_junk_floor",
"name": "junk metal floor",
"looks_like": "t_scrap_floor",
I-am-Erk marked this conversation as resolved.
Show resolved Hide resolved
"description": "A simple roof and floor of rusty scrap metal bolted and wire-tied to a makeshift frame. Very fashionable in post-apocalyptic shantytowns. Hope you like the sound of rain on corrugated metal.",
I-am-Erk marked this conversation as resolved.
Show resolved Hide resolved
"symbol": "LINE_OXOX",
"color": "dark_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ],
"bash": {
"str_min": 30,
"str_max": 200,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_dirt",
"items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 1, 40 ] } ]
}
}
]