diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index fd5bda54d51a6..f1ce2887d6742 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -783,27 +783,6 @@ "price_postapoc": 400, "qualities": [ [ "HAMMER", 1 ] ] }, - { - "type": "GENERIC", - "id": "mace_bronze", - "name": { "str": "bronze mace" }, - "description": "While nothing more than a bronze sphere on a stick, it is still surprisingly effective.", - "weight": "1600 g", - "color": "yellow", - "symbol": "/", - "looks_like": "mace", - "material": [ "bronze", "wood" ], - "techniques": [ "WBLOCK_1", "SWEEP" ], - "flags": [ "BELT_CLIP", "NONCONDUCTIVE", "DURABLE_MELEE" ], - "weapon_category": [ "MACES" ], - "volume": "1250 ml", - "longest_side": "60 cm", - "bashing": 30, - "to_hit": { "grip": "weapon", "length": "short", "surface": "any", "balance": "uneven" }, - "price": 11000, - "price_postapoc": 2000, - "qualities": [ [ "HAMMER", 1 ] ] - }, { "id": "makeshift_sap", "type": "GENERIC", diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json index bfc9fa116571f..c1d45e882ba2f 100644 --- a/data/json/items/melee/spears_and_polearms.json +++ b/data/json/items/melee/spears_and_polearms.json @@ -735,28 +735,6 @@ "flags": [ "SPEAR", "REACH_ATTACK", "DURABLE_MELEE", "SHEATH_SPEAR", "NONCONDUCTIVE" ], "weapon_category": [ "POLEARMS", "SPEARS" ] }, - { - "id": "spear_bronze", - "type": "GENERIC", - "name": { "str": "bronze spear" }, - "description": "A forged spear with a bronze head. It has a general shape of a spear, but there is just something wrong with it.", - "weight": "1598 g", - "volume": "3500 ml", - "longest_side": "180 cm", - "price": 9000, - "price_postapoc": 2500, - "bashing": 6, - "cutting": 26, - "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "neutral" }, - "material": [ "bronze", "wood" ], - "symbol": "/", - "color": "yellow", - "looks_like": "spear_dory", - "techniques": [ "WBLOCK_1", "IMPALE" ], - "qualities": [ [ "COOK", 1 ] ], - "flags": [ "SPEAR", "REACH_ATTACK", "DURABLE_MELEE", "SHEATH_SPEAR", "NONCONDUCTIVE" ], - "weapon_category": [ "POLEARMS", "SPEARS" ] - }, { "id": "poleaxe", "type": "GENERIC", diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 85ca9f1856c7e..efe863b3580ba 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -778,29 +778,6 @@ "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ], "weapon_category": [ "MEDIUM_SWORDS" ] }, - { - "id": "sword_bronze", - "type": "TOOL", - "category": "weapons", - "name": { "str": "bronze sword" }, - "description": "An imitation of a sword made from bronze. It is a capable weapon, but it cannot compare to actual swords.", - "weight": "800 g", - "volume": "2 L", - "longest_side": "50 cm", - "price": 11000, - "price_postapoc": 2000, - "bashing": 6, - "cutting": 21, - "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "uneven" }, - "material": [ "bronze" ], - "symbol": "!", - "color": "yellow", - "looks_like": "sword_xiphos", - "techniques": [ "WBLOCK_2" ], - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 2 ] ], - "flags": [ "SHEATH_SWORD", "DURABLE_MELEE" ], - "weapon_category": [ "SHORT_SWORDS" ] - }, { "id": "survivor_machete", "type": "TOOL", diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json index d1ccc44ee1c3d..1bb20be7a29c7 100644 --- a/data/json/recipes/weapon/bashing.json +++ b/data/json/recipes/weapon/bashing.json @@ -507,26 +507,6 @@ "qualities": [ { "id": "CUT", "level": 2 }, { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 } ], "components": [ [ [ "mace_simple", 1 ] ], [ [ "nail", 2 ] ], [ [ "cordage", 1, "LIST" ], [ "duct_tape", 50 ] ] ] }, - { - "type": "recipe", - "activity_level": "BRISK_EXERCISE", - "result": "mace_bronze", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_BASHING", - "skill_used": "fabrication", - "difficulty": 5, - "time": "3 h", - "autolearn": true, - "proficiencies": [ - { "proficiency": "prof_metalworking" }, - { "proficiency": "prof_redsmithing" }, - { "proficiency": "prof_carving", "fail_multiplier": 1 } - ], - "using": [ [ "forging_standard", 1 ], [ "bronzesmithing_tools", 1 ] ], - "qualities": [ { "id": "CUT", "level": 2 } ], - "tools": [ [ [ "casting_mold", -1 ] ] ], - "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "scrap_bronze", 3 ] ] ] - }, { "type": "recipe", "activity_level": "BRISK_EXERCISE", diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index 8156abf6e51d4..6f84057683477 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/data/json/recipes/weapon/cutting.json @@ -110,32 +110,6 @@ [ [ "scrap_bronze", 5 ] ] ] }, - { - "result": "sword_bronze", - "type": "recipe", - "activity_level": "BRISK_EXERCISE", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_CUTTING", - "skill_used": "fabrication", - "difficulty": 6, - "time": "3 h", - "autolearn": true, - "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_redsmithing" } ], - "using": [ [ "forging_standard", 2 ], [ "bronzesmithing_tools", 1 ] ], - "tools": [ [ [ "casting_mold", -1 ] ] ], - "components": [ - [ - [ "rag", 1 ], - [ "felt_patch", 1 ], - [ "leather", 1 ], - [ "fur", 1 ], - [ "duct_tape", 50 ], - [ "cordage_short", 2, "LIST" ], - [ "filament", 100, "LIST" ] - ], - [ [ "scrap_bronze", 4 ] ] - ] - }, { "type": "recipe", "activity_level": "BRISK_EXERCISE", diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json index d651f4b028234..c9765278b71b2 100644 --- a/data/json/recipes/weapon/piercing.json +++ b/data/json/recipes/weapon/piercing.json @@ -300,26 +300,6 @@ "tools": [ [ [ "casting_mold", -1 ] ] ], "components": [ [ [ "scrap_bronze", 2 ] ], [ [ "stick_long", 1 ] ] ] }, - { - "result": "spear_bronze", - "type": "recipe", - "activity_level": "BRISK_EXERCISE", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_PIERCING", - "skill_used": "fabrication", - "difficulty": 4, - "time": "3 h", - "autolearn": true, - "proficiencies": [ - { "proficiency": "prof_metalworking" }, - { "proficiency": "prof_redsmithing" }, - { "proficiency": "prof_carving", "fail_multiplier": 1 } - ], - "using": [ [ "forging_standard", 1 ], [ "bronzesmithing_tools", 1 ] ], - "qualities": [ { "id": "CUT", "level": 2 } ], - "tools": [ [ [ "casting_mold", -1 ] ] ], - "components": [ [ [ "scrap_bronze", 2 ] ], [ [ "stick_long", 1 ] ] ] - }, { "type": "recipe", "activity_level": "BRISK_EXERCISE",