Convert the CAWS to 00shot.

-Obsolete 000 shells that aren't buckshot.

6 files changed, 113 insertions, 100 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" ] }
+  }
+]
diff --git a/json/items/gun/000shot.json b/json/items/gun/shot.json
index 25a96bb..0c1a329 100644
--- a/json/items/gun/000shot.json
+++ b/json/items/gun/shot.json
@@ -16,7 +16,7 @@
     "ranged_damage": 5,
     "dispersion": 300,
     "durability": 8,
-    "ammo": [ "000shot" ],
+    "ammo": [ "shot" ],
     "barrel_length": "81 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
@@ -32,6 +32,6 @@
     ],
     "magazine_well": "250 ml",
     "modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 2 ] ],
-    "magazines": [ [ "000shot", [ "hk_caws_mag" ] ] ]
+    "magazines": [ [ "shot", [ "hk_caws_mag" ] ] ]
   }
 ]
diff --git a/json/items/magazine/000shot.json b/json/items/magazine/000shot.json
deleted file mode 100644
index 1a06b6e..0000000
--- a/json/items/magazine/000shot.json
+++ /dev/null
@@ -1,39 +0,0 @@
-[
-  {
-    "id": "hk_caws_mag",
-    "looks_like": "saiga10mag",
-    "type": "MAGAZINE",
-    "name": { "str": "H&K CAWS box magazine" },
-    "description": "A removable plastic box magazine for the H&K CAWS shotgun. Holds 10 shells.",
-    "weight": "210 g",
-    "volume": "500 ml",
-    "price": 30000,
-    "price_postapoc": 175,
-    "material": [ "plastic" ],
-    "symbol": "#",
-    "color": "dark_gray",
-    "ammo_type": [ "000shot" ],
-    "capacity": 10,
-    "reliability": 9,
-    "flags": [ "MAG_COMPACT" ]
-  },
-  { 
-    "id": "hk_caws_belt",
-    "looks_like": "shotbelt_20",
-    "type": "MAGAZINE",
-    "name": { "str": "H&K CAWS belt magazine" },
-    "description": "A brass ammo belt for the H&K CAWS shotgun. Holds 20 shells.",
-    "weight": "500 g",
-    "volume": "500 ml",
-    "price": 30000,
-    "price_postapoc": 175,
-    "material": [ "copper" ],
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": [ "000shot" ],
-    "capacity": 20,
-    "reliability": 6,
-    "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 2 },
-    "flags": [ "MAG_EJECT", "BELTED", "OVERSIZE", "WATER_FRIENDLY" ]
-  }
-]
diff --git a/json/items/magazine/shot.json b/json/items/magazine/shot.json
new file mode 100644
index 0000000..ac22067
--- /dev/null
+++ b/json/items/magazine/shot.json
@@ -0,0 +1,20 @@
+[
+  {
+    "id": "hk_caws_mag",
+    "looks_like": "saiga10mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K CAWS box magazine" },
+    "description": "A removable plastic box magazine for the H&K CAWS shotgun. Holds 10 shells.",
+    "weight": "210 g",
+    "volume": "500 ml",
+    "price": 30000,
+    "price_postapoc": 175,
+    "material": [ "plastic" ],
+    "symbol": "#",
+    "color": "dark_gray",
+    "ammo_type": [ "shot" ],
+    "capacity": 10,
+    "reliability": 9,
+    "flags": [ "MAG_COMPACT" ]
+  }
+]
diff --git a/json/items/migration.json b/json/items/migration.json
index cbe81d4..31668a3 100644
--- a/json/items/migration.json
+++ b/json/items/migration.json
@@ -5,13 +5,43 @@
     "replace": "hk_ucp"
   },
   {
-    "id": "hk_caws_belt",
+    "id": "shot_000_flechette",
     "type": "MIGRATION",
-    "replace": "hk_caws_mag"
+    "replace": "shot_flechette"
   },
   {
-    "id": "hk_g36_mag",
+    "id": "reloaded_shot_000_flechette",
     "type": "MIGRATION",
-    "replace": "g36mag_30rd"
+    "replace": "reloaded_shot_flechette"
+  },
+  {
+    "id": "shot_000_slug",
+    "type": "MIGRATION",
+    "replace": "shot_slug"
+  },
+  {
+    "id": "reloaded_shot_000_slug",
+    "type": "MIGRATION",
+    "replace": "reloaded_shot_slug"
+  },
+  {
+    "id": "shot_000_beanbag",
+    "type": "MIGRATION",
+    "replace": "shot_beanbag"
+  },
+  {
+    "id": "shot_000_he",
+    "type": "MIGRATION",
+    "replace": "shot_he"
+  },
+  {
+    "result": "reloaded_shot_000_flechette",
+    "type": "recipe",
+    "obsolete": true
+  },
+  {
+    "result": "reloaded_shot_000_slug",
+    "type": "recipe",
+    "obsolete": true
   }
 ]