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

Move halberd from Medieval Stuff mod #15018

Merged
merged 5 commits into from
Jan 28, 2016
Merged

Move halberd from Medieval Stuff mod #15018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9292e2
Move halberd from Medieval Stuff mod
ArkoselabsDoesNotWork-153164711 Jan 25, 2016
2c7fbcf
Update halberd
ArkoselabsDoesNotWork-153164711 Jan 26, 2016
8286843
Remove REACH3 flag from fake halberd
ArkoselabsDoesNotWork-153164711 Jan 26, 2016
58130c3
Remove unused BASH flags from some melee items
ArkoselabsDoesNotWork-153164711 Jan 26, 2016
f86cf51
Add missing separator
ArkoselabsDoesNotWork-153164711 Jan 27, 2016
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
6 changes: 6 additions & 0 deletions data/json/item_groups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4829,6 +4829,7 @@
["battleaxe", 20],
["battleaxe_inferior", 20],
["warhammer", 10],
["halberd", 5],
["pike", 5],
["helmet_plate", 1],
["armor_plate", 2],
Expand Down Expand Up @@ -5164,6 +5165,7 @@
["broadsword_inferior", 20],
["zweihander", 1],
["glaive", 1],
["halberd", 1],
["cutlass", 1],
["rapier", 1],
["wakizashi", 1],
Expand Down Expand Up @@ -9083,6 +9085,8 @@
["kris", 2],
["rapier", 2],
["glaive", 2],
["halberd", 2],
["halberd_fake", 7],
["katana_fake", 4],
["katana_inferior", 8],
["zweihander_fake", 4],
Expand Down Expand Up @@ -9225,6 +9229,8 @@
["q_staff", 8],
["i_staff", 6],
["glaive", 3],
["halberd", 2],
["halberd_fake", 6],
["battleaxe", 2],
["battleaxe_fake", 6],
["battleaxe_inferior", 10],
Expand Down
53 changes: 43 additions & 10 deletions data/json/items/melee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2018,6 +2018,40 @@
"price" : 8000,
"qualities": [["COOK", 1]]
},{
"id": "halberd",
"type": "GENERIC",
"symbol": "/",
"color": "light_gray",
"name": "halberd",
"description": "This is a versatile polearm with an axe blade, a spike, and other fun things attached to a long stick.",
"price": 50000,
"material": ["wood", "steel"],
"flags": ["CHOP", "DURABLE_MELEE", "REACH_ATTACK", "NON_STUCK"],
"techniques": ["WBLOCK_1", "WIDE"],
"weight": 3175,
"volume": 15,
"bashing": 16,
"cutting": 35,
"to_hit": 2,
"qualities": [["COOK", 1]]
},{
"id": "halberd_fake",
"type": "GENERIC",
"symbol": "/",
"color": "light_gray",
"name": "halberd",
"description": "This is a dull, cheaply made replica of a polearm with an axe blade, a spike, and other fun things attached to a long stick.",
"price": 5000,
"material": ["wood", "aluminum"],
"flags": "REACH_ATTACK",
"techniques": ["WBLOCK_1"],
"weight": 1644,
"volume": 15,
"bashing": 16,
"cutting": 2,
"to_hit": 2,
"category" : "weapons"
},{
"id": "glaive",
"type": "GENERIC",
"symbol": "/",
Expand Down Expand Up @@ -3212,7 +3246,7 @@
"price": 9600,
"material": "aluminum",
"techniques": "WBLOCK_1",
"flags" : ["BASH", "SHEATH_SWORD"],
"flags" : "SHEATH_SWORD",
"weight": 634,
"volume": 7,
"bashing": 8,
Expand Down Expand Up @@ -3263,7 +3297,7 @@
"price": 5000,
"material": "aluminum",
"techniques": ["RAPID", "WBLOCK_2"],
"flags" : ["BASH", "SHEATH_SWORD"],
"flags" : "SHEATH_SWORD",
"weight": 753,
"volume": 8,
"bashing": 6,
Expand Down Expand Up @@ -3312,7 +3346,7 @@
"description": "This is a dull, cheaply made replica of a huge two-handed sword from Germany. It still packs a wallop.",
"price": 8000,
"material": "aluminum",
"flags" : ["BASH", "SHEATH_SWORD"],
"flags" : "SHEATH_SWORD",
"techniques": ["WBLOCK_1", "WIDE"],
"weight": 3176,
"volume": 13,
Expand Down Expand Up @@ -3362,7 +3396,7 @@
"description": "This is a dull, cheaply made replica of an early modern sword seeing use in the 16th, 17th, and 18th centuries. Called 'broad' to contrast with the slimmer rapiers.",
"price": 12000,
"material": "aluminum",
"flags" : ["BASH", "SHEATH_SWORD"],
"flags" : "SHEATH_SWORD",
"techniques": "WBLOCK_2",
"weight": 753,
"volume": 7,
Expand All @@ -3387,7 +3421,7 @@
"price": 9800,
"material": "steel",
"techniques": ["RAPID", "WBLOCK_2"],
"flags" : ["BASH", "SHEATH_SWORD"],
"flags" : "SHEATH_SWORD",
"weight": 660,
"volume": 6,
"bashing": 4,
Expand All @@ -3411,7 +3445,7 @@
"price": 7800,
"material": "steel",
"techniques": ["RAPID", "WBLOCK_1"],
"flags" : ["BASH", "SHEATH_SWORD"],
"flags" : "SHEATH_SWORD",
"weight": 557,
"volume": 6,
"bashing": 4,
Expand Down Expand Up @@ -3467,7 +3501,7 @@
"volume": 3,
"bashing": 2,
"cutting": 2,
"flags" : ["BASH", "SHEATH_SWORD"],
"flags" : "SHEATH_SWORD",
"to_hit": 1,
"max_charges": 0,
"initial_charges": 0,
Expand All @@ -3490,7 +3524,6 @@
"volume": 13,
"bashing": 16,
"cutting": 2,
"flags" : ["BASH"],
"to_hit": 1,
"max_charges": 0,
"initial_charges": 0,
Expand Down Expand Up @@ -3534,7 +3567,7 @@
"description": "This is a dull, cheaply made replica of a huge, curved, two-handed sword from Japan. It is surprisingly light for its size.",
"price": 15000,
"material": "aluminum",
"flags": ["BASH", "SHEATH_SWORD"],
"flags": "SHEATH_SWORD",
"techniques": ["RAPID", "WIDE"],
"weight": 1882,
"volume": 13,
Expand Down Expand Up @@ -4126,7 +4159,7 @@
"description": "This is a dull, cheaply-made replica of the classic medieval longsword. It requires a larger baldric or scabbard, compared to smaller swords.",
"price": 13000,
"material": "aluminum",
"flags" : ["BASH", "SHEATH_SWORD"],
"flags" : "SHEATH_SWORD",
"techniques": ["WBLOCK_1"],
"weight": 939,
"volume": 11,
Expand Down
40 changes: 40 additions & 0 deletions data/json/recipes/recipe_weapon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6439,6 +6439,46 @@
[ "scrap", 12 ]
]
]
},{
"type" : "recipe",
"result": "halberd",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 7,
"time": 360000,
"reversible": false,
"autolearn": false,
"book_learn": [[ "textbook_weapwest", 6 ]],
"qualities":[
{"id":"HAMMER","level":3,"amount":1}
],
"tools": [
[ [ "tongs", -1 ] ],
[ [ "chisel", -1 ] ],
[ [ "anvil", -1 ] ],
[ [ "swage", -1 ] ],
[
[ "forge", 350 ],
[ "char_forge", 70 ],
[ "oxy_torch", 70 ]
]
],
"components": [
[
[ "steel_lump", 3 ],
[ "steel_chunk", 12 ],
[ "scrap", 36 ]
],
[
[ "2x4", 4 ],
[ "stick", 8 ]
],
[
[ "fur", 2 ],
[ "leather", 2 ]
]
]
},{
"type" : "recipe",
"result": "glaive",
Expand Down
6 changes: 0 additions & 6 deletions data/mods/Medieval_Stuff/item_groups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"items":[
["arming_sword", 25],
["estoc", 15],
["halberd", 20],
["scimitar", 20],
["helmet_nasal", 1],
["helmet_galea", 1],
Expand All @@ -22,7 +21,6 @@
"items":[
["arming_sword", 25],
["estoc", 15],
["halberd", 20],
["scimitar", 20],
["armor_lamellar", 2],
["helmet_conical", 1],
Expand All @@ -36,8 +34,6 @@
["arming_sword_fake", 8],
["estoc", 3],
["estoc_fake", 6],
["halberd", 3],
["halberd_fake", 7],
["qiang", 3],
["ji", 1],
["jian", 2],
Expand All @@ -61,8 +57,6 @@
["arming_sword_fake", 7],
["estoc", 3],
["estoc_fake", 5],
["halberd", 4],
["halberd_fake", 6],
["qiang", 3],
["ji", 2],
["jian", 2],
Expand Down
24 changes: 0 additions & 24 deletions data/mods/Medieval_Stuff/melee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,30 +59,6 @@
"to_hit": 2,
"category" : "weapons"
},
{
"id": "halberd_fake",
"type": "GENERIC",
"symbol": "/",
"color": "light_gray",
"name": "halberd",
"description": "This is a dull, cheaply made replica of a polearm with an axe blade, a spike, and other fun things attached to a long stick.",
"price": 5000,
"material": ["wood", "aluminum"],
"flags": ["BASH", "REACH_ATTACK"],
"techniques": ["WBLOCK_1"],
"weight": 1644,
"volume": 15,
"bashing": 16,
"cutting": 2,
"to_hit": 2,
"max_charges": 0,
"initial_charges": 0,
"charges_per_use": 0,
"turns_per_charge": 0,
"ammo": "NULL",
"revert_to": "null",
"category" : "weapons"
},
{
"id": "scimitar_fake",
"type": "GENERIC",
Expand Down
40 changes: 0 additions & 40 deletions data/mods/Medieval_Stuff/recipe_weapons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,46 +79,6 @@
[ "leather", 1 ]
]
]
},{
"type" : "recipe",
"result": "halberd",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 7,
"time": 360000,
"reversible": false,
"autolearn": false,
"book_learn": [[ "textbook_weapwest", 6 ]],
"qualities":[
{"id":"HAMMER","level":3,"amount":1}
],
"tools": [
[ [ "tongs", -1 ] ],
[ [ "chisel", -1 ] ],
[ [ "anvil", -1 ] ],
[ [ "swage", -1 ] ],
[
[ "forge", 350 ],
[ "char_forge", 70 ],
[ "oxy_torch", 70 ]
]
],
"components": [
[
[ "steel_lump", 3 ],
[ "steel_chunk", 12 ],
[ "scrap", 36 ]
],
[
[ "2x4", 4 ],
[ "stick", 8 ]
],
[
[ "fur", 2 ],
[ "leather", 2 ]
]
]
},{
"type" : "recipe",
"result": "ji",
Expand Down
25 changes: 0 additions & 25 deletions data/mods/Medieval_Stuff/tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,6 @@
"category" : "weapons",
"qualities": [["CUT", 1], ["BUTCHER", 8]]
},
{
"id": "halberd",
"type": "TOOL",
"symbol": "/",
"color": "light_gray",
"name": "halberd",
"description": "This is a versatile polearm with an axe blade, a spike, and other fun things attached to a long stick.",
"price": 50000,
"material": ["wood", "steel"],
"flags": ["CHOP", "DURABLE_MELEE", "REACH_ATTACK"],
"techniques": ["WBLOCK_1", "WIDE"],
"weight": 3175,
"volume": 15,
"bashing": 16,
"cutting": 35,
"to_hit": 2,
"max_charges": 0,
"initial_charges": 0,
"charges_per_use": 0,
"turns_per_charge": 0,
"ammo": "NULL",
"revert_to": "null",
"qualities": [["AXE", 1]],
"use_action": "LUMBER"
},
{
"id": "scimitar",
"type": "TOOL",
Expand Down
2 changes: 2 additions & 0 deletions data/mods/No_Medieval_Items/modinfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
"scythe_war",
"pike",
"glaive",
"halberd",
"halberd_fake",
"textbook_weapwest",
"textbook_weapeast",
"textbook_armwest",
Expand Down