Updated to 2023-09-10-2111

Start work porting out as much ammo changes as possible to my ammo rebalance mod.

5 files changed, 219 insertions, 489 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ff26595..0fd5b92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202309090205
-_pkgver=2023-09-09-0205
+pkgver=202309102111
+_pkgver=2023-09-10-2111
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -53,13 +53,13 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-17_Rivtech-mainline-3092.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
-        "ammo-02_fix-20x66mm-loudness.patch"
         "ammo-03_fix-reloaded-50bmg.patch"
         "ammo-04_4570-can-be-dismantled.patch"
         "ammo-05_22-casings-can-stack.patch"
-        "ammo-06_fix-bp-scrap-not-being-bp.patch"
+        #"ammo-06_fix-bp-scrap-not-being-bp.patch"
         "ammo-10_ammo-order-fix.patch"
         "ammo-11_fix-volume-40mm.patch"
+        "ammo-12_fix-20x66mm-loudness.patch"
 
         "armor-01_ankle-ammo-pouch-is-not-a-backpack.patch"
         "armor-02_fix-survivor-fingerless-gloves-warmth.patch"
@@ -154,7 +154,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         )
-b2sums=('4f0fffc78819a4fdeb8849687957debc474d6f8c8a404a0a1ed4bb0e69c15eb3b89467a865a6aa7c3bf92cc7c2dae534b8a9fc2a666565ff15e0c35be3eaba8c'
+b2sums=('dae58c5c46e8dbfd252185f20a064ff150057b6051aaf5d3b4efb83d1fb10332056f2fbecfcc747ac87b4633126328208db59cb796f87fcc789170ac6cdfcb2f'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -166,22 +166,21 @@ b2sums=('4f0fffc78819a4fdeb8849687957debc474d6f8c8a404a0a1ed4bb0e69c15eb3b89467a
         'ca7b1e96dbd399315b40ca789dad9b5c573a164231834a6a3b8448ab4d98787dc66264e9fc9cf230a06ab58ad4308520f8cadfd79ab8e8a6daf377d98a496490'
         'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543'
         '43d89f815f7c7d7e57463174ad3bfa304a21c93dd34659dfa95824582f482fb97ef70f6d4c83be29b2b10b22c27ff1d19ce4ea1e2a0653fce35d53cdb30fb897'
-        'f5b86b4ec58cb1f5f7f8033656a8ee3db912738fbc68d059a260ee2d17256ab63651a488a0678a43a5757854fc489089cc69ea0ed23c9ef6113855d122e281d1'
+        'a2f5d904c4671b05bcbbf3ffffcc1b3bcbeaec13406151103121c66bc4fbce2476b2c607af81447c0409e0065722ec87b740aaa01dc65001a6fc4f8abb76ac62'
         '7311e7cfaf4c47ac2cc62ec2590c7f5b09b86615400f87f47bc62418d0028dc78ef88380022a70cbdb5e542becee9ad443cbf03e2793443d0e11656e91c0abc5'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
         '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
         '63718656a6b1cd6e0d9dbff81190ac1b6113b08afd919d0015c708406a7a549718af6c3f9f8239514aedfe1ccf5c8a69207c43a675644fc990c713e8e31d007c'
         '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5'
         '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f'
-        '02b3ff03cd2f6b74e65c31874a0ed91918cab1bb7272516c7565f7f68f0a96a9a3a837f19f2431470da455084dea6d481875258f01a45e9249aafac879007746'
+        '4553fedafaeee3081857d31eaad0de75c3bb2a08e6dfdf28641351c6dfac835a0a410149402db82330a76181d4b3a19759dfd96e5a52e770732de18b0c319969'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
-        '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
         '376d0750c18f4218f8df74c5c311b17d7ff6181829831ddc51edf5b318ac3fa149c3d6b9b6ed0b39d34904974e8ae2d3588258844b4831198d4116397c60b14d'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
-        '2ebc9d61438ef1439a3dcfae7e56f2f4cb1d4410faadd2e018359b6c4711abdcd474f2eeb2d23e531a523caea19ec40d820b60c0b8cdaf04223ca9eed1119ec7'
-        '3ac6e8027230400c1e86466b2143ab1bde4455a8381862a6e6d35c5deefee3369021312a3e070bbc5978bdf78fee691096bad3084e4303d3ffa642d14fbdb2f6'
+        '5d5fb4cd0a686f1a67cc696d9a3c8f29f5555289b561a9379f67e927ac02e6d23ad0710f9a97bde84f8104be36d8d118a1c26471c994c639069720ec90c38047'
         '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
+        '365e1ac9f9ee636f2578f6fd8ab16b6460894cb9b76cf0aee5d8a55f42d882d6ee0b04e80194f4c346bfdb0778e11e30b8c03541b4d351602ccfd63cee7e3cf0'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
         '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3'
@@ -286,7 +285,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-09-09-0205"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-09-10-2111"|' Makefile
 
 
   # # # Hotfixes
@@ -296,6 +295,7 @@ prepare() {
   # # # Reverts
   echo "Applying revert patches"
   # # Revert mainline craftable rivtech ammo
+  #echo "Applying revert-17_Rivtech-mainline-3092.patch"
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-17_Rivtech-mainline-3092.patch
 
   # # More reverts for generic night vision
@@ -356,11 +356,6 @@ prepare() {
   # Fix mulitple inconsistent ammunition names and handloaded status.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-01_inconsistent-ammo-names.patch
 
-  # Set a fixed loudness for 20x66mm shotgun shells like that of other shotguns:
-  # Other shotguns have fixed loudness to work around how the short range causes the loudness value to be far lower than one would otherwise expect.
-  # Abstract change, so this cannot be fixed by a mod.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-02_fix-20x66mm-loudness.patch
-
   # Change reloaded_50bmg to be based on 50bmg:
   # The id and description make it pretty clear that reloaded_50bmg is not supposed to be based on Match rounds.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-03_fix-reloaded-50bmg.patch
@@ -373,7 +368,8 @@ prepare() {
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-05_22-casings-can-stack.patch
 
   # Fix black powder scrap shot not being flagged as black powder.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-06_fix-bp-scrap-not-being-bp.patch
+  # Offloaded to ammo rebalance mod
+  #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-06_fix-bp-scrap-not-being-bp.patch
 
   # Fix ammo ordering so as to not prevent those items being modded:
   # Having copy-from items occuring earlier in a json than the item being copied from prevents items based on it being modified.
@@ -383,6 +379,11 @@ prepare() {
   # Changing abstracts with mods does not seem to work, so here this is.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-11_fix-volume-40mm.patch
 
+  # Set a fixed loudness for 20x66mm shotgun shells like that of other shotguns:
+  # Other shotguns have fixed loudness to work around how the short range causes the loudness value to be far lower than one would otherwise expect.
+  # Abstract change, so this cannot be fixed by a mod.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-12_fix-20x66mm-loudness.patch
+
 
   # # armor fixes
   echo "Applying armor fixes"
diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch
index fdface4..502c1bc 100644
--- a/ammo-10_ammo-order-fix.patch
+++ b/ammo-10_ammo-order-fix.patch
@@ -1,6 +1,6 @@
 --- a/data/json/items/ammo/20x66mm.json
 +++ b/data/json/items/ammo/20x66mm.json
-@@ -1,7 +1,38 @@
+@@ -1,5 +1,35 @@
  [
    {
 +    "abstract": "20x66_shot_abstract",
@@ -19,10 +19,9 @@
 +    "count": 20,
 +    "stack_size": 20,
 +    "ammo_type": "20x66mm",
-+    "range": 12,
-+    "damage": { "damage_type": "bullet", "amount": 60 },
++    "range": 20,
++    "damage": { "damage_type": "bullet", "amount": 100 },
 +    "recoil": 2500,
-+    "loudness": 160,
 +    "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
 +  },
 +  {
@@ -35,12 +34,9 @@
 +  },
 +  {
      "id": "20x66_beanbag",
--    "copy-from": "20x66_shot",
-+    "copy-from": "20x66_shot_abstract",
+     "copy-from": "20x66_shot",
      "type": "AMMO",
-     "name": { "str": "20x66mm beanbag" },
-     "description": "20x66mm caseless shotgun rounds, sublethal beanbag type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
-@@ -14,6 +46,18 @@
+@@ -14,6 +45,19 @@
      "extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] }
    },
    {
@@ -53,13 +49,14 @@
 +    "price_postapoc": 4000,
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 +    "count": 10,
-+    "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } }
++    "//": "Balanced as AP.",
++    "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } }
 +  },
 +  {
-     "id": "20x66_bootleg_flechette",
+     "id": "20x66_flechette_reloaded",
      "copy-from": "20x66_flechette",
      "type": "AMMO",
-@@ -34,6 +78,20 @@
+@@ -34,6 +78,21 @@
      "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
    },
    {
@@ -71,16 +68,17 @@
 +    "price": 1500,
 +    "price_postapoc": 4000,
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-+    "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 },
-+    "relative": { "range": 12 },
++    "//": "Balanced as FMJ",
++    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 },
++    "relative": { "range": 20 },
 +    "proportional": { "dispersion": 1.3 },
 +    "delete": { "effects": [ "SHOT" ] }
 +  },
 +  {
-     "id": "20x66_bootleg_slug",
+     "id": "20x66_slug_reloaded",
      "copy-from": "20x66_slug",
      "type": "AMMO",
-@@ -75,18 +133,6 @@
+@@ -75,19 +134,6 @@
      "effects": [ "NO_EMBED" ]
    },
    {
@@ -93,13 +91,14 @@
 -    "price_postapoc": 4000,
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 -    "count": 10,
--    "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } }
+-    "//": "Balanced as AP.",
+-    "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } }
 -  },
 -  {
      "id": "20x66_frag",
      "copy-from": "20x66_slug",
      "type": "AMMO",
-@@ -110,50 +156,5 @@
+@@ -111,50 +157,5 @@
      "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
      "count": 10,
      "extend": { "effects": [ "INCENDIARY" ] }
@@ -121,10 +120,9 @@
 -    "count": 20,
 -    "stack_size": 20,
 -    "ammo_type": "20x66mm",
--    "range": 12,
--    "damage": { "damage_type": "bullet", "amount": 60 },
+-    "range": 20,
+-    "damage": { "damage_type": "bullet", "amount": 100 },
 -    "recoil": 2500,
--    "loudness": 160,
 -    "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
 -  },
 -  {
@@ -144,8 +142,9 @@
 -    "price": 1500,
 -    "price_postapoc": 4000,
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
--    "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 },
--    "relative": { "range": 12 },
+-    "//": "Balanced as FMJ",
+-    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 },
+-    "relative": { "range": 20 },
 -    "proportional": { "dispersion": 1.3 },
 -    "delete": { "effects": [ "SHOT" ] }
    }
@@ -395,129 +394,103 @@
 
 --- a/data/json/items/ammo/shot.json
 +++ b/data/json/items/ammo/shot.json
-@@ -1,49 +1,5 @@
+@@ -1,5 +1,50 @@
  [
    {
--    "id": "bp_shot_bird",
--    "copy-from": "shot_bird",
--    "type": "AMMO",
--    "name": { "str": "birdshot, black powder" },
--    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
--    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
--    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
--  },
--  {
--    "id": "bp_shot_dragon",
--    "copy-from": "shot_dragon",
--    "type": "AMMO",
--    "name": { "str": "dragon's breath shell, black powder" },
--    "proportional": { "price": 0.6, "damage": { "damage_type": "heat", "amount": 0.8 }, "dispersion": 1.2 },
--    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
--    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
--  },
--  {
--    "id": "bp_shot_00",
--    "copy-from": "shot_00",
--    "type": "AMMO",
--    "name": { "str": "00 shot, black powder" },
--    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
--    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
--  },
--  {
--    "id": "bp_shot_flechette",
--    "copy-from": "shot_flechette",
--    "type": "AMMO",
--    "name": { "str": "flechette shell, black powder" },
--    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
--    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
--    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
--  },
--  {
--    "id": "bp_shot_slug",
--    "copy-from": "shot_slug",
--    "type": "AMMO",
--    "name": { "str": "shotgun slug, black powder" },
--    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
--    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
--    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
--  },
--  {
-     "abstract": "shot_abstract",
-     "type": "AMMO",
-     "name": { "str": "00 shot" },
-@@ -76,19 +32,5 @@
-   },
-   {
--    "id": "shot_beanbag",
--    "copy-from": "shot_00",
--    "type": "AMMO",
--    "name": { "str": "shotgun beanbag" },
--    "description": "A beanbag round for shotguns, not deadly but designed to disable.",
--    "price": 500,
--    "price_postapoc": 200,
--    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
--    "count": 10,
--    "damage": { "damage_type": "bash", "amount": 5 },
--    "proportional": { "recoil": 0.4, "loudness": 0.6 },
--    "extend": { "effects": [ "BEANBAG", "NOGIB" ] }
--  },
--  {
-     "id": "shot_bird",
-     "copy-from": "shot_00",
-     "type": "AMMO",
-@@ -105,6 +47,15 @@
-     "extend": { "effects": [ "NOGIB" ] }
-   },
-   {
-+    "id": "bp_shot_bird",
-+    "copy-from": "shot_bird",
++    "abstract": "shot_abstract",
 +    "type": "AMMO",
-+    "name": { "str": "birdshot, black powder" },
-+    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
-+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
-+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
++    "name": { "str": "00 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": 800,
++    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
++    "material": [ "plastic", "powder" ],
++    "symbol": "=",
++    "color": "red",
++    "count": 20,
++    "stack_size": 20,
++    "ammo_type": "shot",
++    "casing": "shot_hull",
++    "range": 20,
++    "damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2.0 },
++    "recoil": 2500,
++    "loudness": 160,
++    "effects": [ "COOKOFF", "SHOT" ]
 +  },
 +  {
-     "id": "shot_dragon",
-     "copy-from": "shot_00",
-     "type": "AMMO",
-@@ -120,6 +71,23 @@
-     "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
-   },
-   {
-+    "id": "bp_shot_dragon",
-+    "copy-from": "shot_dragon",
++    "id": "shot_00",
++    "copy-from": "shot_abstract",
 +    "type": "AMMO",
-+    "name": { "str": "dragon's breath shell, black powder" },
-+    "proportional": { "price": 0.6, "damage": { "damage_type": "heat", "amount": 0.8 }, "dispersion": 1.2 },
-+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
-+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
++    "name": { "str": "00 shot" },
++    "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  Favored by SWAT forces."
 +  },
 +  {
-+    "id": "bp_shot_00",
++    "id": "shot_bird",
 +    "copy-from": "shot_00",
 +    "type": "AMMO",
-+    "name": { "str": "00 shot, black powder" },
-+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
-+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
++    "name": { "str": "birdshot" },
++    "description": "Weak shotgun ammunition.  Designed for hunting birds and other small game, its applications in combat are very limited.",
++    "price": 100,
++    "price_postapoc": 400,
++    "range": 0,
++    "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3.0 },
++    "dispersion": 1000,
++    "loudness": 80,
++    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
++    "extend": { "effects": [ "NOGIB" ] }
 +  },
 +  {
-     "id": "shot_flechette",
-     "copy-from": "shot_00",
+     "id": "reloaded_shot_bird",
+     "copy-from": "shot_bird",
+     "type": "AMMO",
+@@ -9,6 +54,21 @@
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+   },
+   {
++    "id": "shot_dragon",
++    "copy-from": "shot_00",
++    "type": "AMMO",
++    "name": { "str": "dragon's breath shell" },
++    "description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool.  When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.",
++    "price": 1000,
++    "price_postapoc": 1600,
++    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
++    "damage": { "damage_type": "heat", "amount": 30 },
++    "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
++    "range": 0,
++    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
++    "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
++  },
++  {
+     "id": "reloaded_shot_dragon",
+     "copy-from": "shot_dragon",
      "type": "AMMO",
-@@ -132,6 +100,52 @@
-     "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 12 } }
+@@ -27,6 +87,19 @@
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
    },
    {
-+    "id": "bp_shot_flechette",
-+    "copy-from": "shot_flechette",
++    "id": "shot_flechette",
++    "copy-from": "shot_00",
 +    "type": "AMMO",
-+    "name": { "str": "flechette shell, black powder" },
-+    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
-+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
-+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
++    "name": { "str": "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": 800,
++    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
++    "count": 10,
++    "//": "Balanced as standard AP.",
++    "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 30, "armor_multiplier": -1.0 } }
 +  },
 +  {
+     "id": "reloaded_shot_flechette",
+     "copy-from": "shot_flechette",
+     "type": "AMMO",
+@@ -36,6 +109,21 @@
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+   },
+   {
 +    "id": "shot_slug",
 +    "copy-from": "shot_abstract",
 +    "type": "AMMO",
@@ -526,77 +499,121 @@
 +    "price": 400,
 +    "price_postapoc": 400,
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-+    "dispersion": 100,
-+    "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } },
++    "dispersion": 80,
++    "//": "Balanced as FMJ",
++    "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 18, "armor_multiplier": -0.5 } },
 +    "proportional": { "recoil": 1.4 },
 +    "delete": { "effects": [ "SHOT" ] }
 +  },
 +  {
-+    "id": "bp_shot_slug",
-+    "copy-from": "shot_slug",
-+    "type": "AMMO",
-+    "name": { "str": "shotgun slug, black powder" },
-+    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
-+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
-+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-+  },
-+  {
-+    "id": "shot_beanbag",
-+    "copy-from": "shot_00",
-+    "type": "AMMO",
-+    "name": { "str": "shotgun beanbag" },
-+    "description": "A beanbag round for shotguns, not deadly but designed to disable.",
-+    "price": 500,
-+    "price_postapoc": 200,
-+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-+    "count": 10,
-+    "damage": { "damage_type": "bash", "amount": 5 },
-+    "proportional": { "recoil": 0.4, "loudness": 0.6 },
-+    "extend": { "effects": [ "BEANBAG", "NOGIB" ] }
-+  },
-+  {
-     "id": "shot_he",
+     "id": "reloaded_shot_slug",
      "copy-from": "shot_slug",
      "type": "AMMO",
-@@ -146,16 +160,6 @@
-     "extend": { "effects": [ "EXPLOSIVE" ] }
+@@ -89,36 +177,6 @@
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
    },
    {
--    "id": "shot_scrap",
--    "copy-from": "shot_00",
+-    "abstract": "shot_abstract",
 -    "type": "AMMO",
--    "name": { "str": "00 shot, scrap loaded" },
--    "description": "A shotgun shell filled with whatever was lying around.  They are more damaging than birdshot, but fairly inaccurate.",
--    "proportional": { "price": 0.4, "damage": { "damage_type": "bullet", "amount": 0.6 }, "dispersion": 1.2 },
--    "extend": { "effects": [ "RECYCLED" ] },
--    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+-    "name": { "str": "00 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": 800,
+-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+-    "material": [ "plastic", "powder" ],
+-    "symbol": "=",
+-    "color": "red",
+-    "count": 20,
+-    "stack_size": 20,
+-    "ammo_type": "shot",
+-    "casing": "shot_hull",
+-    "range": 20,
+-    "damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2.0 },
+-    "recoil": 2500,
+-    "loudness": 160,
+-    "effects": [ "COOKOFF", "SHOT" ]
 -  },
 -  {
-     "id": "bp_shot_scrap",
-     "copy-from": "shot_scrap",
+-    "id": "shot_00",
+-    "copy-from": "shot_abstract",
+-    "type": "AMMO",
+-    "name": { "str": "00 shot" },
+-    "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  Favored by SWAT forces."
+-  },
+-  {
+     "id": "shot_beanbag",
+     "copy-from": "shot_00",
      "type": "AMMO",
-@@ -165,17 +169,13 @@
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+@@ -133,49 +191,6 @@
+     "extend": { "effects": [ "BEANBAG", "NOGIB" ] }
    },
    {
+-    "id": "shot_bird",
+-    "copy-from": "shot_00",
+-    "type": "AMMO",
+-    "name": { "str": "birdshot" },
+-    "description": "Weak shotgun ammunition.  Designed for hunting birds and other small game, its applications in combat are very limited.",
+-    "price": 100,
+-    "price_postapoc": 400,
+-    "range": 0,
+-    "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3.0 },
+-    "dispersion": 1000,
+-    "loudness": 80,
+-    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
+-    "extend": { "effects": [ "NOGIB" ] }
+-  },
+-  {
+-    "id": "shot_dragon",
+-    "copy-from": "shot_00",
+-    "type": "AMMO",
+-    "name": { "str": "dragon's breath shell" },
+-    "description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool.  When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.",
+-    "price": 1000,
+-    "price_postapoc": 1600,
+-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+-    "damage": { "damage_type": "heat", "amount": 30 },
+-    "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
+-    "range": 0,
+-    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
+-    "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
+-  },
+-  {
+-    "id": "shot_flechette",
+-    "copy-from": "shot_00",
+-    "type": "AMMO",
+-    "name": { "str": "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": 800,
+-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+-    "count": 10,
+-    "//": "Balanced as standard AP.",
+-    "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 30, "armor_multiplier": -1.0 } }
+-  },
+-  {
+     "id": "shot_he",
+     "copy-from": "shot_slug",
+     "type": "AMMO",
+@@ -207,20 +222,5 @@
+     "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 } },
+     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+-  },
+-  {
 -    "id": "shot_slug",
 -    "copy-from": "shot_abstract",
-+    "id": "shot_scrap",
-+    "copy-from": "shot_00",
-     "type": "AMMO",
+-    "type": "AMMO",
 -    "name": { "str": "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": 400,
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
--    "dispersion": 100,
--    "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } },
+-    "dispersion": 80,
+-    "//": "Balanced as FMJ",
+-    "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 18, "armor_multiplier": -0.5 } },
 -    "proportional": { "recoil": 1.4 },
 -    "delete": { "effects": [ "SHOT" ] }
-+    "name": { "str": "00 shot, scrap loaded" },
-+    "description": "A shotgun shell filled with whatever was lying around.  They are more damaging than birdshot, but fairly inaccurate.",
-+    "proportional": { "price": 0.4, "damage": { "damage_type": "bullet", "amount": 0.6 }, "dispersion": 1.2 },
-+    "extend": { "effects": [ "RECYCLED" ] },
-+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
    }
  ]
diff --git a/ammo-02_fix-20x66mm-loudness.patch b/ammo-12_fix-20x66mm-loudness.patch
index fe95749..803f76d 100644
--- a/ammo-02_fix-20x66mm-loudness.patch
+++ b/ammo-12_fix-20x66mm-loudness.patch
@@ -1,8 +1,8 @@
 --- a/data/json/items/ammo/20x66mm.json
 +++ b/data/json/items/ammo/20x66mm.json
 @@ -124,6 +124,7 @@
-     "range": 12,
-     "damage": { "damage_type": "bullet", "amount": 60 },
+     "range": 20,
+     "damage": { "damage_type": "bullet", "amount": 100 },
      "recoil": 2500,
 +    "loudness": 160,
      "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index b8a7555..f22c895 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -21,13 +21,11 @@ Doi
 ---
  .../itemgroups/Weapons_Mods_Ammo/ammo.json    |  1 -
  data/json/itemgroups/military.json            |  4 +-
- data/json/items/ammo/20x66mm.json             |  6 +-
  data/json/items/ammo/40x46mm.json             | 57 ++++++++-----------
  data/json/items/ammo/40x53mm.json             | 29 +++-------
  data/json/items/ammo/5x50.json                |  8 ++-
  data/json/items/ammo/8x40mm.json              | 23 ++++----
  data/json/items/ammo/flintlock.json           |  5 +-
- data/json/items/ammo/shot.json                | 10 ++--
  data/json/items/ammo/shotpaper.json           |  2 +-
  data/json/items/generic/casing.json           |  8 +--
  data/json/items/handloaded_bullets.json       |  8 ++-
@@ -76,30 +74,6 @@ index 67766ba566a..8f564eb87aa 100644
        { "item": "8mm_inc", "prob": 6 },
        { "item": "8mm_caseless", "prob": 6 },
        { "item": "m202_flash", "prob": 15 },
-diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
-index 8acdf92f7af..51999520c8b 100644
---- a/data/json/items/ammo/20x66mm.json
-+++ b/data/json/items/ammo/20x66mm.json
-@@ -84,7 +84,8 @@
-     "price_postapoc": 4000,
-     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-     "count": 10,
--    "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } }
-+    "//": "Balanced as AP.",
-+    "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } }
-   },
-   {
-     "id": "20x66_frag",
-@@ -142,7 +143,8 @@
-     "price": 1500,
-     "price_postapoc": 4000,
-     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
--    "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 },
-+    "//": "Balanced as FMJ",
-+    "damage": { "damage_type": "bullet", "amount": 48, "armor_penetration": 21 },
-     "relative": { "range": 12 },
-     "proportional": { "dispersion": 1.3 },
-     "delete": { "effects": [ "SHOT" ] }
 diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json
 index 530278fd5d8..352b67d154c 100644
 --- a/data/json/items/ammo/40x46mm.json
@@ -394,7 +368,7 @@ index f7fc54e73da..c51ab370e4a 100644
 @@ -15,7 +15,8 @@
      "stack_size": 10,
      "ammo_type": "flintlock",
-     "range": 6,
+     "range": 12,
 -    "damage": { "damage_type": "bullet", "amount": 50 },
 +    "//": "Balanced as FMJ",
 +    "damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 22 },
@@ -404,54 +378,12 @@ index f7fc54e73da..c51ab370e4a 100644
 @@ -37,7 +38,7 @@
      "stack_size": 10,
      "ammo_type": "flintlock",
-     "range": 4,
+     "range": 8,
 -    "damage": { "damage_type": "bullet", "amount": 45 },
 +    "damage": { "damage_type": "bullet", "amount": 63 },
      "dispersion": 20,
      "recoil": 1500,
      "loudness": 90,
-diff --git a/data/json/items/ammo/shot.json b/data/json/items/ammo/shot.json
-index 619ab4ab64c..351347b7fc6 100644
---- a/data/json/items/ammo/shot.json
-+++ b/data/json/items/ammo/shot.json
-@@ -30,7 +30,7 @@
-     "copy-from": "shot_flechette",
-     "type": "AMMO",
-     "name": { "str": "flechette shell, black powder" },
--    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
-+    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.8 }, "dispersion": 1.2 },
-     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-   },
-@@ -39,7 +39,7 @@
-     "copy-from": "shot_slug",
-     "type": "AMMO",
-     "name": { "str": "shotgun slug, black powder" },
--    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
-+    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.8 }, "dispersion": 1.2 },
-     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-   },
-@@ -123,7 +123,8 @@
-     "price_postapoc": 800,
-     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-     "count": 10,
--    "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 12 } }
-+    "//": "Balanced as standard AP.",
-+    "relative": { "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 30 } }
-   },
-   {
-     "id": "shot_he",
-@@ -168,7 +169,8 @@
-     "price_postapoc": 400,
-     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-     "dispersion": 100,
--    "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } },
-+    "//": "Balanced as FMJ",
-+    "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 18 } },
-     "proportional": { "recoil": 1.4 },
-     "delete": { "effects": [ "SHOT" ] }
-   }
 diff --git a/data/json/items/ammo/shotpaper.json b/data/json/items/ammo/shotpaper.json
 index f9915b9cf2e..40ec4081298 100644
 --- a/data/json/items/ammo/shotpaper.json
diff --git a/revert-17_Rivtech-mainline-3092.patch b/revert-17_Rivtech-mainline-3092.patch
index 29760e0..409665e 100644
--- a/revert-17_Rivtech-mainline-3092.patch
+++ b/revert-17_Rivtech-mainline-3092.patch
@@ -5,12 +5,8 @@ Subject: [PATCH] Rivtech mainline (#3092)
 
 * Update rifle.json
 
-* Update 20x66mm.json
-
 * Update 8x40mm.json
 
-* Update 20x66mm.json
-
 * Update rifle.json
 
 * Update cgp_recipes.json
@@ -71,56 +67,12 @@ Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.
 
 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 ---
- data/json/items/ammo/20x66mm.json          |  12 +-
  data/json/items/ammo/8x40mm.json           |  36 ++++-
  data/json/obsoletion/migration.json        |  22 ++-
  data/json/recipes/ammo/rifle.json          | 153 +++++++++++++++++++--
  data/json/recipes/ammo/shot.json           |  73 ++++++++++
  data/mods/Craft_Gunpowder/cgp_recipes.json | 102 --------------
  6 files changed, 274 insertions(+), 124 deletions(-)
-
-diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
-index 297ee063031..5ef3bee49f1 100644
---- a/data/json/items/ammo/20x66mm.json
-+++ b/data/json/items/ammo/20x66mm.json
-@@ -14,31 +14,31 @@
-     "extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] }
-   },
-   {
--    "id": "20x66_bootleg_flechette",
-+    "id": "20x66_flechette_reloaded",
-     "copy-from": "20x66_flechette",
-     "type": "AMMO",
-     "name": { "str": "20x66mm flechette, handmade", "str_pl": "20x66mm flechettes, handmade" },
--    "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless flechette rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-+    "description": "Handmade duplicates of Rivtech 20x66mm caseless flechette rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-     "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": "20x66_bootleg_shot",
-+    "id": "20x66_shot_reloaded",
-     "copy-from": "20x66_shot",
-     "type": "AMMO",
-     "name": { "str": "20x66mm buckshot, handmade" },
--    "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless buckshot rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-+    "description": "Handmade duplicates of Rivtech 20x66mm caseless buckshot rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-     "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": "20x66_bootleg_slug",
-+    "id": "20x66_slug_reloaded",
-     "copy-from": "20x66_slug",
-     "type": "AMMO",
-     "name": { "str": "20x66mm slug, handmade", "str_pl": "20x66mm slugs, handmade" },
--    "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless solid projectile rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-+    "description": "Handmade duplicates of Rivtech 20x66mm caseless solid projectile rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-     "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/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json
 index 8ca62a1bfb3..de9a47bac7a 100644
 --- a/data/json/items/ammo/8x40mm.json
@@ -173,7 +125,7 @@ diff --git a/data/json/obsoletion/migration.json b/data/json/obsoletion/migratio
 index aae147246c5..1d37113786d 100644
 --- a/data/json/obsoletion/migration.json
 +++ b/data/json/obsoletion/migration.json
-@@ -69,10 +69,30 @@
+@@ -69,10 +69,15 @@
      "type": "MIGRATION",
      "replace": "40x46mm_m651"
    },
@@ -187,24 +139,9 @@ index aae147246c5..1d37113786d 100644
      "type": "MIGRATION",
 -    "replace": "8mm_bootleg"
 +    "replace": "8mm_jhp_reloaded"
-+  },
-+  {
-+    "id": "20x66_bootleg_shot",
-+    "type": "MIGRATION",
-+    "replace": "20x66_shot_reloaded"
-+  },
-+  {
-+    "id": "20x66_bootleg_flechette",
-+    "type": "MIGRATION",
-+    "replace": "20x66_flechette_reloaded"
-+  },
-+  {
-+    "id": "20x66_bootleg_slug",
-+    "type": "MIGRATION",
-+    "replace": "20x66_slug_reloaded"
    },
    {
-     "id": "adv_UPS_on",
+     "id": "20x66_bootleg_shot",
 diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json
 index dc0713e00bc..64b2d43cdf6 100644
 --- a/data/json/recipes/ammo/rifle.json
@@ -389,94 +326,11 @@ index dc0713e00bc..64b2d43cdf6 100644
      ]
    },
    {
-diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json
-index 27b7bb17832..6221603cd0d 100644
---- a/data/json/recipes/ammo/shot.json
-+++ b/data/json/recipes/ammo/shot.json
-@@ -642,5 +642,78 @@
-     "using": [ [ "ammo_bullet", 8 ] ],
-     "qualities": [ { "id": "CUT", "level": 1 } ],
-     "components": [ [ [ "chem_black_powder", 5 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ]
-+  },
-+  {
-+    "type": "recipe",
-+    "result": "20x66_shot_reloaded",
-+    "category": "CC_AMMO",
-+    "subcategory": "CSC_AMMO_SHOT",
-+    "skill_used": "fabrication",
-+    "skills_required": [ "cooking", 2 ],
-+    "difficulty": 8,
-+    "time": 45000,
-+    "batch_time_factors": [ 60, 5 ],
-+    "book_learn": [ [ "recipe_caseless", 5 ] ],
-+    "qualities": [ { "id": "CHEM", "level": 2 } ],
-+    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
-+    "components": [
-+      [ [ "adhesive", 1, "LIST" ] ],
-+      [ [ "plastic_chunk", 4 ] ],
-+      [ [ "oxy_powder", 60 ] ],
-+      [ [ "gunpowder", 120 ] ],
-+      [ [ "lead", 160 ] ],
-+      [ [ "gold_small", 5 ], [ "silver_small", 5 ], [ "tin", 5 ], [ "bismuth", 5 ], [ "solder_wire", 5 ] ]
-+    ]
-+  },
-+  {
-+    "type": "recipe",
-+    "result": "20x66_flechette_reloaded",
-+    "category": "CC_AMMO",
-+    "subcategory": "CSC_AMMO_SHOT",
-+    "skill_used": "fabrication",
-+    "skills_required": [ "cooking", 2 ],
-+    "difficulty": 8,
-+    "time": 45000,
-+    "batch_time_factors": [ 60, 5 ],
-+    "book_learn": [ [ "recipe_caseless", 5 ] ],
-+    "qualities": [ { "id": "CHEM", "level": 2 } ],
-+    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "press", -1 ] ] ],
-+    "components": [
-+      [ [ "adhesive", 1, "LIST" ] ],
-+      [ [ "plastic_chunk", 4 ] ],
-+      [ [ "oxy_powder", 60 ] ],
-+      [ [ "gunpowder", 120 ] ],
-+      [
-+        [ "lead", 10 ],
-+        [ "gold_small", 10 ],
-+        [ "silver_small", 10 ],
-+        [ "tin", 10 ],
-+        [ "bismuth", 10 ],
-+        [ "solder_wire", 10 ]
-+      ],
-+      [ [ "nail", 240 ], [ "combatnail", 240 ] ]
-+    ]
-+  },
-+  {
-+    "type": "recipe",
-+    "result": "20x66_slug_reloaded",
-+    "category": "CC_AMMO",
-+    "subcategory": "CSC_AMMO_SHOT",
-+    "skill_used": "fabrication",
-+    "skills_required": [ "cooking", 2 ],
-+    "difficulty": 8,
-+    "time": 45000,
-+    "batch_time_factors": [ 60, 5 ],
-+    "book_learn": [ [ "recipe_caseless", 5 ] ],
-+    "qualities": [ { "id": "CHEM", "level": 2 } ],
-+    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
-+    "components": [
-+      [ [ "adhesive", 1, "LIST" ] ],
-+      [ [ "plastic_chunk", 4 ] ],
-+      [ [ "oxy_powder", 80 ] ],
-+      [ [ "gunpowder", 160 ] ],
-+      [ [ "lead", 240 ] ],
-+      [ [ "gold_small", 8 ], [ "silver_small", 8 ], [ "tin", 8 ], [ "bismuth", 8 ], [ "solder_wire", 8 ] ]
-+    ]
-   }
- ]
 diff --git a/data/mods/Craft_Gunpowder/cgp_recipes.json b/data/mods/Craft_Gunpowder/cgp_recipes.json
 index f73bcb1507c..4302b8f86dc 100644
 --- a/data/mods/Craft_Gunpowder/cgp_recipes.json
 +++ b/data/mods/Craft_Gunpowder/cgp_recipes.json
-@@ -48,108 +48,6 @@
+@@ -48,34 +48,6 @@
      "tools": [ [ [ "chemistry_set", 50 ], [ "hotplate", 50 ], [ "toolset", 50 ] ] ],
      "components": [ [ [ "oxy_powder", 200 ] ], [ [ "ammonia", 2 ], [ "lye_powder", 200 ] ], [ [ "charcoal", 5 ] ] ]
    },
@@ -508,80 +362,6 @@ index f73bcb1507c..4302b8f86dc 100644
 -      [ [ "copper", 35 ] ]
 -    ]
 -  },
--  {
--    "type": "recipe",
--    "result": "20x66_bootleg_shot",
--    "category": "CC_AMMO",
--    "subcategory": "CSC_AMMO_SHOT",
--    "skill_used": "fabrication",
--    "skills_required": [ "cooking", 2 ],
--    "difficulty": 8,
--    "time": 45000,
--    "book_learn": [ [ "recipe_caseless", 5 ], [ "recipe_bullets", 9 ], [ "manual_shotgun", 10 ] ],
--    "qualities": [ { "id": "CHEM", "level": 2 } ],
--    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
--    "components": [
--      [ [ "acid", 1 ] ],
--      [ [ "plastic_chunk", 4 ] ],
--      [ [ "oxy_powder", 120 ] ],
--      [ [ "incendiary", 120 ] ],
--      [
--        [ "lead", 160 ],
--        [ "gold_small", 160 ],
--        [ "silver_small", 160 ],
--        [ "tin", 160 ],
--        [ "bismuth", 160 ],
--        [ "solder_wire", 160 ]
--      ]
--    ]
--  },
--  {
--    "type": "recipe",
--    "result": "20x66_bootleg_flechette",
--    "category": "CC_AMMO",
--    "subcategory": "CSC_AMMO_SHOT",
--    "skill_used": "fabrication",
--    "skills_required": [ "cooking", 2 ],
--    "difficulty": 8,
--    "time": 45000,
--    "book_learn": [ [ "recipe_caseless", 5 ], [ "recipe_bullets", 9 ], [ "manual_shotgun", 10 ] ],
--    "qualities": [ { "id": "CHEM", "level": 2 } ],
--    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "press", -1 ] ] ],
--    "components": [
--      [ [ "acid", 1 ] ],
--      [ [ "plastic_chunk", 4 ] ],
--      [ [ "oxy_powder", 120 ] ],
--      [ [ "incendiary", 120 ] ],
--      [ [ "nail", 240 ], [ "combatnail", 240 ] ]
--    ]
--  },
--  {
--    "type": "recipe",
--    "result": "20x66_bootleg_slug",
--    "category": "CC_AMMO",
--    "subcategory": "CSC_AMMO_SHOT",
--    "skill_used": "fabrication",
--    "skills_required": [ "cooking", 2 ],
--    "difficulty": 8,
--    "time": 45000,
--    "book_learn": [ [ "recipe_caseless", 5 ], [ "recipe_bullets", 9 ], [ "manual_shotgun", 10 ] ],
--    "qualities": [ { "id": "CHEM", "level": 2 } ],
--    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
--    "components": [
--      [ [ "acid", 1 ] ],
--      [ [ "plastic_chunk", 4 ] ],
--      [ [ "oxy_powder", 160 ] ],
--      [ [ "incendiary", 160 ] ],
--      [
--        [ "lead", 240 ],
--        [ "gold_small", 240 ],
--        [ "silver_small", 240 ],
--        [ "tin", 240 ],
--        [ "bismuth", 240 ],
--        [ "solder_wire", 240 ]
--      ]
--    ]
--  },
    {
      "type": "recipe",
      "result": "smg_9mm",