From 618a6c701f38565eba5ab06d2b8a3765d0a3daf2 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 11 May 2021 01:04:35 -0700
Subject: Resync item stats against bright nights Migrate custom g36 magazine
 to the new stock g36 magazine

---
 json/items/ammo/46.json | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'json/items/ammo/46.json')

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" ] }
   }
 ]
-- 
cgit v1.2.1