refactor: Remove unused flag IRREPLACEABLE_CONSUMABLE (#5436)

Remove unused flag IRREPLACEABLE_CONSUMABLE Let's hope I caught all the trailing commas my find-replace caused...
cataclysmbnteam · Sep 27, 2024 · 3432f1f · 3432f1f
1 parent f91f417
commit 3432f1f
Show file tree

Hide file tree

Showing 29 changed files with 122 additions and 192 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -2043,11 +2043,6 @@
     "type": "json_flag",
     "context": [ "TOOL_ARMOR" ]
   },
-  {
-    "id": "IRREPLACEABLE_CONSUMABLE",
-    "type": "json_flag",
-    "context": [ "AMMO", "CONSUMABLE" ]
-  },
   {
     "id": "ACT_IN_FIRE",
     "type": "json_flag",

diff --git a/data/json/items/ammo/12mm.json b/data/json/items/ammo/12mm.json
@@ -8,7 +8,6 @@
     "volume": "250 ml",
     "price": "60 USD",
     "price_postapoc": "80 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "steel" ],
     "symbol": "=",
     "color": "blue",

diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
@@ -7,7 +7,6 @@
     "description": "20x66mm caseless shotgun rounds, sublethal beanbag type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": "80 USD",
     "price_postapoc": "10 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "damage": { "damage_type": "bash", "amount": 6 },
     "proportional": { "recoil": 0.4, "loudness": 0.6 },
@@ -21,7 +20,7 @@
     "description": "Handmade duplicates of Rivtech 20x66mm caseless flechette rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
     "id": "20x66_shot_reloaded",
@@ -31,7 +30,7 @@
     "description": "Handmade duplicates of Rivtech 20x66mm caseless buckshot rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
     "id": "20x66_slug_reloaded",
@@ -41,7 +40,7 @@
     "description": "Handmade duplicates of Rivtech 20x66mm caseless solid projectile rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
     "id": "20x66_exp",
@@ -51,7 +50,6 @@
     "description": "20x66mm caseless shotgun rounds, explosive projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": "100 USD",
     "price_postapoc": "80 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "range": 20,
     "damage": { "damage_type": "bullet", "amount": 16, "armor_penetration": 4 },
     "dispersion": 120,
@@ -65,7 +63,6 @@
     "description": "20x66mm caseless shotgun rounds, signal flare type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": "50 USD",
     "price_postapoc": "40 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "range": 28,
     "damage": { "damage_type": "heat", "amount": 16 },
@@ -82,7 +79,6 @@
     "description": "20x66mm caseless shotgun rounds, flechette type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": "40 USD",
     "price_postapoc": "40 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "//": "Balanced as AP.",
     "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } }
@@ -95,7 +91,6 @@
     "description": "20x66mm caseless shotgun rounds, explosive fragmentation type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": "78 USD",
     "price_postapoc": "50 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 5,
     "proportional": { "damage": { "damage_type": "bullet", "amount": 0.25, "armor_penetration": 0.25 } },
     "extend": { "effects": [ "FRAG_SMALL" ] }
@@ -108,7 +103,6 @@
     "description": "20x66mm caseless shotgun rounds, incendiary type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": "105 USD",
     "price_postapoc": "50 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "extend": { "effects": [ "INCENDIARY" ] }
   },
@@ -122,7 +116,6 @@
     "volume": "250 ml",
     "price": "15 USD",
     "price_postapoc": "40 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "steel", "powder" ],
     "symbol": "=",
     "color": "pink",
@@ -150,7 +143,6 @@
     "description": "20x66mm caseless shotgun rounds, solid projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": "15 USD",
     "price_postapoc": "40 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "//": "Balanced as FMJ",
     "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 },
     "relative": { "range": 20 },

diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json
@@ -45,7 +45,7 @@
     "range": 0,
     "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
     "proportional": { "recoil": 0.334 },
-    "extend": { "effects": [ "SHOT", "NOGIB" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "extend": { "effects": [ "SHOT", "NOGIB" ] }
   },
   {
     "id": "bp_22_cphp",

diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json
@@ -30,8 +30,7 @@
     "weight": "21 g",
     "range": 40,
     "damage": { "damage_type": "bullet", "amount": 26 },
-    "recoil": 1700,
-    "extend": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "recoil": 1700
   },
   {
     "id": "bp_300blk",

diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json
@@ -7,7 +7,6 @@
     "volume": "250 ml",
     "price": "100 USD",
     "price_postapoc": "60 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "steel", "powder" ],
     "symbol": "=",
     "color": "yellow",
@@ -53,8 +52,7 @@
     "damage": { "damage_type": "bullet", "amount": 120 },
     "recoil": 1000,
     "casing": "40x46mm_m199_casing",
-    "extend": { "effects": [ "SHOT" ] },
-    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "extend": { "effects": [ "SHOT" ] }
   },
   {
     "id": "40x46mm_m651",
@@ -79,8 +77,7 @@
     "damage": { "damage_type": "bullet", "amount": 120 },
     "recoil": 1000,
     "casing": "40x46mm_m118_casing",
-    "extend": { "effects": [ "SHOT" ] },
-    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "extend": { "effects": [ "SHOT" ] }
   },
   {
     "id": "40x46mm_slug_m118",
@@ -93,8 +90,7 @@
     "//": "Balanced as FMJ.",
     "damage": { "damage_type": "bullet", "amount": 96, "armor_penetration": 42 },
     "recoil": 1000,
-    "casing": "40x46mm_m118_casing",
-    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "casing": "40x46mm_m118_casing"
   },
   {
     "id": "40x46mm_slug_m199",
@@ -107,8 +103,7 @@
     "//": "Balanced as FMJ.",
     "damage": { "damage_type": "bullet", "amount": 96, "armor_penetration": 42 },
     "recoil": 1000,
-    "casing": "40x46mm_m199_casing",
-    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "casing": "40x46mm_m199_casing"
   },
   {
     "id": "40x46mm_flechette_m118",
@@ -122,8 +117,7 @@
     "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
     "recoil": 1000,
     "casing": "40x46mm_m118_casing",
-    "extend": { "effects": [ "SHOT" ] },
-    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "extend": { "effects": [ "SHOT" ] }
   },
   {
     "id": "40x46mm_flechette_m199",
@@ -137,7 +131,6 @@
     "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
     "recoil": 1000,
     "casing": "40x46mm_m199_casing",
-    "extend": { "effects": [ "SHOT" ] },
-    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "extend": { "effects": [ "SHOT" ] }
   }
 ]
diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.json
@@ -7,7 +7,6 @@
     "price": "100 USD",
     "price_postapoc": "60 USD",
     "volume": "260 ml",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "steel", "powder" ],
     "symbol": "=",
     "color": "yellow",
@@ -32,8 +31,7 @@
     "damage": { "damage_type": "bullet", "amount": 91, "armor_penetration": 78 },
     "recoil": 1000,
     "casing": "40x53mm_m169_casing",
-    "extend": { "effects": [ "SHOT" ] },
-    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "extend": { "effects": [ "SHOT" ] }
   },
   {
     "id": "40x53mm_m430a1",
@@ -57,8 +55,7 @@
     "damage": { "damage_type": "bullet", "amount": 130 },
     "recoil": 1200,
     "casing": "40x53mm_m169_casing",
-    "extend": { "effects": [ "SHOT" ] },
-    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "extend": { "effects": [ "SHOT" ] }
   },
   {
     "id": "40x53mm_slug_m169",
@@ -71,7 +68,6 @@
     "//": "Balanced as FMJ.",
     "damage": { "damage_type": "bullet", "amount": 104, "armor_penetration": 46 },
     "recoil": 1200,
-    "casing": "40x53mm_m169_casing",
-    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "casing": "40x53mm_m169_casing"
   }
 ]
diff --git a/data/json/items/ammo/50.json b/data/json/items/ammo/50.json
@@ -41,8 +41,7 @@
     "count": 10,
     "relative": { "damage": { "damage_type": "bullet", "amount": 2, "armor_penetration": -4 } },
     "dispersion": 100,
-    "//": "currently can't be crafted",
-    "extend": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "//": "currently can't be crafted"
   },
   {
     "id": "50ss",
@@ -62,7 +61,6 @@
     "name": { "str": ".50 BMG Raufoss Mk 211" },
     "price": "600 USD",
     "price_postapoc": "75 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "description": "This variant of the .50 BMG round makes the most of the caliber's potential payload delivery: the tip is loaded with an incendiary mix, which ignites on impact, detonating the RDX or PETN charge.  This also ignites a secondary zirconium powder incendiary charge that surrounds a tungsten carbide penetrator, both encased by a mild steel cup.  Fragments from the cup and burning metallic powder follow the penetrator through armored targets, increasing lethality.  These rare, complicated, and expensive rounds are not likely to be manufactured again; use them wisely.",
     "effects": [ "INCENDIARY", "EXPLOSIVE_BIG" ],
     "//": "mk 211 is estimated to be as effective as 20mm, which would have 65kJ energy, or 255 damage. ~181 damage is fair.",

diff --git a/data/json/items/ammo/66mm.json b/data/json/items/ammo/66mm.json
@@ -11,7 +11,6 @@
     "material": [ "steel", "powder" ],
     "volume": "2 L",
     "price_postapoc": "80 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "weight": "1338 g",
     "ammo_type": "m235",
     "damage": { "damage_type": "bullet", "amount": 60, "armor_penetration": 10 },
@@ -32,7 +31,6 @@
     "material": [ "steel", "powder" ],
     "volume": "250 ml",
     "price_postapoc": "80 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "weight": "2100 g",
     "ammo_type": "66mm",
     "damage": { "damage_type": "bullet", "amount": 150, "armor_multiplier": 0.1 },

diff --git a/data/json/items/ammo/84x246mm.json b/data/json/items/ammo/84x246mm.json
@@ -4,7 +4,6 @@
     "id": "84x246mm_he",
     "price": "700 USD",
     "price_postapoc": "120 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "//": "Milspec ammo such as grenades and rockets: not available to the general public, so Expensive.",
     "name": { "str": "84x246mm HE rocket" },
     "symbol": "=",

diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json
@@ -7,7 +7,7 @@
     "description": "Handmade duplicates of Rivtech 8x40mm JHP rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
     "id": "8mm_caseless_reloaded",
@@ -17,7 +17,7 @@
     "description": "Handmade duplicates of Rivtech 8x40mm caseless rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
     "id": "8mm_hvp_reloaded",
@@ -27,7 +27,7 @@
     "description": "Handmade duplicates of Rivtech 8x40mm HVP rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
     "id": "8mm_inc_reloaded",
@@ -37,7 +37,7 @@
     "description": "Handmade duplicates of Rivtech 8x40mm tracer rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
     "id": "8mm_caseless",
@@ -49,7 +49,6 @@
     "volume": "250 ml",
     "price": "225 cent",
     "price_postapoc": "80 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "plastic", "powder" ],
     "symbol": "=",
     "color": "pink",

diff --git a/data/json/items/ammo/atgm.json b/data/json/items/ammo/atgm.json
@@ -4,7 +4,6 @@
     "id": "atgm_heat",
     "price": "700 USD",
     "price_postapoc": "50 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "name": { "str": "152mm ATGM HEAT" },
     "symbol": "=",
     "color": "dark_gray",

diff --git a/data/json/items/ammo/rpg.json b/data/json/items/ammo/rpg.json
@@ -10,7 +10,6 @@
     "material": [ "steel", "powder" ],
     "volume": "1750 ml",
     "price_postapoc": "20 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "weight": "2600 g",
     "ammo_type": "RPG-7",
     "//": "Dedicated anti-tank rockets tend to be assigned armor_multiplier instead of armor_penetration",
@@ -31,7 +30,6 @@
     "material": [ "steel", "powder" ],
     "volume": "2250 ml",
     "price_postapoc": "30 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "weight": "4500 g",
     "ammo_type": "RPG-7",
     "damage": { "damage_type": "bullet", "amount": 200, "armor_multiplier": 0.1 },
@@ -51,7 +49,6 @@
     "material": [ "plastic", "powder" ],
     "volume": "2250 ml",
     "price_postapoc": "40 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "weight": "4500 g",
     "ammo_type": "RPG-7",
     "//": "Antipersonnel rockets and incendiaries meanwhile tend to stick to standard arpen like normal ammo",
@@ -72,7 +69,6 @@
     "material": [ "steel", "powder" ],
     "volume": "1 L",
     "price_postapoc": "15 USD",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "weight": "2000 g",
     "ammo_type": "RPG-7",
     "damage": { "damage_type": "bullet", "amount": 200, "armor_penetration": 10 },

diff --git a/data/json/items/ammo/shot.json b/data/json/items/ammo/shot.json
@@ -107,7 +107,6 @@
     "price": "5 USD",
     "price_postapoc": "2 USD",
     "//": "currently can't be crafted",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 10,
     "damage": { "damage_type": "bash", "amount": 5 },
     "proportional": { "recoil": 0.4, "loudness": 0.6 },
@@ -163,7 +162,6 @@
     "price": "30 USD",
     "price_postapoc": "16 USD",
     "//2": "currently can't be crafted",
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 5,
     "damage": { "damage_type": "bullet", "amount": 30, "armor_penetration": 0 },
     "extend": { "effects": [ "EXPLOSIVE" ] }