Remove description boilerplate for handloaded and black powder.

Rename and redescribe hand-loaded 9x18mm rounds to more closely match the factory versions.

1 files changed, 11 insertions, 9 deletions

diff --git a/json/items/ammo/9x18.json b/json/items/ammo/9x18.json
index 3c3fc83..aefd8bf 100644
--- a/json/items/ammo/9x18.json
+++ b/json/items/ammo/9x18.json
@@ -49,8 +49,8 @@
     "id": "reloaded_9x18mm",
     "copy-from": "9x18mm",
     "type": "AMMO",
-    "name": { "str_sp": "9x18mm, reloaded" },
-    "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM.  As the designation implies, it is a bit shorter in case length compared to 9mm Parabellum.  This one has been hand-reloaded.",
+    "name": { "str_sp": "9x18mm 57-N-181S, reloaded" },
+    "description": "9x18mm Makarov ammunition with 93gr lead core FMJ bullets.  The 9x18mm round was very common in the Eastern Bloc during the 20th century and remained in Russian military service into the 21st century.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -59,9 +59,7 @@
     "id": "reloaded_9x18mmP2",
     "copy-from": "9x18mmP2",
     "type": "AMMO",
-    "name": { "str_sp": "9x18mm +P+, reloaded" },
-    "//": "Rather than give it a military designation, this is simply handmade overpressure ammo.",
-    "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM.  This one has been hand-reloaded to generate higher internal pressure, boosting flight stability and damage.",
+    "name": { "str_sp": "9x18mm SP-7, 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" ] }
@@ -70,9 +68,10 @@
     "id": "reloaded_9x18mmfmj",
     "copy-from": "9x18mmfmj",
     "type": "AMMO",
-    "name": { "str_sp": "9x18mm FMJ, reloaded" },
-    "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM.  This brass-jacketed round increases penetration slightly, at the cost of reduced expansion.  This one has been hand-reloaded.",
+    "name": { "str_sp": "9x18mm RG028, reloaded" },
+    "description": "9x18mm Makarov RG028 ammunition.  The RG028 round normally uses bullets with a hardened steel core to improve armor penetration, but this knockoff uses a lead core instead.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "relative": { "damage": { "damage_type": "bullet", "amount": 0, "armor_penetration": -4 } },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -80,7 +79,8 @@
     "id": "bp_9x18mm",
     "copy-from": "9x18mm",
     "type": "AMMO",
-    "name": { "str_sp": "9x18mm, black powder" },
+    "name": { "str_sp": "9x18mm 57-N-181S, black powder" },
+    "description": "9x18mm Makarov ammunition with 93gr lead core FMJ bullets.  The 9x18mm round was very common in the Eastern Bloc during the 20th century and remained in Russian military service into the 21st century.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -94,13 +94,15 @@
     "id": "bp_9x18mmfmj",
     "copy-from": "9x18mmfmj",
     "type": "AMMO",
-    "name": { "str_sp": "9x18mm FMJ, black powder" },
+    "name": { "str_sp": "9x18mm RG028, black powder" },
+    "description": "9x18mm Makarov RG028 ammunition.  The RG028 round normally uses bullets with a hardened steel core to improve armor penetration, but this knockoff uses a lead core instead.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
       "recoil": 0.76,
       "dispersion": 1.2
     },
+    "relative": { "damage": { "damage_type": "bullet", "amount": 0, "armor_penetration": -4 } },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }