From 3a01476d4b2531c7af9eed491b6b48d754826930 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 2 Jun 2021 16:00:32 -0700
Subject: Add 000shot variants - Explosive, Incendiary, Beanbag Add 000shot
 Reloaded Variant - Incendiary Add drop tables and recipes for the new shot
 types

---
 json/itemgroups/Weapons_Mods_Ammo/ammo.json |  8 +++--
 json/items/ammo/000shot.json                | 47 +++++++++++++++++++++++++++++
 json/recipes/000shot.json                   | 18 ++++++++++-
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/json/itemgroups/Weapons_Mods_Ammo/ammo.json
index 4f7970f..ad791c8 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/ammo.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/ammo.json
@@ -14,6 +14,7 @@
     "//": "Less common shotgun ammo including that only used by police/paramilitary forces.",
     "subtype": "distribution",
     "entries": [
+      { "item": "shot_000_beanbag", "prob": 15 },
       { "item": "shot_000", "prob": 60 },
       { "item": "shot_000_slug", "prob": 30 }
     ]
@@ -24,7 +25,9 @@
     "//": "Military specification shotgun ammo found at military sites.",
     "subtype": "distribution",
     "entries": [
-      { "item": "shot_000_flechette", "prob": 80 }
+      { "item": "shot_000_he", "prob": 15 },
+      { "item": "shot_000_flechette", "prob": 80 },
+      { "item": "shot_000_inc", "prob": 30 }
     ]
   },
   {
@@ -35,7 +38,8 @@
     "entries": [
       { "item": "reloaded_shot_000", "prob": 80 },
       { "item": "reloaded_shot_000_flechette", "prob": 2 },
-      { "item": "reloaded_shot_000_slug", "prob": 10 }
+      { "item": "reloaded_shot_000_slug", "prob": 10 },
+      { "item": "reloaded_shot_000_inc", "prob": 7 }
     ]
   }
 ]
diff --git a/json/items/ammo/000shot.json b/json/items/ammo/000shot.json
index b0a7de8..d2521db 100644
--- a/json/items/ammo/000shot.json
+++ b/json/items/ammo/000shot.json
@@ -26,6 +26,15 @@
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
+  {
+    "id": "reloaded_shot_000_inc",
+    "copy-from": "shot_000_inc",
+    "type": "AMMO",
+    "name": { "str": "000 incendiary shell, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
   {
     "id": "shot_000",
     "type": "AMMO",
@@ -74,5 +83,43 @@
     "relative": { "range": 12, "damage": { "damage_type": "stab", "armor_penetration": 8 }, "dispersion": 100 },
     "proportional": { "recoil": 1.4 },
     "delete": { "effects": [ "SHOT" ] }
+  },
+  {
+    "id": "shot_000_beanbag",
+    "copy-from": "shot_000",
+    "looks_like": "shot_beanbag",
+    "type": "AMMO",
+    "name": { "str": "000 shotgun beanbag" },
+    "description": "A beanbag round for shotguns, not deadly but designed to disable.",
+    "price": 750,
+    "price_postapoc": 1500,
+    "proportional": { "damage": { "damage_type": "stab", "amount": 0.1 }, "recoil": 0.4, "loudness": 0.6 },
+    "delete": { "effects": [ "SHOT" ] },
+    "extend": { "effects": [ "BEANBAG", "NOGIB" ] }
+  },
+  {
+    "id": "shot_000_inc",
+    "copy-from": "shot_000",
+    "looks_like": "shot_dragon",
+    "type": "AMMO",
+    "name": { "str": "000 incendiary shell" },
+    "description": "A shell filled with a mix of metal and magnesium pellets. Damaging, and may cause flammable material to ignite.",
+    "price": 1500,
+    "price_postapoc": 3000,
+    "extend": { "effects": [ "INCENDIARY" ] }
+  },
+  {
+    "id": "shot_000_he",
+    "copy-from": "shot_000",
+    "looks_like": "shot_he",
+    "type": "AMMO",
+    "name": { "str": "000 explosive slug" },
+    "description": "A shotgun shell shooting a small explosive.  Damaging, but rather inaccurate and short ranged.  Banned in several states.",
+    "price": 6000,
+    "price_postapoc": 12000,
+    "count": 5,
+    "proportional": { "damage": { "damage_type": "stab", "amount": 0.25, "armor_penetration": 0.25 } },
+    "delete": { "effects": [ "SHOT" ] },
+    "extend": { "effects": [ "FRAG_SMALL" ] }
   }
 ]
diff --git a/json/recipes/000shot.json b/json/recipes/000shot.json
index ba122a1..d86975b 100644
--- a/json/recipes/000shot.json
+++ b/json/recipes/000shot.json
@@ -16,6 +16,22 @@
     "tools": [ [ [ "press", -1 ] ] ],
     "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ]
   },
+  {
+    "result": "reloaded_shot_000_inc",
+    "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", 3 ], [ "manual_shotgun", 3 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 20 ], [ "ammo_000_shot", 1 ] ],
+    "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_pistol", 5 ], [ "gunpowder_shotgun", 5 ] ], [ [ "magnesium", 5 ] ] ]
+  }
   {
     "result": "reloaded_shot_000_flechette",
     "type": "recipe",
@@ -48,5 +64,5 @@
     "reversible": true,
     "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 20 ], [ "ammo_000_shot", 1 ] ],
     "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ]
-  }
+  },
 ]
-- 
cgit v1.2.1