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

Adds new wood and copper pikes with recipes. #39861

Merged
merged 2 commits into from
Apr 26, 2020
Merged

Adds new wood and copper pikes with recipes. #39861

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90b2663
Adds wooden and copper pikes and recipes.
Brian-Otten Apr 24, 2020
6e87fce
Update recipe_weapon.json
Brian-Otten Apr 24, 2020
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
46 changes: 43 additions & 3 deletions data/json/items/melee/spears_and_polearms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,46 @@
"price_postapoc": 500,
"qualities": [ [ "COOK", 1 ] ]
},
{
"id": "pike_wood",
"type": "GENERIC",
"category": "weapons",
"name": { "ctxt": "weapon", "str": "wooden pike" },
"description": "This is a medieval weapon consisting of a wood shaft with a fire hardened point.",
"weight": "2300 g",
Copy link
Contributor

Choose a reason for hiding this comment

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

This pike loses more than a kilogram after processing from a long stick (3.4 kg)?

"volume": "3500 ml",
"price": 10000,
"price_postapoc": 750,
"bashing": 9,
"cutting": 16,
"material": [ "wood" ],
"symbol": "/",
"color": "brown",
"looks_like": "pike",
"techniques": [ "IMPALE", "WBLOCK_1" ],
"qualities": [ [ "COOK", 1 ] ],
"flags": [ "DURABLE_MELEE", "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ]
},
{
"id": "pike_copper",
"type": "GENERIC",
"category": "weapons",
"name": { "ctxt": "weapon", "str": "copper pike" },
"description": "This is a medieval weapon consisting of a wood shaft tipped with a copper spearhead.",
"weight": "2500 g",
"volume": "3500 ml",
"price": 15000,
"price_postapoc": 1000,
"bashing": 9,
"cutting": 23,
"material": [ "copper", "wood" ],
"symbol": "/",
"color": "brown",
"looks_like": "pike",
"techniques": [ "IMPALE", "WBLOCK_1" ],
"qualities": [ [ "COOK", 1 ] ],
"flags": [ "DURABLE_MELEE", "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ]
},
{
"id": "pike",
"type": "GENERIC",
Expand All @@ -447,7 +487,7 @@
"material": [ "iron", "wood" ],
"symbol": "/",
"color": "brown",
"techniques": [ "IMPALE", "WBLOCK_2" ],
"techniques": [ "IMPALE", "WBLOCK_1" ],
"qualities": [ [ "COOK", 1 ] ],
"flags": [ "DURABLE_MELEE", "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ]
},
Expand All @@ -468,7 +508,7 @@
"symbol": "/",
"color": "brown",
"looks_like": "pike",
"techniques": [ "IMPALE", "WBLOCK_2" ],
"techniques": [ "IMPALE", "WBLOCK_1" ],
"qualities": [ [ "COOK", 1 ] ],
"flags": [ "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
},
Expand All @@ -489,7 +529,7 @@
"symbol": "/",
"color": "brown",
"looks_like": "pike",
"techniques": [ "IMPALE", "WBLOCK_2" ],
"techniques": [ "IMPALE", "WBLOCK_1" ],
"qualities": [ [ "COOK", 1 ] ],
"flags": [ "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
},
Expand Down
39 changes: 38 additions & 1 deletion data/json/recipes/recipe_weapon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,43 @@
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "leather", 20 ] ], [ [ "rope_superior_short", 2, "LIST" ] ] ]
},
{
"type": "recipe",
"result": "pike_wood",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_PIERCING",
"skill_used": "fabrication",
"skills_required": [ "survival", 1 ],
"difficulty": 3,
"time": "30 m",
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 } ],
"tools": [ [ [ "fire", -1 ] ] ],
"components": [
[ [ "stick_long", 1 ] ],
[ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ],
[ [ "duct_tape", 20 ], [ "filament", 20, "LIST" ] ]
]
},
{
"type": "recipe",
"result": "spear_copper",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_PIERCING",
"skill_used": "fabrication",
"difficulty": 3,
"time": "40 m",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
"components": [
[ [ "stick_long", 1 ] ],
[ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ],
[ [ "duct_tape", 20 ], [ "cordage_short", 1, "LIST" ], [ "filament", 50, "LIST" ] ],
[ [ "copper_scrap_equivalent", 12, "LIST" ] ]
]
},
{
"type": "recipe",
"result": "spear_wood",
Expand All @@ -228,7 +265,7 @@
"qualities": [ { "id": "CUT", "level": 1 } ],
"tools": [ [ [ "fire", -1 ] ] ],
"components": [
[ [ "stick_long", 1 ], [ "pool_cue", 1 ] ],
[ [ "stick_long", 1 ] ],
[ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ],
[ [ "duct_tape", 20 ], [ "filament", 20, "LIST" ] ]
]
Expand Down