Resync item stats against bright nights

Migrate custom g36 magazine to the new stock g36 magazine

9 files changed, 43 insertions, 27 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" ] }
   }
 ]
diff --git a/json/items/gun/000shot.json b/json/items/gun/000shot.json
index 29249d9..0cae47f 100644
--- a/json/items/gun/000shot.json
+++ b/json/items/gun/000shot.json
@@ -9,14 +9,15 @@
     "volume": "2750 ml",
     "looks_like": "USAS_12",
     "price": 300000,
+    "price_postapoc": 8000,
     "to_hit": -1,
     "bashing": 12,
     "material": [ "steel", "plastic" ],
     "ranged_damage": 5,
-    "dispersion": 510,
+    "dispersion": 300,
     "durability": 8,
     "ammo": "000shot",
-    "barrel_length": "100 ml",
+    "barrel_length": "81 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "mechanism", 4 ],
@@ -31,6 +32,6 @@
       [ "underbarrel mount", 1 ]
     ],
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
-    "magazines": [ [ "000shot", [ "hk_caws_mag", "hk_caws_belt" ] ] ]
+    "magazines": [ [ "000shot", [ "hk_caws_mag" ] ] ]
   }
 ]
diff --git a/json/items/gun/223.json b/json/items/gun/223.json
index b3418aa..9f4af57 100644
--- a/json/items/gun/223.json
+++ b/json/items/gun/223.json
@@ -19,7 +19,6 @@
     "type": "GUN",
     "name": { "str": "H&K G36" },
     "description": "Designed as a replacement for the early Heckler & Koch G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity. It was later found to have problems overheating during prolonged firefights, and was phased out of active service in 2016.",
-    "built_in_mods": [ "folding_stock" ],
-    "magazines": [ [ "223", [ "hk_g36_mag", "stanag30", "stanag50", "survivor223mag" ] ] ]
+    "built_in_mods": [ "folding_stock" ]
   }
 ]
diff --git a/json/items/gun/9mm.json b/json/items/gun/9mm.json
index b90ab7e..fb37fa6 100644
--- a/json/items/gun/9mm.json
+++ b/json/items/gun/9mm.json
@@ -11,6 +11,7 @@
     "copy-from": "hk_mp5",
     "type": "GUN",
     "name": { "str": "H&K MP5A4", "str_pl": "H&K MP5A4" },
+    "weight": "2540 g",
     "volume": "1750 ml"
   },
   {
@@ -18,6 +19,7 @@
     "copy-from": "hk_mp5k",
     "type": "GUN",
     "name": { "str": "H&K MP5K-PDW", "str_pl": "H&K MP5K-PDW" },
+    "weight": "2530 g",
     "volume": "1250 ml"
   }
 ]
diff --git a/json/items/magazine/223.json b/json/items/magazine/223.json
index a3a866d..5e30602 100644
--- a/json/items/magazine/223.json
+++ b/json/items/magazine/223.json
@@ -1,13 +1,14 @@
 [
   {
-    "id": "hk_g36_mag",
+    "id": "g36mag_30rd",
     "copy-from": "stanag30",
+    "looks_like": "stanag30",
     "type": "MAGAZINE",
-    "name": { "str": "H&K G36 magazine" },
-    "description": "A 30 round box magazine for the Heckler & Koch G36 rifle.",
+    "name": { "str": "H&K G36 30-round magazine" },
     "weight": "127 g", 
     "material": "plastic",
-    "ammo_type": [ "223" ],
+    "description": "A standard capacity box magazine for use with the H&K G36 assault rifle.",
+    "ammo_type": "223",
     "reliability": 9
   }
 ]
diff --git a/json/items/migration.json b/json/items/migration.json
index 1f9df54..cbe81d4 100644
--- a/json/items/migration.json
+++ b/json/items/migration.json
@@ -8,5 +8,10 @@
     "id": "hk_caws_belt",
     "type": "MIGRATION",
     "replace": "hk_caws_mag"
+  },
+  {
+    "id": "hk_g36_mag",
+    "type": "MIGRATION",
+    "replace": "g36mag_30rd"
   }
 ]