Clean up the descriptions.

4 files changed, 29 insertions, 19 deletions

diff --git a/json/items/ammo/270win.json b/json/items/ammo/270win.json
index d9812da..53f434d 100644
--- a/json/items/ammo/270win.json
+++ b/json/items/ammo/270win.json
@@ -26,7 +26,8 @@
     "id": "bp_270win_jsp",
     "copy-from": "270win_jsp",
     "type": "AMMO",
-    "name": { "str": ".270 Winchester JSP, black powder" },
+    "name": { "str_sp": ".270 Winchester JSP, black powder" },
+    "description": ".270 Winchester ammunition with a 130gr soft point bullet.  It is a powerful round capable of taking down large targets with ease, but someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 },
@@ -40,7 +41,8 @@
     "id": "reloaded_270win_jsp",
     "copy-from": "270win_jsp",
     "type": "AMMO",
-    "name": { "str": ".270 Winchester JSP, reloaded" },
+    "name": { "str_sp": ".270 Winchester JSP, reloaded" },
+    "description": ".270 Winchester ammunition with a 130gr soft point bullet.  It is a powerful round capable of taking down large targets with ease.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
diff --git a/json/items/ammo/300.json b/json/items/ammo/300.json
index 90c23f9..23e70c6 100644
--- a/json/items/ammo/300.json
+++ b/json/items/ammo/300.json
@@ -3,7 +3,7 @@
     "id": "300_winmag",
     "type": "AMMO",
     "name": { "str": ".300 Winchester Magnum" },
-    "description": ".300 Winchester Magnum rounds with 220gr JHP bullets.  The 300WM round is an extremely powerful and accurate rifle round introduced in 1963.  It has proven popular with hunters and snipers, although it is not as common as .308 or .30-06.",
+    "description": ".300 Winchester Magnum ammunition with 220gr JHP bullets.  The 300WM round is an extremely powerful and accurate rifle round introduced in 1963.  It has proven popular with hunters and snipers, although it is not as common as .308 or .30-06.",
     "weight": "28 g",
     "volume": "250 ml",
     "price": 220,
@@ -26,7 +26,8 @@
     "id": "bp_300_winmag",
     "copy-from": "300_winmag",
     "type": "AMMO",
-    "name": { "str": ".300 Winchester Magnum, black powder" },
+    "name": { "str_sp": ".300 Winchester Magnum, black powder" },
+    "description": ".300 Winchester Magnum ammunition with a 220gr JHP bullet.  The 300WM round is an extremely powerful and accurate rifle round, but someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -40,8 +41,8 @@
     "id": "reloaded_300_winmag",
     "copy-from": "300_winmag",
     "type": "AMMO",
-    "name": { "str": ".300 Winchester Magnum, reloaded" },
-    "description": "The .300 Winchester Magnum is extremely versatile and has been adopted by many shooting disciplines.  The cartridge has found use by hunters, military units, and law enforcement departments.",
+    "name": { "str_sp": ".300 Winchester Magnum, reloaded" },
+    "description": "A .300 Winchester Magnum round, an extremely versatile cartridge that has been adopted by many shooting disciplines, finding use with hunters, military units, and law enforcement departments.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo..",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
diff --git a/json/items/ammo/3006.json b/json/items/ammo/3006.json
index d8abccb..5488c40 100644
--- a/json/items/ammo/3006.json
+++ b/json/items/ammo/3006.json
@@ -2,7 +2,7 @@
   {
     "id": "3006",
     "type": "AMMO",
-    "name": { "str": ".30-06 Springfield" },
+    "name": { "str_sp": ".30-06 Springfield" },
     "description": ".30-06 Springfield rounds with 165gr soft point bullets.  The .30-06 cartridge has excellent accuracy, range, and stopping power making it popular with hunters and snipers for well over a century.",
     "weight": "20 g",
     "volume": "250 ml",
@@ -26,7 +26,7 @@
     "id": "3006_incendiary",
     "copy-from": "3006",
     "type": "AMMO",
-    "name": { "str": ".30-06 M14A1 tracer" },
+    "name": { "str_sp": ".30-06 M14A1 tracer" },
     "description": "Armor piercing incendiary .30-06 M14A1 ammunition containing tracer rounds to help keep the weapon they are fired from on target.  It penetrates all but the strongest body armor with ease.",
     "extend": { "effects": [ "INCENDIARY" ] }
   },
@@ -34,7 +34,7 @@
     "id": "3006fmj",
     "copy-from": "3006",
     "type": "AMMO",
-    "name": { "str": ".30-06 M2 AP" },
+    "name": { "str_sp": ".30-06 M2 AP" },
     "description": "Armor piercing .30-06 M2 ammunition with 168gr FMJ bullets.  It is an extremely powerful and accurate cartridge but pays for its armor penetration abilities with lowered damage.",
     "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } }
   },
@@ -42,7 +42,8 @@
     "id": "bp_3006",
     "copy-from": "3006",
     "type": "AMMO",
-    "name": { "str": ".30-06 Springfield, black powder" },
+    "name": { "str_sp": ".30-06 Springfield, black powder" },
+    "description": ".30-06 Springfield ammunition with a 165gr soft point bullet.  The .30-06 cartridge has excellent accuracy, range, and stopping power making it popular with hunters and snipers for well over a century.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -56,7 +57,8 @@
     "id": "bp_3006_incendiary",
     "copy-from": "3006_incendiary",
     "type": "AMMO",
-    "name": { "str": ".30-06 Springfield tracer, black powder" },
+    "name": { "str_sp": ".30-06 M14A1 tracer, black powder" },
+    "description": ".30-06 M14A1 tracer ammunition to help keep the weapon it is fired from on target.  Someone was down on their luck when they hand-reloaded this - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -70,7 +72,8 @@
     "id": "bp_3006fmj",
     "copy-from": "3006fmj",
     "type": "AMMO",
-    "name": { "str": ".30-06 M2 AP, black powder" },
+    "name": { "str_sp": ".30-06 M2 AP, black powder" },
+    "description": "Armor piercing .30-06 M2 ammunition with a 168gr FMJ bullet.  It is an extremely powerful and accurate cartridge, but pays for its armor penetration abilities with lowered damage.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -84,7 +87,8 @@
     "id": "reloaded_3006",
     "copy-from": "3006",
     "type": "AMMO",
-    "name": { "str": ".30-06 Springfield, reloaded" },
+    "name": { "str_sp": ".30-06 Springfield, reloaded" },
+    "description": ".30-06 Springfield ammunition with a 165gr soft point bullet.  The .30-06 cartridge has excellent accuracy, range, and stopping power making it popular with hunters and snipers for well over a century.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -93,7 +97,8 @@
     "id": "reloaded_3006_incendiary",
     "copy-from": "3006_incendiary",
     "type": "AMMO",
-    "name": { "str": ".30-06 incendiary, reloaded" },
+    "name": { "str_sp": ".30-06 M14A1 tracer, reloaded" },
+    "description": ".30-06 M14A1 tracer ammunition to help keep the weapon it is fired from on target.  It's been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -102,7 +107,8 @@
     "id": "reloaded_3006fmj",
     "copy-from": "3006fmj",
     "type": "AMMO",
-    "name": { "str": ".30-06 M2 AP, reloaded" },
+    "name": { "str_sp": ".30-06 M2 AP, reloaded" },
+    "description": "Armor piercing .30-06 M2 ammunition with a 168gr FMJ bullet.  It is an extremely powerful and accurate cartridge, but pays for its armor penetration abilities with lowered damage.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
diff --git a/json/items/ammo/300blk.json b/json/items/ammo/300blk.json
index cea119f..6d774f3 100644
--- a/json/items/ammo/300blk.json
+++ b/json/items/ammo/300blk.json
@@ -26,7 +26,7 @@
     "id": "300blk_ss",
     "copy-from": "300blk",
     "type": "AMMO",
-    "name": { "str": ".300 AAC Blackout, subsonic" },
+    "name": { "str": ".300 AAC Blackout, subsonic", "str_pl": ".300 AAC Blackouts, subsonic" },
     "description": "A subsonic .300 AAC Blackout round with a 220gr open tip match bullet.  300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm.  It is compatible with standard AR-15 lower receivers and will feed from STANAG magazines.",
     "weight": "21 g",
     "range": 40,
@@ -37,7 +37,8 @@
     "id": "bp_300blk",
     "copy-from": "300blk",
     "type": "AMMO",
-    "name": { "str": ".300 AAC Blackout, black powder" },
+    "name": { "str": ".300 AAC Blackout, black powder", "str_pl": ".300 AAC Blackouts, black powder" },
+    "description": "A .300 AAC Blackout round with a 125gr bullet.  300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -51,8 +52,8 @@
     "id": "reloaded_300blk",
     "copy-from": "300blk",
     "type": "AMMO",
-    "name": { "str": ".300 AAC Blackout, reloaded" },
-    "description": ".300 AAC Blackout is an intermediate cartridge that achieves ballistics similar to the 7.62x39 but allows use on the AR-15 platform.  The round is necked-up from the 5.56mm NATO, but feeds from a STANAG magazine.  It requires a specific barrel, so will not work in a standard M4 or similar carbine.",
+    "name": { "str": ".300 AAC Blackout, reloaded", "str_pl": ".300 AAC Blackouts, reloaded" },
+    "description": "A .300 AAC Blackout round, an intermediate cartridge that achieves ballistics similar to the 7.62x39 but allows use on the AR-15 platform.  The round is necked-up from the 5.56mm NATO, but feeds from a STANAG magazine.  It requires a specific barrel, so will not work in a standard M4 or similar carbine.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }