From 474641b26c5a48950f262906e199dae80b42f054 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 21 Jun 2021 01:24:33 -0700
Subject: Rename the 4.6mm round to DM11

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

(limited to 'json')

diff --git a/json/items/ammo/46.json b/json/items/ammo/46.json
index 033f5b1..859f275 100644
--- a/json/items/ammo/46.json
+++ b/json/items/ammo/46.json
@@ -2,8 +2,8 @@
   {
     "id": "46mm",
     "type": "AMMO",
-    "name": { "str": "4.6x30mm" },
-    "description": "4.6x30mm ammunition with 31gr copper plated steel bullets. The DM11 Ultimate Combat round has low recoil and excellent armor penetration.",
+    "name": { "str": "4.6x30mm DM11" },
+    "description": "4.6x30mm ammunition with 31gr copper plated steel bullets. The Ultimate Combat DM11 Penetrator round has low recoil and excellent armor penetration.",
     "weight": "6500 mg",
     "volume": "250 ml",
     "price": 300,
@@ -24,28 +24,32 @@
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
   },
   {
-    "id": "bp_46mm",
+    "id": "reloaded_46mm",
     "copy-from": "46mm",
     "type": "AMMO",
-    "name": { "str": "4.6x30mm, black powder" },
+    "name": { "str": "4.6x30mm DM11, 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": { "damage_type": "stab", "amount": 0.46, "armor_penetration": 0.1 },
-      "recoil": 0.46,
-      "dispersion": 1.2
+      "price": 0.7,
+      "damage": { "damage_type": "stab", "amount": 0.9, "armor_penetration": 0.2 },
+      "dispersion": 1.1
     },
-    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
-    "id": "reloaded_46mm",
+    "id": "bp_46mm",
     "copy-from": "46mm",
     "type": "AMMO",
-    "name": { "str": "4.6x30mm, reloaded" },
+    "name": { "str": "4.6x30mm DM11, 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": { "damage_type": "stab", "amount": 0.9, "armor_penetration": 0.2 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
+    "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" ] }
   }
 ]
-- 
cgit v1.2.1