Skip to content

Commit

Permalink
feat(balance): primitive tool/weapon diassembly, pipe spear buff (#4525)
Browse files Browse the repository at this point in the history
* Primitive tool disassembly, pipe spear buff

Made it possible to disassemble various primitive tools and weapons, as well as buffed the pipe spear to have the same to-hit bonus as the wooden spear; every single item that is now uncraftable has a very simple assembly method, while the pipe spear is basically the same as a wooden spear but made of metal.

* Corrected error
  • Loading branch information
yay855 committed Apr 26, 2024
1 parent 3127b68 commit bc2f5d1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
4 changes: 1 addition & 3 deletions data/json/items/melee/spears_and_polearms.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
"color": "light_gray",
"material": [ "steel" ],
"techniques": [ "WBLOCK_1", "IMPALE" ],
"to_hit": -1,
"to_hit": 1,
"bashing": 6,
"cutting": 25,
"flags": [ "SPEAR", "REACH_ATTACK", "SHEATH_SPEAR", "STAB" ],
Expand All @@ -197,7 +197,6 @@
"color": "light_red",
"material": [ "copper", "wood" ],
"techniques": [ "WBLOCK_1", "IMPALE" ],
"to_hit": 1,
"cutting": 20,
"flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "STAB" ],
"qualities": [ [ "COOK", 1 ] ]
Expand All @@ -213,7 +212,6 @@
"price": "160 USD",
"price_postapoc": "55 USD",
"material": [ "steel", "wood" ],
"to_hit": 1,
"cutting": 30,
"flags": [ "DURABLE_MELEE", "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "STAB" ]
},
Expand Down
7 changes: 7 additions & 0 deletions data/json/recipes/other/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "survival",
"time": "5 m",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "rock", 1 ] ], [ [ "filament", 100, "LIST" ], [ "cordage_short", 2, "LIST" ] ] ]
Expand All @@ -363,6 +364,7 @@
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "survival",
"time": "5 m",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [
Expand Down Expand Up @@ -415,6 +417,7 @@
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "survival",
"time": "1 h",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [
Expand Down Expand Up @@ -444,6 +447,7 @@
"skills_required": [ "fabrication", 2 ],
"difficulty": 2,
"time": "1 h",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [
Expand Down Expand Up @@ -480,6 +484,7 @@
"skills_required": [ "fabrication", 2 ],
"difficulty": 3,
"time": "1 h",
"reversible": true,
"autolearn": true,
"book_learn": [ [ "mag_survival", 1 ], [ "atomic_survival", 1 ], [ "textbook_carpentry", 2 ] ],
"qualities": [ { "id": "HAMMER", "level": 1 } ],
Expand All @@ -498,6 +503,7 @@
"skills_required": [ "survival", 2 ],
"difficulty": 2,
"time": "1 h",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "CUT", "level": 1 } ],
"components": [
Expand Down Expand Up @@ -639,6 +645,7 @@
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "mechanics",
"time": "10 m",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "scrap", 1 ] ] ]
Expand Down
3 changes: 3 additions & 0 deletions data/json/recipes/weapon/bashing.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@
"skills_required": [ "bashing", 1 ],
"difficulty": 2,
"time": "20 m",
"reversible": true,
"autolearn": true,
"book_learn": [ [ "recipe_melee", 1 ], [ "textbook_weapeast", 7 ] ],
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
Expand Down Expand Up @@ -315,6 +316,7 @@
"skill_used": "fabrication",
"difficulty": 2,
"time": "18 m",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "stick_long", 1 ] ], [ [ "fabric_hides_any", 2, "LIST" ] ] ]
Expand Down Expand Up @@ -389,6 +391,7 @@
"skills_required": [ "bashing", 2 ],
"difficulty": 3,
"time": "32 m",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "2x4", 1 ], [ "stick_long", 1 ] ], [ [ "fabric_hides_any", 5, "LIST" ] ] ]
Expand Down

0 comments on commit bc2f5d1

Please sign in to comment.