From e9292e27e47390b8ae1299e4a1336d47ac92d9ef Mon Sep 17 00:00:00 2001 From: Darkyhard Date: Mon, 25 Jan 2016 21:27:48 +0300 Subject: [PATCH 1/5] Move halberd from Medieval Stuff mod Move halberd and its' fake version from Medieval Stuff mod into the main game. Other changes: 1. Increaxe AXE quality of halberd from 1 to 2. 2. Add COOK 1 quality to halberd. One could use a spike on its' end to cook a piece of meat. 3. Add IMPALE technique to halberd. 4. Add REACH3 flag to halberd and its' fake version. 5. Reduce spawn rate of halberd in some item groups. 6. Add halberd and its' fake version to No Medieval Items mod's blacklist. --- data/json/item_groups.json | 6 +++ data/json/items/melee.json | 41 ++++++++++++++++++++ data/json/recipes/recipe_weapon.json | 40 +++++++++++++++++++ data/mods/Medieval_Stuff/item_groups.json | 6 --- data/mods/Medieval_Stuff/melee.json | 24 ------------ data/mods/Medieval_Stuff/recipe_weapons.json | 40 ------------------- data/mods/Medieval_Stuff/tools.json | 25 ------------ data/mods/No_Medieval_Items/modinfo.json | 2 + 8 files changed, 89 insertions(+), 95 deletions(-) diff --git a/data/json/item_groups.json b/data/json/item_groups.json index c58f0cb55c73d..ee695f398193c 100644 --- a/data/json/item_groups.json +++ b/data/json/item_groups.json @@ -4829,6 +4829,7 @@ ["battleaxe", 20], ["battleaxe_inferior", 20], ["warhammer", 10], + ["halberd", 5], ["pike", 5], ["helmet_plate", 1], ["armor_plate", 2], @@ -5164,6 +5165,7 @@ ["broadsword_inferior", 20], ["zweihander", 1], ["glaive", 1], + ["halberd", 1], ["cutlass", 1], ["rapier", 1], ["wakizashi", 1], @@ -9083,6 +9085,8 @@ ["kris", 2], ["rapier", 2], ["glaive", 2], + ["halberd", 2], + ["halberd_fake", 7], ["katana_fake", 4], ["katana_inferior", 8], ["zweihander_fake", 4], @@ -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], diff --git a/data/json/items/melee.json b/data/json/items/melee.json index 72002bb6899b5..32a967a32f55d 100644 --- a/data/json/items/melee.json +++ b/data/json/items/melee.json @@ -2018,6 +2018,47 @@ "price" : 8000, "qualities": [["COOK", 1]] },{ + "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", "REACH3"], + "techniques": ["WBLOCK_1", "IMPALE", "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", 2], ["COOK", 1]], + "use_action": "LUMBER" + },{ + "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", "REACH3"], + "techniques": ["WBLOCK_1"], + "weight": 1644, + "volume": 15, + "bashing": 16, + "cutting": 2, + "to_hit": 2, + "category" : "weapons" + },{ "id": "glaive", "type": "GENERIC", "symbol": "/", diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 98cf8053b1289..5b113e714c257 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -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", diff --git a/data/mods/Medieval_Stuff/item_groups.json b/data/mods/Medieval_Stuff/item_groups.json index 59e517afaff7d..a37c73dd4541a 100644 --- a/data/mods/Medieval_Stuff/item_groups.json +++ b/data/mods/Medieval_Stuff/item_groups.json @@ -5,7 +5,6 @@ "items":[ ["arming_sword", 25], ["estoc", 15], - ["halberd", 20], ["scimitar", 20], ["helmet_nasal", 1], ["helmet_galea", 1], @@ -22,7 +21,6 @@ "items":[ ["arming_sword", 25], ["estoc", 15], - ["halberd", 20], ["scimitar", 20], ["armor_lamellar", 2], ["helmet_conical", 1], @@ -36,8 +34,6 @@ ["arming_sword_fake", 8], ["estoc", 3], ["estoc_fake", 6], - ["halberd", 3], - ["halberd_fake", 7], ["qiang", 3], ["ji", 1], ["jian", 2], @@ -61,8 +57,6 @@ ["arming_sword_fake", 7], ["estoc", 3], ["estoc_fake", 5], - ["halberd", 4], - ["halberd_fake", 6], ["qiang", 3], ["ji", 2], ["jian", 2], diff --git a/data/mods/Medieval_Stuff/melee.json b/data/mods/Medieval_Stuff/melee.json index a8285edb49a0c..1d3619d29b41d 100644 --- a/data/mods/Medieval_Stuff/melee.json +++ b/data/mods/Medieval_Stuff/melee.json @@ -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", diff --git a/data/mods/Medieval_Stuff/recipe_weapons.json b/data/mods/Medieval_Stuff/recipe_weapons.json index 1222c010ecda1..ad6bfd096065b 100644 --- a/data/mods/Medieval_Stuff/recipe_weapons.json +++ b/data/mods/Medieval_Stuff/recipe_weapons.json @@ -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", diff --git a/data/mods/Medieval_Stuff/tools.json b/data/mods/Medieval_Stuff/tools.json index c7c9d7f07bc48..813a83bc05631 100644 --- a/data/mods/Medieval_Stuff/tools.json +++ b/data/mods/Medieval_Stuff/tools.json @@ -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", diff --git a/data/mods/No_Medieval_Items/modinfo.json b/data/mods/No_Medieval_Items/modinfo.json index b1469f1632bd9..b29735819808d 100644 --- a/data/mods/No_Medieval_Items/modinfo.json +++ b/data/mods/No_Medieval_Items/modinfo.json @@ -40,6 +40,8 @@ "scythe_war", "pike", "glaive", + "halberd", + "halberd_fake" "textbook_weapwest", "textbook_weapeast", "textbook_armwest", From 2c7fbcfa28857c02ad5c45c39895892aaf4868a0 Mon Sep 17 00:00:00 2001 From: Darkyhard Date: Tue, 26 Jan 2016 06:23:14 +0300 Subject: [PATCH 2/5] Update halberd --- data/json/items/melee.json | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/data/json/items/melee.json b/data/json/items/melee.json index 32a967a32f55d..7d689442e26ab 100644 --- a/data/json/items/melee.json +++ b/data/json/items/melee.json @@ -2019,28 +2019,21 @@ "qualities": [["COOK", 1]] },{ "id": "halberd", - "type": "TOOL", + "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", "REACH3"], - "techniques": ["WBLOCK_1", "IMPALE", "WIDE"], + "flags": ["CHOP", "DURABLE_MELEE", "REACH_ATTACK", "NON_STUCK"], + "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", 2], ["COOK", 1]], - "use_action": "LUMBER" + "qualities": [["COOK", 1]] },{ "id": "halberd_fake", "type": "GENERIC", From 828684337286c677f34c73b1f86e86619fd86f7c Mon Sep 17 00:00:00 2001 From: Darkyhard Date: Tue, 26 Jan 2016 06:48:10 +0300 Subject: [PATCH 3/5] Remove REACH3 flag from fake halberd --- data/json/items/melee.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee.json b/data/json/items/melee.json index 7d689442e26ab..7e3ca8f2317b6 100644 --- a/data/json/items/melee.json +++ b/data/json/items/melee.json @@ -2043,7 +2043,7 @@ "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", "REACH3"], + "flags": ["BASH", "REACH_ATTACK"], "techniques": ["WBLOCK_1"], "weight": 1644, "volume": 15, From 58130c347971d5bfd55a65735d520e901e51f259 Mon Sep 17 00:00:00 2001 From: Darkyhard Date: Tue, 26 Jan 2016 21:00:36 +0300 Subject: [PATCH 4/5] Remove unused BASH flags from some melee items --- data/json/items/melee.json | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/data/json/items/melee.json b/data/json/items/melee.json index 7e3ca8f2317b6..e14957e2683eb 100644 --- a/data/json/items/melee.json +++ b/data/json/items/melee.json @@ -2043,7 +2043,7 @@ "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"], + "flags": "REACH_ATTACK", "techniques": ["WBLOCK_1"], "weight": 1644, "volume": 15, @@ -3246,7 +3246,7 @@ "price": 9600, "material": "aluminum", "techniques": "WBLOCK_1", - "flags" : ["BASH", "SHEATH_SWORD"], + "flags" : "SHEATH_SWORD", "weight": 634, "volume": 7, "bashing": 8, @@ -3297,7 +3297,7 @@ "price": 5000, "material": "aluminum", "techniques": ["RAPID", "WBLOCK_2"], - "flags" : ["BASH", "SHEATH_SWORD"], + "flags" : "SHEATH_SWORD", "weight": 753, "volume": 8, "bashing": 6, @@ -3346,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, @@ -3396,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, @@ -3421,7 +3421,7 @@ "price": 9800, "material": "steel", "techniques": ["RAPID", "WBLOCK_2"], - "flags" : ["BASH", "SHEATH_SWORD"], + "flags" : "SHEATH_SWORD", "weight": 660, "volume": 6, "bashing": 4, @@ -3445,7 +3445,7 @@ "price": 7800, "material": "steel", "techniques": ["RAPID", "WBLOCK_1"], - "flags" : ["BASH", "SHEATH_SWORD"], + "flags" : "SHEATH_SWORD", "weight": 557, "volume": 6, "bashing": 4, @@ -3501,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, @@ -3524,7 +3524,6 @@ "volume": 13, "bashing": 16, "cutting": 2, - "flags" : ["BASH"], "to_hit": 1, "max_charges": 0, "initial_charges": 0, @@ -3568,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, @@ -4160,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, From f86cf51cdea5c19496753b9c3961f98a357b367e Mon Sep 17 00:00:00 2001 From: Darkyhard Date: Wed, 27 Jan 2016 06:17:27 +0300 Subject: [PATCH 5/5] Add missing separator --- data/mods/No_Medieval_Items/modinfo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/No_Medieval_Items/modinfo.json b/data/mods/No_Medieval_Items/modinfo.json index b29735819808d..8c6f53334309d 100644 --- a/data/mods/No_Medieval_Items/modinfo.json +++ b/data/mods/No_Medieval_Items/modinfo.json @@ -41,7 +41,7 @@ "pike", "glaive", "halberd", - "halberd_fake" + "halberd_fake", "textbook_weapwest", "textbook_weapeast", "textbook_armwest",