Convert CAWS to 000 shot

8 files changed, 194 insertions, 21 deletions

diff --git a/json/ammo_types.json b/json/ammo_types.json
index 2dbc9f6..3b29623 100644
--- a/json/ammo_types.json
+++ b/json/ammo_types.json
@@ -4,6 +4,12 @@
     "id": "473",
     "name": "4.73x33mm",
     "default": "473x33mm"
+  },
+  {
+    "type": "ammunition_type",
+    "id": "000shot",
+    "name": "000 shot",
+    "default": "shot_000"
   }
 ]
  
diff --git a/json/items/ammo/000shot.json b/json/items/ammo/000shot.json
new file mode 100644
index 0000000..c90581e
--- /dev/null
+++ b/json/items/ammo/000shot.json
@@ -0,0 +1,75 @@
+[
+  {
+    "id": "reloaded_shot_000",
+    "copy-from": "shot_000",
+    "type": "AMMO",
+    "name": { "str": "000 shot, reloaded" },
+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "reloaded_shot_000_flechette",
+    "copy-from": "shot_flechette",
+    "type": "AMMO",
+    "name": { "str": "000 flechette shell, reloaded" },
+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "reloaded_shot_000_slug",
+    "copy-from": "shot_slug",
+    "type": "AMMO",
+    "name": { "str": "000 shotgun slug, reloaded" },
+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "shot_000",
+    "type": "AMMO",
+    "name": { "str": "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": 500,
+    "price_postapoc": 3500,
+    "material": [ "plastic", "powder" ],
+    "symbol": "=",
+    "color": "red",
+    "count": 20,
+    "stack_size": 20,
+    "ammo_type": "000shot",
+    "casing": "000shot_hull",
+    "range": 12,
+    "damage": 60,
+    "recoil": 3500,
+    "loudness": 160,
+    "effects": [ "COOKOFF", "SHOT" ]
+  },
+  {
+    "id": "shot_000_flechette",
+    "copy-from": "shot_000",
+    "type": "AMMO",
+    "name": { "str": "000 flechette shell" },
+    "description": "A shotgun shell filled with tiny steel darts. Extremely damaging, plus the spread makes it very accurate at short range. Slices through most forms of armor with ease.",
+    "price": 2000,
+    "price_postapoc": 10000,
+    "count": 10,
+    "relative": { "damage": -5, "pierce": 15 }
+  },
+  {
+    "id": "shot_000_slug",
+    "copy-from": "shot_000",
+    "type": "AMMO",
+    "name": { "str": "000 shotgun slug" },
+    "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle. Extremely damaging but rather inaccurate.",
+    "price": 400,
+    "price_postapoc": 4500,
+    "dispersion": 100,
+    "relative": { "range": 6, "pierce": 5 },
+    "proportional": { "recoil": 1.4 },
+    "delete": { "effects": [ "SHOT" ] }
+  }
+]
diff --git a/json/items/generic/casing.json b/json/items/generic/casing.json
index 650bf40..2f2c6e9 100644
--- a/json/items/generic/casing.json
+++ b/json/items/generic/casing.json
@@ -11,5 +11,19 @@
     "volume": "10ml",
     "charges": 25,
     "stack_size": 25
+  },
+  {
+    "id": "000shot_hull",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "000 shotgun hull" },
+    "description": "An empty hull from a 000 shotgun shell.",
+    "weight": "8 g",
+    "volume": "12ml",
+    "stackable": true,
+    "material": "plastic",
+    "symbol": "=",
+    "color": "red",
+    "damage_states": [ 0, 0 ]
   }
 ]
diff --git a/json/items/gun/shot.json b/json/items/gun/000shot.json
index abeb352..5f94707 100644
--- a/json/items/gun/shot.json
+++ b/json/items/gun/000shot.json
@@ -4,7 +4,7 @@
     "copy-from": "shotgun_base",
     "type": "GUN",
     "name": { "str": "H&K CAWS" },
-    "description": "The H&K CAWS .",
+    "description": "The Heckler & Koch CAWS .",
     "weight": "3700 g",
     "volume": "2750 ml",
     "looks_like": "USAS_12",
@@ -29,6 +29,6 @@
       [ "underbarrel mount", 1 ]
     ],
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
-    "magazines": [ [ "shot", [ "hk_caws_mag", "shotbelt_20" ] ] ]
+    "magazines": [ [ "000shot", [ "hk_caws_mag" ] ] ]
   }
 ]
diff --git a/json/items/magazine/000shot.json b/json/items/magazine/000shot.json
new file mode 100644
index 0000000..baf5b77
--- /dev/null
+++ b/json/items/magazine/000shot.json
@@ -0,0 +1,37 @@
+[
+  {
+    "id": "hk_caws_mag",
+    "looks_like": "shotbelt_20",
+    "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": 4500,
+    "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": 1000,
+    "material": "copper",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "000shot",
+    "capacity": 20,
+    "reliability": 5,
+    "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
deleted file mode 100644
index 292d21a..0000000
--- a/json/items/magazine/shot.json
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-  {
-    "id": "hk_caws_mag",
-    "looks_like": "shotbelt_20",
-    "type": "MAGAZINE",
-    "name": { "str": "H&K CAWS box magazine" },
-    "description": "A removable plastic box magazine for the H&K CAWS shotgun. Holds 10 rounds.",
-    "weight": "210 g",
-    "volume": "500 ml",
-    "price": 4500,
-    "material": "plastic",
-    "symbol": "#",
-    "color": "dark_gray",
-    "ammo_type": "shot",
-    "capacity": 10,
-    "reliability": 9,
-    "flags": [ "MAG_COMPACT" ]
-  }
-]
diff --git a/json/recipes/000shot.json b/json/recipes/000shot.json
new file mode 100644
index 0000000..ba122a1
--- /dev/null
+++ b/json/recipes/000shot.json
@@ -0,0 +1,52 @@
+[
+  {
+    "result": "reloaded_shot_000",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_000_shot", 1 ] ],
+    "tools": [ [ [ "press", -1 ] ] ],
+    "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ]
+  },
+  {
+    "result": "reloaded_shot_000_flechette",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 4 ], [ "manual_shotgun", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "ammo_000_shot", 1 ] ],
+    "tools": [ [ [ "press", -1 ] ] ],
+    "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ], [ [ "combatnail", 10 ] ] ]
+  },
+  {
+    "result": "reloaded_shot_000_slug",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 20 ], [ "ammo_000_shot", 1 ] ],
+    "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ]
+  }
+]
diff --git a/json/requirements/ammo.json b/json/requirements/ammo.json
new file mode 100644
index 0000000..82542e2
--- /dev/null
+++ b/json/requirements/ammo.json
@@ -0,0 +1,8 @@
+[
+  {
+    "id": "ammo_000_shot",
+    "type": "requirement",
+    "//": "Components required for 000 shotgun ammo",
+    "components": [ [ [ "000shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ] ]
+  }
+]