Resync item stats against bright nights

Migrate custom g36 magazine to the new stock g36 magazine

4 files changed, 26 insertions, 18 deletions

diff --git a/json/items/ammo/000shot.json b/json/items/ammo/000shot.json
index 0647770..5f74725 100644
--- a/json/items/ammo/000shot.json
+++ b/json/items/ammo/000shot.json
@@ -6,7 +6,7 @@
     "name": { "str": "000 shot, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "reloaded_shot_000_flechette",
@@ -15,7 +15,7 @@
     "name": { "str": "000 flechette shell, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "reloaded_shot_000_slug",
@@ -24,7 +24,7 @@
     "name": { "str": "000 shotgun slug, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "shot_000",
@@ -36,6 +36,7 @@
     "volume": "250 ml",
     "price": 500,
     "price_postapoc": 3500,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "plastic", "powder" ],
     "symbol": "=",
     "color": "red",
diff --git a/json/items/ammo/12mm.json b/json/items/ammo/12mm.json
index e9edd84..eb641ce 100644
--- a/json/items/ammo/12mm.json
+++ b/json/items/ammo/12mm.json
@@ -8,6 +8,6 @@
     "description": "Handcrafted bootleg duplicates of the 12mm projectiles used in H&K railguns. Normally made of cobalt, these knockoffs are made of more readily available steel instead.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/46.json b/json/items/ammo/46.json
index 2e1f85f..1039cbe 100644
--- a/json/items/ammo/46.json
+++ b/json/items/ammo/46.json
@@ -7,7 +7,8 @@
     "weight": "6500 mg",
     "volume": "250 ml",
     "price": 300,
-    "price_postapoc": 5200,
+    "price_postapoc": 1600,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "steel", "powder" ],
     "symbol": "=",
     "color": "dark_gray",
@@ -16,30 +17,35 @@
     "ammo_type": "46",
     "casing": "46mm_casing",
     "range": 14,
-    "damage": 18,
-    "pierce": 20,
+    "//": "Base damage of 20, balance increase of one third.",
+    "damage": { "damage_type": "stab", "amount": 24, "armor_penetration": 24 },
     "dispersion": 40,
     "recoil": 90,
     "effects": [ "COOKOFF" ]
   },
   {
-    "id": "reloaded_46mm",
+    "id": "bp_46mm",
     "copy-from": "46mm",
     "type": "AMMO",
-    "name": { "str": "4.6x30mm, reloaded" },
+    "name": { "str": "4.6x30mm, black powder" },
     "description": "4.6x30mm ammunition with 31gr copper plated lead bullets.  It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
-    "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.2, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "stab", "amount": 0.46, "armor_penetration": 0.1 },
+      "recoil": 0.46,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
-    "id": "bp_46mm",
+    "id": "reloaded_46mm",
     "copy-from": "46mm",
     "type": "AMMO",
-    "name": { "str": "4.6x30mm, black powder" },
+    "name": { "str": "4.6x30mm, reloaded" },
     "description": "4.6x30mm ammunition with 31gr copper plated lead bullets.  It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
-    "proportional": { "price": 0.3, "damage": 0.46, "recoil": 0.46, "pierce": 0.1, "dispersion": 1.2 },
-    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9, "armor_penetration": 0.2 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/473.json b/json/items/ammo/473.json
index f9e2ba5..ced42dd 100644
--- a/json/items/ammo/473.json
+++ b/json/items/ammo/473.json
@@ -9,6 +9,7 @@
     "volume": "250 ml",
     "price": 225,
     "price_postapoc": 12500,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "plastic", "powder" ],
     "symbol": "=",
     "color": "pink",
@@ -30,6 +31,6 @@
     "description": "Handcrafted bootleg duplicates of 4.73x33mm caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]