diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index b184f865b6c3d..1e38ccce8252e 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -149,7 +149,7 @@ "price": 1050, "price_postapoc": 500, "material": [ "aluminum", "wood" ], - "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ], + "flags": [ "NONCONDUCTIVE", "SHEATH_AXE", "FRAGILE_MELEE" ], "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], "weight": "2068 g", "volume": "3250 ml", @@ -228,7 +228,7 @@ "price_postapoc": 500, "material": "wood", "techniques": [ "RAPID", "WBLOCK_2", "SWEEP" ], - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "weight": "680 g", "volume": "2 L", "bashing": 13, @@ -596,7 +596,7 @@ "price": 4000, "price_postapoc": 500, "material": [ "wood", "aluminum" ], - "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "SPEAR", "ALWAYS_TWOHAND" ], + "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ], "techniques": [ "WBLOCK_1", "SWEEP" ], "weight": "2700 g", "volume": "3750 ml", @@ -636,7 +636,7 @@ "looks_like": "mace", "material": [ "aluminum", "wood" ], "techniques": [ "SWEEP" ], - "flags": [ "NONCONDUCTIVE" ], + "flags": [ "NONCONDUCTIVE", "FRAGILE_MELEE" ], "volume": "1250 ml", "bashing": 15, "price": 10000, @@ -730,7 +730,7 @@ "volume": "1500 ml", "bashing": 26, "cutting": 1, - "flags": [ "SPEAR", "NONCONDUCTIVE" ], + "flags": [ "SPEAR", "NONCONDUCTIVE", "FRAGILE_MELEE" ], "price": 12000, "price_postapoc": 500 }, @@ -942,6 +942,7 @@ "price": 2500, "material": "wood", "techniques": [ "WBLOCK_1", "SWEEP" ], + "flags": [ "FRAGILE_MELEE" ], "weight": "850 g", "volume": "1500 ml", "bashing": 26, diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json index 8fbf46e9bf240..20a3e725e4df1 100644 --- a/data/json/items/melee/spears_and_polearms.json +++ b/data/json/items/melee/spears_and_polearms.json @@ -291,7 +291,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": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ], + "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ], "techniques": [ "WBLOCK_1", "SWEEP" ], "weight": "1644 g", "volume": "3750 ml", @@ -369,7 +369,7 @@ "bashing": 12, "cutting": 2, "to_hit": 1, - "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ], + "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ], "price": 8000, "price_postapoc": 500 }, @@ -510,7 +510,7 @@ "looks_like": "pike", "techniques": [ "IMPALE", "WBLOCK_1" ], "qualities": [ [ "COOK", 1 ] ], - "flags": [ "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ] + "flags": [ "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ] }, { "id": "pike_inferior", diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 604db4e504aba..0c4c0b3af2b04 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -448,7 +448,7 @@ "price": 10000, "price_postapoc": 50, "material": "aluminum", - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "techniques": [ "WBLOCK_2" ], "weight": "414 g", "volume": "2 L", @@ -508,7 +508,7 @@ "price_postapoc": 50, "material": "aluminum", "techniques": [ "WBLOCK_2" ], - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "weight": "586 g", "volume": "2 L", "bashing": 6, @@ -565,7 +565,7 @@ "price_postapoc": 50, "material": "aluminum", "techniques": [ "WBLOCK_2", "PRECISE" ], - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "weight": "939 g", "volume": "2750 ml", "bashing": 13, @@ -623,7 +623,7 @@ "price": 13000, "price_postapoc": 100, "material": "aluminum", - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "techniques": [ "WBLOCK_2" ], "weight": "939 g", "volume": "2750 ml", @@ -663,7 +663,7 @@ "price": 10000, "price_postapoc": 50, "material": "aluminum", - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "techniques": [ "WBLOCK_2" ], "weight": "704 g", "volume": "2 L", @@ -924,7 +924,7 @@ "looks_like": "tanto", "techniques": "RAPID", "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 5 ] ], - "flags": [ "STAB", "SHEATH_KNIFE" ] + "flags": [ "STAB", "SHEATH_KNIFE", "FRAGILE_MELEE" ] }, { "id": "tanto_inferior", @@ -977,7 +977,7 @@ "price": 15000, "price_postapoc": 250, "material": "aluminum", - "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ], + "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ], "techniques": [ "WBLOCK_1", "RAPID", "WIDE" ], "weight": "1882 g", "volume": "3250 ml", @@ -1238,7 +1238,7 @@ "price_postapoc": 50, "material": "aluminum", "techniques": "WBLOCK_2", - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "weight": "634 g", "volume": "1750 ml", "bashing": 12, @@ -1316,7 +1316,7 @@ "price_postapoc": 50, "material": "aluminum", "techniques": [ "RAPID", "WBLOCK_2" ], - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "weight": "753 g", "volume": "2 L", "bashing": 11, @@ -1354,7 +1354,7 @@ "price": 8000, "price_postapoc": 50, "material": "aluminum", - "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ], + "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ], "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], "weight": "3176 g", "volume": "3250 ml", @@ -1393,7 +1393,7 @@ "price": 12000, "price_postapoc": 50, "material": "aluminum", - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "techniques": "WBLOCK_2", "weight": "753 g", "volume": "1750 ml", @@ -1419,7 +1419,7 @@ "symbol": "/", "color": "dark_gray", "techniques": [ "WBLOCK_2", "RAPID" ], - "flags": [ "SHEATH_SWORD" ] + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ] }, { "id": "rapier_fake", @@ -1432,7 +1432,7 @@ "price_postapoc": 50, "material": "aluminum", "techniques": [ "RAPID", "WBLOCK_2", "PRECISE" ], - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "weight": "660 g", "volume": "1500 ml", "bashing": 4, @@ -1451,7 +1451,7 @@ "price_postapoc": 50, "material": "aluminum", "techniques": [ "RAPID", "WBLOCK_2" ], - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "weight": "557 g", "volume": "1500 ml", "bashing": 8, @@ -1494,7 +1494,7 @@ "volume": "750 ml", "bashing": 2, "cutting": 2, - "flags": [ "SHEATH_SWORD" ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], "to_hit": 1, "category": "weapons" }, @@ -1555,7 +1555,7 @@ "turns_per_charge": 1, "charges_per_use": 0, "qualities": [ [ "AXE", 3 ], [ "BUTCHER", -250 ] ], - "flags": [ "MESSY", "HURT_WHEN_PULLED", "DURABLE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ] + "flags": [ "MESSY", "HURT_WHEN_PULLED", "FRAGILE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ] }, { "id": "ecs_lajatang_off", @@ -1594,7 +1594,7 @@ "charges_per_use": 0, "revert_to": "ecs_lajatang_off", "use_action": "ECS_LAJATANG_ON", - "flags": [ "MESSY", "HURT_WHEN_PULLED", "DURABLE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], + "flags": [ "MESSY", "HURT_WHEN_PULLED", "FRAGILE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], "magazine_well": 4 }, { diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json index 463f73c9e44af..587d88c27edfe 100644 --- a/data/json/items/tool/woodworking.json +++ b/data/json/items/tool/woodworking.json @@ -54,7 +54,7 @@ "techniques": "SWEEP", "qualities": [ [ "AXE", 4 ], [ "BUTCHER", -100 ] ], "use_action": "CHAINSAW_ON", - "flags": [ "MESSY", "TRADER_AVOID", "NONCONDUCTIVE", "POWERED" ] + "flags": [ "MESSY", "TRADER_AVOID", "NONCONDUCTIVE", "POWERED", "FRAGILE_MELEE" ] }, { "id": "circsaw_off", @@ -180,7 +180,7 @@ "revert_to": "elec_chainsaw_off", "qualities": [ [ "AXE", 4 ], [ "BUTCHER", -100 ] ], "use_action": "ELEC_CHAINSAW_ON", - "flags": [ "MESSY", "TRADER_AVOID", "NONCONDUCTIVE", "POWERED" ], + "flags": [ "MESSY", "TRADER_AVOID", "NONCONDUCTIVE", "POWERED", "FRAGILE_MELEE" ], "magazine_well": 2 }, {