Overwrite vanilla 40mm ammo.

Also overwrite vanilla 40mm casings.

3 files changed, 242 insertions, 17 deletions

diff --git a/json/items/ammo/40x46mm.json b/json/items/ammo/40x46mm.json
index 522f9d7..0b12c83 100644
--- a/json/items/ammo/40x46mm.json
+++ b/json/items/ammo/40x46mm.json
@@ -1,5 +1,72 @@
 [
   {
+    "abstract": "40x46mm_grenade",
+    "type": "AMMO",
+    "name": { "str": "40x46mm grenade" },
+    "volume": "129 ml",
+    "price": "100 USD",
+    "price_postapoc": "60 USD",
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "material": [ "steel", "powder" ],
+    "symbol": "=",
+    "color": "yellow",
+    "count": 6,
+    "stack_size": 1,
+    "ammo_type": "40x46mm",
+    "range": 60,
+    "damage": { "damage_type": "bullet", "amount": 80 },
+    "dispersion": 30,
+    "recoil": 225,
+    "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
+  },
+  {
+    "id": "40x46mm_m1006",
+    "copy-from": "40x46mm_grenade",
+    "type": "AMMO",
+    "name": { "str": "40x46mm M1006" },
+    "description": "A low velocity less-lethal 40x46mm round with a foam and plastic projectile intended to cause pain and disorientation to the target.  May still injure or kill.",
+    "weight": "68 g",
+    "damage": { "damage_type": "bash", "amount": 20 },
+    "casing": "40x46mm_m212_casing",
+    "extend": { "effects": [ "LARGE_BEANBAG" ] }
+  },
+  {
+    "id": "40x46mm_m433",
+    "copy-from": "40x46mm_grenade",
+    "type": "AMMO",
+    "name": { "str": "40x46mm M433" },
+    "description": "A low velocity 40x46mm HEDP grenade.  It can penetrate 2 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.",
+    "weight": "230 g",
+    "damage": { "damage_type": "bullet", "amount": 200, "armor_penetration": 30 },
+    "casing": "40x46mm_m118_casing",
+    "extend": { "effects": [ "FRAG" ] }
+  },
+  {
+    "id": "40x46mm_m576",
+    "copy-from": "40x46mm_grenade",
+    "type": "AMMO",
+    "name": { "str": "40x46mm M576" },
+    "description": "A 40x46mm buckshot load, designed for use in thick vegetation or room clearing.",
+    "weight": "120 g",
+    "range": 12,
+    "damage": { "damage_type": "bullet", "amount": 120 },
+    "recoil": 1000,
+    "casing": "40x46mm_m199_casing",
+    "extend": { "effects": [ "SHOT" ] }
+  },
+  {
+    "id": "40x46mm_m651",
+    "copy-from": "40x46mm_grenade",
+    "type": "AMMO",
+    "name": { "str": "40x46mm M651" },
+    "description": "A low velocity 40mm tear gas canister.  It is effective for riot control and driving infantry from entrenched positions",
+    "weight": "290 g",
+    "damage": { "damage_type": "bullet", "amount": 15 },
+    "drop": "gasbomb_act",
+    "casing": "40x46mm_m195_casing",
+    "extend": { "effects": [ "NO_EMBED" ] }
+  },
+  {
     "id": "40x46mm_bootleg_m1006",
     "copy-from": "40x46mm_m1006",
     "type": "AMMO",
@@ -53,52 +120,86 @@
   },
   {
     "id": "40x46mm_buckshot_m118",
-    "copy-from": "40x46mm_buckshot_m118",
+    "copy-from": "40x46mm_grenade",
     "type": "AMMO",
     "name": { "str": "40x46mm buckshot" },
-    "extend": { "effects": [ "RECYCLED" ] },
+    "description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into the M118 casing used by M433 HEDP shells.",
+    "weight": "120 g",
+    "range": 10,
+    "damage": { "damage_type": "bullet", "amount": 120 },
+    "recoil": 1000,
+    "casing": "40x46mm_m118_casing",
+    "extend": { "effects": [ "SHOT", "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   { 
     "id": "40x46mm_buckshot_m199",
-    "copy-from": "40x46mm_buckshot_m199",
+    "copy-from": "40x46mm_grenade",
     "type": "AMMO",
     "name": { "str": "40x46mm buckshot" },
-    "extend": { "effects": [ "RECYCLED" ] },
+    "description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into the M199 casing used by M576 buckshot shells.",
+    "weight": "120 g",
+    "range": 10,
+    "damage": { "damage_type": "bullet", "amount": 120 },
+    "recoil": 1000,
+    "casing": "40x46mm_m199_casing",
+    "extend": { "effects": [ "SHOT", "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   { 
     "id": "40x46mm_slug_m118",
-    "copy-from": "40x46mm_slug_m118",
+    "copy-from": "40x46mm_grenade",
     "type": "AMMO",
     "name": { "str": "40x46mm slug" },
+    "description": "An improvised 40x46mm load resembling an oversized shotgun slug, loaded into the M118 casing used by M433 HEDP shells.",
+    "weight": "120 g",
+    "range": 10,
+    "damage": { "damage_type": "bullet", "amount": 120, "armor_penetration": 6 },
+    "recoil": 1000,
+    "casing": "40x46mm_m118_casing",
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   { 
     "id": "40x46mm_slug_m199",
-    "copy-from": "40x46mm_slug_m199",
+    "copy-from": "40x46mm_grenade",
     "type": "AMMO",
     "name": { "str": "40x46mm slug" },
+    "description": "An improvised 40x46mm load resembling an oversized shotgun slug, loaded into the M199 casing used by M576 buckshot shells.",
+    "weight": "120 g",
+    "range": 10,
+    "damage": { "damage_type": "bullet", "amount": 120, "armor_penetration": 6 },
+    "recoil": 1000,
+    "casing": "40x46mm_m199_casing",
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
     "id": "40x46mm_flechette_m118",
-    "copy-from": "40x46mm_flechette_m118",
+    "copy-from": "40x46mm_grenade",
     "type": "AMMO",
     "name": { "str": "40x46mm flechette" },
-    "description": "An improvised 40x46mm flechette load somewhat resembling M1001.",
-    "extend": { "effects": [ "RECYCLED" ] },
+    "description": "An improvised 40x46mm flechette load somewhat resembling M1001, loaded into the M118 casing used by M433 HEDP shells.",
+    "weight": "120 g",
+    "range": 10,
+    "damage": { "damage_type": "bullet", "amount": 75, "armor_penetration": 12 },
+    "recoil": 1000,
+    "casing": "40x46mm_m118_casing",
+    "extend": { "effects": [ "SHOT", "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
     "id": "40x46mm_flechette_m199",
-    "copy-from": "40x46mm_flechette_m199",
+    "copy-from": "40x46mm_grenade",
     "type": "AMMO",
     "name": { "str": "40x46mm flechette" },
-    "description": "An improvised 40x46mm flechette load somewhat resembling M1001.",
-    "extend": { "effects": [ "RECYCLED" ] },
+    "description": "An improvised 40x46mm flechette load somewhat resembling M1001, loaded into the M199 casing used by M576 buckshot shells.",
+    "weight": "120 g",
+    "range": 10,
+    "damage": { "damage_type": "bullet", "amount": 75, "armor_penetration": 12 },
+    "recoil": 1000,
+    "casing": "40x46mm_m199_casing",
+    "extend": { "effects": [ "SHOT", "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   }
 ]
diff --git a/json/items/ammo/40x53mm.json b/json/items/ammo/40x53mm.json
index 1bb9c28..072dd39 100644
--- a/json/items/ammo/40x53mm.json
+++ b/json/items/ammo/40x53mm.json
@@ -1,5 +1,50 @@
 [
   {
+    "abstract": "40x53mm_grenade",
+    "type": "AMMO",
+    "name": { "str": "40x53mm grenade" },
+    "price": "100 USD",
+    "price_postapoc": "60 USD",
+    "volume": "137 ml",
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "material": [ "steel", "powder" ],
+    "symbol": "=",
+    "color": "yellow",
+    "count": 10,
+    "stack_size": 1,
+    "ammo_type": "40x53mm",
+    "range": 60,
+    "damage": { "damage_type": "bullet", "amount": 80 },
+    "dispersion": 30,
+    "recoil": 225,
+    "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
+  },
+  {
+    "id": "40x53mm_m1001",
+    "copy-from": "40x53mm_grenade",
+    "type": "AMMO",
+    "name": { "str": "40x53mm M1001" },
+    "description": "40x53mm canister shot loaded with 17 grain flechettes.",
+    "weight": "340 g",
+    "//": "Balanced as AP.",
+    "range": 10,
+    "damage": { "damage_type": "bullet", "amount": 150, "armor_penetration": 10 },
+    "recoil": 1000,
+    "casing": "40x53mm_m169_casing",
+    "extend": { "effects": [ "SHOT" ] }
+  },
+  {
+    "id": "40x53mm_m430a1",
+    "copy-from": "40x53mm_grenade",
+    "type": "AMMO",
+    "name": { "str": "40x53mm M430A1" },
+    "description": "A high velocity 40x53mm HEDP grenade.  It can penetrate 3 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.",
+    "weight": "340 g",
+    "damage": { "damage_type": "bullet", "amount": 250, "armor_penetration": 45 },
+    "casing": "40x53mm_m169_casing",
+    "extend": { "effects": [ "FRAG" ] }
+  },
+  {
     "id": "40x53mm_bootleg_m1001",
     "copy-from": "40x53mm_m1001",
     "type": "AMMO",
@@ -27,27 +72,44 @@
   },
   { 
     "id": "40x53mm_buckshot_m169",
-    "copy-from": "40x53mm_buckshot_m169",
+    "copy-from": "40x53mm_grenade",
     "type": "AMMO",
     "name": { "str": "40x53mm buckshot" },
-    "extend": { "effects": [ "RECYCLED" ] },
+    "description": "An improvised 40x53mm buckshot load somewhat resembling M576.",
+    "weight": "340 g",
+    "range": 10,
+    "damage": { "damage_type": "bullet", "amount": 130 },
+    "recoil": 1200,
+    "casing": "40x53mm_m169_casing",
+    "extend": { "effects": [ "SHOT", "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   { 
     "id": "40x53mm_slug_m169",
-    "copy-from": "40x53mm_slug_m169",
+    "copy-from": "40x53mm_grenade",
     "type": "AMMO",
     "name": { "str": "40x53mm slug" },
+    "description": "An improvised 40x53mm load resembling an oversized shotgun slug.",
+    "weight": "340 g",
+    "range": 10,
+    "damage": { "damage_type": "bullet", "amount": 130, "armor_penetration": 6 },
+    "recoil": 1200,
+    "casing": "40x53mm_m169_casing",
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
     "id": "40x53mm_flechette_m169",
-    "copy-from": "40x53mm_flechette_m169",
+    "copy-from": "40x53mm_grenade",
     "type": "AMMO",
     "name": { "str": "40x53mm flechette" },
     "description": "An improvised 40x53mm flechette load somewhat resembling M1001.",
-    "extend": { "effects": [ "RECYCLED" ] },
+    "weight": "340 g",
+    "range": 10,
+    "damage": { "damage_type": "bullet", "amount": 85, "armor_penetration": 12 },
+    "recoil": 1200,
+    "casing": "40x53mm_m169_casing",
+    "extend": { "effects": [ "SHOT", "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   }
 ]
diff --git a/json/items/generic/casing.json b/json/items/generic/casing.json
new file mode 100644
index 0000000..08a13be
--- /dev/null
+++ b/json/items/generic/casing.json
@@ -0,0 +1,62 @@
+[
+  {
+    "id": "40x46mm_m212_casing",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "40x46mm M212 casing" },
+    "description": "A leftover canister from a spent M1006 sponge cartridge.  The low pressure tolerance of this canister make it unsuitable for alternate loads.",
+    "weight": "50 g",
+    "volume": "55ml",
+    "material": "steel",
+    "symbol": "=",
+    "color": "dark_gray"
+  },
+  {
+    "id": "40x46mm_m118_casing",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "40x46mm M118 casing" },
+    "description": "A leftover canister from a spent M433 HEDP cartridge.",
+    "weight": "50 g",
+    "volume": "58ml",
+    "material": "steel",
+    "symbol": "=",
+    "color": "dark_gray"
+  },
+  {
+    "id": "40x46mm_m199_casing",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "40x46mm M199 casing" },
+    "description": "A leftover canister from a spent M576 buckshot cartridge.",
+    "weight": "50 g",
+    "volume": "59ml",
+    "material": "steel",
+    "symbol": "=",
+    "color": "dark_gray"
+  },
+  {
+    "id": "40x46mm_m195_casing",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "40x46mm M195 casing" },
+    "description": "A leftover canister from a spent M651 teargas cartridge.  The low pressure tolerance of this canister make it unsuitable for alternate loads.",
+    "weight": "50 g",
+    "volume": "45ml",
+    "material": "steel",
+    "symbol": "=",
+    "color": "dark_gray"
+  },
+  {
+    "id": "40x53mm_m169_casing",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "40x53mm M169 casing" },
+    "description": "A leftover canister from a spent 40x53mm high-velocity cartridge.",
+    "weight": "50 g",
+    "volume": "64ml",
+    "material": "steel",
+    "symbol": "=",
+    "color": "dark_gray"
+  }
+]