Skip to content

Commit

Permalink
[Innawood] More items repairable (#54278)
Browse files Browse the repository at this point in the history
* Safety Glasses are made out of glass

* Add x-acto knife recipe
Recipe copied from the paring knife. I figure these are similar enough
that this makes sense.

* [Innawood] Make safety glasses weaker
Also update description.

* Add blacksmith repair kit
Powered by charcoal, acts like a makeshift arc welder to repair
metal items.

* Update data/mods/innawood/items/tool_workshop.json

* json style

* Change blacksmith repair kit qualities
Metal fileset gives filing 2, grinding 2, not chiseling 2 and wood
chiseling 2.

* json spacing fix (fingers crossed)

Co-authored-by: Kevin Granade <kevin.granade@gmail.com>
  • Loading branch information
juliavetter and kevingranade authored Jan 12, 2022
1 parent 78cf21e commit 600018f
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 0 deletions.
22 changes: 22 additions & 0 deletions data/mods/innawood/items/armor_eyewear.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"id": "glasses_safety",
"type": "ARMOR",
"name": { "str": "pair of safety glasses", "str_pl": "pairs of safety glasses" },
"description": "A pair of glasses, used in workshops, sports, chemistry labs, and many other places.",
"weight": "60 g",
"volume": "250 ml",
"price": 1000,
"price_postapoc": 250,
"to_hit": -2,
"material": [ "glass" ],
"symbol": "[",
"looks_like": "glasses_eye",
"color": "light_gray",
"warmth": 5,
"material_thickness": 1,
"environmental_protection": 1,
"flags": [ "WATER_FRIENDLY", "OUTER", "FRAGILE" ],
"armor": [ { "encumbrance": 5, "coverage": 95, "covers": [ "eyes" ] } ]
}
]
43 changes: 43 additions & 0 deletions data/mods/innawood/items/tool_workshop.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
[
{
"id": "blacksmith_kit",
"type": "TOOL",
"name": { "str": "blacksmith repair kit" },
"description": "This is a set of tools to repair damaged metal tools and armor. It uses charcoal, contained in a small clay vessel, to heat the part and make it easier to work.",
"weight": "1600 g",
"volume": "1400 ml",
"longest_side": "25 cm",
"price": 5000,
"price_postapoc": 1000,
"to_hit": -2,
"bashing": 9,
"material": [ "steel", "clay" ],
"symbol": ";",
"color": "dark_gray",
"ammo": [ "charcoal" ],
"charges_per_use": 5,
"qualities": [
[ "HAMMER_FINE", 1 ],
[ "HAMMER", 3 ],
[ "PRY", 1 ],
[ "COOK", 1 ],
[ "GRIND", 2 ],
[ "FILE", 2 ],
[ "PRYING_NAIL", 1 ]
],
"use_action": [
[ "CROWBAR", 0 ],
{
"type": "repair_item",
"item_action_type": "repair_metal",
"materials": [ "iron", "steel", "hardsteel", "aluminum", "copper", "bronze", "silver", "gold", "platinum", "superalloy" ],
"skill": "fabrication",
"tool_quality": 5,
"cost_scaling": 0.1,
"move_cost": 2000
}
],
"flags": [ "ALLOWS_REMOTE_USE" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "charcoal": 100 } } ]
}
]
39 changes: 39 additions & 0 deletions data/mods/innawood/recipes/tools_hand.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,44 @@
"qualities": [ { "id": "CHISEL", "level": 3 }, { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
"tools": [ [ [ "forge", 20 ], [ "oxy_torch", 20 ], [ "fake_arc_furnace", 10 ] ], [ [ "metalworking_tongs", -1 ] ] ],
"components": [ [ [ "scrap", 2 ], [ "steel_lump", 1 ] ] ]
},
{
"type": "recipe",
"result": "xacto",
"activity_level": "MODERATE_EXERCISE",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "fabrication",
"difficulty": 3,
"time": "3 h",
"autolearn": true,
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_bladesmith" }
],
"using": [ [ "blacksmithing_standard", 1 ] ],
"qualities": [ { "id": "GRIND", "level": 2 } ],
"tools": [ [ [ "hotcut", -1 ] ] ],
"components": [ [ [ "scrap", 2 ] ] ]
},
{
"type": "recipe",
"result": "blacksmith_kit",
"activity_level": "MODERATE_EXERCISE",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "fabrication",
"difficulty": 1,
"time": "1 m",
"reversible": true,
"autolearn": true,
"flags": [ "BLIND_EASY" ],
"components": [
[ [ "metalworking_tongs", 1 ] ],
[ [ "metal_file", 1 ] ],
[ [ "hammer", 1 ] ],
[ [ "clay_canister", 1 ], [ "bowl_clay", 1 ], [ "jug_clay", 1 ] ]
]
}
]

0 comments on commit 600018f

Please sign in to comment.