Convert the CAWS to 00shot.

-Obsolete 000 shells that aren't buckshot.

2 files changed, 57 insertions, 55 deletions

diff --git a/json/items/ammo/000shot.json b/json/items/ammo/obsolete.json
index 80d658b..7f2de99 100644
--- a/json/items/ammo/000shot.json
+++ b/json/items/ammo/obsolete.json
@@ -1,29 +1,5 @@
 [
   {
-    "id": "shot_000",
-    "type": "AMMO",
-    "looks_like": "shot_00",
-    "name": { "str_sp": "000 shot" },
-    "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces.",
-    "weight": "32 g",
-    "volume": "250 ml",
-    "price": 750,
-    "price_postapoc": 1200,
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-    "material": [ "plastic", "powder" ],
-    "symbol": "=",
-    "color": "red",
-    "count": 20,
-    "stack_size": 20,
-    "ammo_type": "000shot",
-    "casing": "000shot_hull",
-    "range": 12,
-    "damage": { "damage_type": "bullet", "amount": 60 },
-    "recoil": 3500,
-    "loudness": 160,
-    "effects": [ "COOKOFF", "SHOT" ]
-  },
-  {
     "id": "shot_000_flechette",
     "copy-from": "shot_000",
     "looks_like": "shot_flechette",
@@ -63,17 +39,6 @@
     "extend": { "effects": [ "BEANBAG", "NOGIB" ] }
   },
   {
-    "id": "shot_000_inc",
-    "copy-from": "shot_000",
-    "looks_like": "shot_dragon",
-    "type": "AMMO",
-    "name": { "str_sp": "000 incendiary shell" },
-    "description": "A shell filled with a mix of metal and incendiary pellets. Damaging, and may cause flammable material to ignite.",
-    "price": 1500,
-    "price_postapoc": 2400,
-    "extend": { "effects": [ "INCENDIARY" ] }
-  },
-  {
     "id": "shot_000_he",
     "copy-from": "shot_000",
     "looks_like": "shot_he",
@@ -88,16 +53,6 @@
     "extend": { "effects": [ "EXPLOSIVE" ] }
   },
   {
-    "id": "reloaded_shot_000",
-    "copy-from": "shot_000",
-    "type": "AMMO",
-    "name": { "str_sp": "000 shot, reloaded" },
-    "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  SWAT forces wouldn't use this homebrew shell, but a sovereign citizen looking to fend off SWAT probably would.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "reloaded_shot_000_flechette",
     "copy-from": "shot_000_flechette",
     "type": "AMMO",
@@ -116,15 +71,5 @@
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_shot_000_inc",
-    "copy-from": "shot_000_inc",
-    "type": "AMMO",
-    "name": { "str_sp": "000 incendiary shell, reloaded" },
-    "description": "A shell filled with a mix of metal and incendiary pellets. Damaging, and may cause flammable material to ignite.  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/shot.json b/json/items/ammo/shot.json
new file mode 100644
index 0000000..8bcaf23
--- /dev/null
+++ b/json/items/ammo/shot.json
@@ -0,0 +1,57 @@
+[
+  {
+    "id": "shot_000",
+    "type": "AMMO",
+    "looks_like": "shot_00",
+    "name": { "str_sp": "12g 000 buckshot" },
+    "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces.",
+    "weight": "32 g",
+    "volume": "250 ml",
+    "price": 750,
+    "price_postapoc": 1200,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "material": [ "plastic", "powder" ],
+    "symbol": "=",
+    "color": "red",
+    "count": 20,
+    "stack_size": 20,
+    "ammo_type": "shot",
+    "casing": "shot_hull",
+    "range": 12,
+    "damage": { "damage_type": "bullet", "amount": 60 },
+    "recoil": 3500,
+    "loudness": 160,
+    "effects": [ "COOKOFF", "SHOT" ]
+  },
+  {
+    "id": "shot_000_inc",
+    "copy-from": "shot_000",
+    "looks_like": "shot_dragon",
+    "type": "AMMO",
+    "name": { "str_sp": "12g 000 incendiary" },
+    "description": "A shell filled with a mix of metal and incendiary pellets. Damaging, and may cause flammable material to ignite.",
+    "price": 1500,
+    "price_postapoc": 2400,
+    "extend": { "effects": [ "INCENDIARY" ] }
+  },
+  {
+    "id": "reloaded_shot_000",
+    "copy-from": "shot_000",
+    "type": "AMMO",
+    "name": { "str_sp": "12g 000 buckshot, reloaded" },
+    "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  SWAT forces wouldn't use this homebrew shell, but a sovereign citizen looking to fend off SWAT probably would.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_shot_000_inc",
+    "copy-from": "shot_000_inc",
+    "type": "AMMO",
+    "name": { "str_sp": "12g 000 incendiary, reloaded" },
+    "description": "A shell filled with a mix of metal and incendiary pellets. Damaging, and may cause flammable material to ignite.  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" ] }
+  }
+]