Updated to 2023-08-28-1640

Revert mainline rivtech ammo
Remove obsolete bionic price patch
Disable Lua support

4 files changed, 605 insertions, 108 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 12b108a..186f5a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,9 +17,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202308231412
-_pkgver=2023-08-23-1412
-pkgrel=2
+pkgver=202308281640
+_pkgver=2023-08-28-1640
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -50,6 +50,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch"
         "revert-14_Removed-unrelated-references-2738.patch"
         "revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch"
+        "revert-17_Rivtech-mainline-3092.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
@@ -64,7 +65,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "armor-02_fix-survivor-fingerless-gloves-warmth.patch"
 
         "bionics-01_npc-can-use-more-bionics.patch"
-        "bionics-02_fix-bionic-prices.patch"
 
         "faction-01_more-factions.patch"
         "faction-03_fix-food-supply-calculations.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=('9336f68048436ec5cbe3fd02d6d91afe9b7f51676c2f7f9d7f0bea8115bfc183ac17c404e09c494c7c44731783b66479815138a42f7f344e39cb8fbf85a4be77'
+b2sums=('9f6de7733c6956ded2f5780517eb27e1bb5dc292146c3e30d8e3f41e59677d0bae4b2e0ee11852553d455b85d3fcbf92fc9ed0361860f70cf5899c08c3d9e842'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -173,6 +173,7 @@ b2sums=('9336f68048436ec5cbe3fd02d6d91afe9b7f51676c2f7f9d7f0bea8115bfc183ac17c40
         'c7d0ed3da809a930896ccb1067b52d78defc0428ed6c1d4b72bea0f32ccc3590374f268b9a1763de0265ddf1c8cd011f4e910c0d6384251699103af48fe1bb3c'
         '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5'
         '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f'
+        '02b3ff03cd2f6b74e65c31874a0ed91918cab1bb7272516c7565f7f68f0a96a9a3a837f19f2431470da455084dea6d481875258f01a45e9249aafac879007746'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
@@ -184,7 +185,6 @@ b2sums=('9336f68048436ec5cbe3fd02d6d91afe9b7f51676c2f7f9d7f0bea8115bfc183ac17c40
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
         '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3'
-        'ee31032c9d960e4290dea08a97037f8566e35743e949d3d38f6e9ae76a736118d23c34ce7cd1b99d40460047f9fb6e54c52b156587bb76458942139e18dd82d8'
         '1ce956dbcd0af3e16c336ce15995a7df19b8bed78765890304ff9dcaf6d30c602580bef050d6c659fdff945a31dce880f5f4042dfc295cdef44c34155a3e644c'
         '804cea67bb0a2fab62dd9cf633d1959a3fe59b3e24f0c2e01a6db951100fa4426ae946a90a93fa7fd6a7d0ece478633d0091144c2fa776858157edec1310f837'
         'a611964c224c7751c3afeaadb159135e5ed5d87d3ed254be63b4b12450f4f63f414c90f8e29f3d14c0b854f4c9938bf5d12db69d2e258f1947e353302ca07da7'
@@ -236,7 +236,7 @@ b2sums=('9336f68048436ec5cbe3fd02d6d91afe9b7f51676c2f7f9d7f0bea8115bfc183ac17c40
         '209387731490549d7b3d546ab149cea22e0ea1291356884f358cd87ca7d5425ca9a72f6f2cb7af46956634ffdb1a61d1ebfbfdbb5a2fc9fdc26d29acdc2ab0c0'
         'a357104e814cde6669ab0b76d8d869ddd7fb03cf38bf1b32993780a31ac07e50cfc5d1af3e87d969ca3f9650ea3aefba3c55bf626c4c40502205a130a86c25a5'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
-        'f428818d1d4df4e46ec844458cfd5f9eef5d19a89778837502eb74ed6d421113ae9a9bc2fd4fb2bcf41d433635c34912e90b90a8993e92164e6a1efe0ebae82f'
+        'e6044d7238be1cba2a083b6eb17335e10be3c8116234c67f006c7b6e5a9e25e107412ae2f5a636b01efa70cb54032f5c3da46ec7f0e92917334e72a492f739f8'
         'b41ce5db19de2f4a5857debe31560b7b8216412e5df795032363839429f732b2d2359b3679a795c55a997913588f7d495c300df402529317ef2d03de24a74273'
         '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
@@ -286,7 +286,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-08-23-1412"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-08-28-1640"|' Makefile
 
 
   # # # Hotfixes
@@ -295,6 +295,9 @@ prepare() {
 
   # # # Reverts
   echo "Applying revert patches"
+  # # Revert mainline craftable rivtech ammo
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-17_Rivtech-mainline-3092.patch
+
   # # More reverts for generic night vision
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch
 
@@ -398,10 +401,6 @@ prepare() {
   #  ie, soporific inducer, gasoline fuel cell, enhanced hearing, surgical scalpels.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/bionics-01_npc-can-use-more-bionics.patch
 
-  # Fix some CBMs having excessively high price_postapoc values:
-  #  All other CBMs are fixed to 1000, so these now are too.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/bionics-02_fix-bionic-prices.patch
-
 
   # # faction fixes
   echo "Applying faction fixes"
@@ -713,15 +712,15 @@ build() {
   export CXXFLAGS="$(echo $CXXFLAGS | sed 's/-Wp,-D_GLIBCXX_ASSERTIONS//')"
   #echo $CXXFLAGS
 
-  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 CCACHE=0
-  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 CCACHE=0 TILES=1 SOUND=1
+  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 LUA=0 CCACHE=0
+  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 LUA=0 CCACHE=0 TILES=1 SOUND=1
   ./lang/compile_mo.sh
 }
 
 package_cataclysm-bn() {
   cd "${_pkgname}-${_pkgver}"
 
-  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 CCACHE=0 install
+  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 LUA=0 CCACHE=0 install
 
   # Docs
   install -d "$pkgdir/usr/share/doc/cataclysm-bn"
@@ -752,7 +751,7 @@ package_cataclysm-bn-tiles() {
   depends=('cataclysm-bn' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer')
   cd "${_pkgname}-${_pkgver}"
 
-  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 CCACHE=0 TILES=1 SOUND=1 install
+  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 LUA=0 CCACHE=0 TILES=1 SOUND=1 install
 
 
   # Icon
diff --git a/bionics-02_fix-bionic-prices.patch b/bionics-02_fix-bionic-prices.patch
deleted file mode 100644
index 027d1f5..0000000
--- a/bionics-02_fix-bionic-prices.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/data/json/items/bionics.json
-+++ b/data/json/items/bionics.json
-@@ -1245,7 +1245,7 @@
-     "name": { "str": "Linguistic Coprocessor CBM" },
-     "description": "A microcomputer installed into the left hemisphere of your brain to increase the speed that it processes language.  When installed, it provides a passive boost to reading speed.",
-     "price": 100000,
--    "price_postapoc": 50000,
-+    "price_postapoc": 1000,
-     "difficulty": 5
-   },
-   {
-@@ -1255,7 +1255,7 @@
-     "name": { "str": "Dopamine Stimulators CBM" },
-     "description": "A set of tiny bionic nerve stimulators that install into the reward center of your brain.  When run with bionic power, it periodically releases a hit of dopamine and other reward chemicals, inducing a state of euphoria and suppressing fear.",
-     "price": 1000000,
--    "price_postapoc": 100000,
-+    "price_postapoc": 1000,
-     "difficulty": 8
-   },
-   {
diff --git a/etc-02_add-missing-price-postapoc.patch b/etc-02_add-missing-price-postapoc.patch
index f5f3bbd..d74366f 100644
--- a/etc-02_add-missing-price-postapoc.patch
+++ b/etc-02_add-missing-price-postapoc.patch
@@ -23,78 +23,6 @@
 
 --- a/data/json/items/magazine/223.json
 +++ b/data/json/items/magazine/223.json
-@@ -128,6 +128,7 @@
-     "weight": "88 g",
-     "volume": "50 ml",
-     "price": 4000,
-+    "price_postapoc": 125,
-     "material": "steel",
-     "symbol": "#",
-     "color": "light_gray",
-@@ -145,6 +146,7 @@
-     "weight": "91 g",
-     "volume": "350 ml",
-     "price": 4000,
-+    "price_postapoc": 125,
-     "material": "steel",
-     "symbol": "#",
-     "color": "light_gray",
-@@ -180,6 +182,7 @@
-     "weight": "181 g",
-     "volume": "600 ml",
-     "price": 8500,
-+    "price_postapoc": 275,
-     "material": [ "plastic", "steel" ],
-     "symbol": "#",
-     "color": "light_gray",
-@@ -218,6 +221,7 @@
-     "weight": "181 g",
-     "volume": "800 ml",
-     "price": 12000,
-+    "price_postapoc": 750,
-     "material": "aluminum",
-     "symbol": "#",
-     "color": "light_gray",
-@@ -235,6 +239,7 @@
-     "weight": "581 g",
-     "volume": "1050 ml",
-     "price": 9250,
-+    "price_postapoc": 550,
-     "to_hit": -2,
-     "bashing": 4,
-     "material": [ "steel", "plastic" ],
-@@ -255,6 +260,7 @@
-     "weight": "567 g",
-     "volume": "1500 ml",
-     "price": 9500,
-+    "price_postapoc": 600,
-     "to_hit": -2,
-     "bashing": 4,
-     "material": [ "plastic", "steel" ],
-@@ -275,6 +281,7 @@
-     "weight": "272 g",
-     "volume": "1 L",
-     "price": 15000,
-+    "price_postapoc": 900,
-     "material": "aluminum",
-     "symbol": "#",
-     "color": "light_gray",
-@@ -292,6 +299,7 @@
-     "weight": "998 g",
-     "volume": "1200 ml",
-     "price": 14000,
-+    "price_postapoc": 850,
-     "material": [ "plastic", "steel" ],
-     "symbol": "#",
-     "color": "light_gray",
-@@ -310,6 +318,7 @@
-     "weight": "2220 g",
-     "volume": "1700 ml",
-     "price": 18000,
-+    "price_postapoc": 1000,
-     "material": [ "plastic", "steel" ],
-     "symbol": "#",
-     "color": "light_gray",
 @@ -366,6 +375,7 @@
      "weight": "190 g",
      "volume": "620 ml",
diff --git a/revert-17_Rivtech-mainline-3092.patch b/revert-17_Rivtech-mainline-3092.patch
new file mode 100644
index 0000000..29760e0
--- /dev/null
+++ b/revert-17_Rivtech-mainline-3092.patch
@@ -0,0 +1,590 @@
+From 1e225055aa27abf1942535eb4d49482b5ced1a4a Mon Sep 17 00:00:00 2001
+From: borsek <bor.arah@gmail.com>
+Date: Sun, 27 Aug 2023 22:53:29 +0100
+Subject: [PATCH] Rivtech mainline (#3092)
+
+* Update rifle.json
+
+* Update 20x66mm.json
+
+* Update 8x40mm.json
+
+* Update 20x66mm.json
+
+* Update rifle.json
+
+* Update cgp_recipes.json
+
+* Create obsoletion.json
+
+* Update rifle.json
+
+* Update shot.json
+
+* Update rifle.json
+
+* Update shot.json
+
+* Update rifle.json
+
+* Update data/json/recipes/ammo/rifle.json
+
+Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+
+* Update data/json/recipes/ammo/rifle.json
+
+Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+
+* Update data/json/recipes/ammo/rifle.json
+
+Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+
+* Update data/json/recipes/ammo/rifle.json
+
+Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+
+* Update data/json/recipes/ammo/shot.json
+
+Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+
+* Update data/json/recipes/ammo/shot.json
+
+Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+
+* Update data/json/recipes/ammo/shot.json
+
+Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+
+* Update data/json/recipes/ammo/shot.json
+
+Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+
+* Update migration.json
+
+* Delete obsoletion.json
+
+* Update shot.json
+
+* Update rifle.json
+
+---------
+
+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
++++ b/data/json/items/ammo/8x40mm.json
+@@ -1,10 +1,40 @@
+ [
+   {
+-    "id": "8mm_bootleg",
++    "id": "8mm_jhp_reloaded",
+     "copy-from": "8mm_jhp",
+     "type": "AMMO",
+-    "name": { "str": "bootleg 8x40mm JHP" },
+-    "description": "Bootleg duplicates of Rivtech 8x40mm caseless rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
++    "name": { "str": "8x40mm JHP, handmade" },
++    "description": "Handmade duplicates of Rivtech 8x40mm JHP 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": "8mm_caseless_reloaded",
++    "copy-from": "8mm_caseless",
++    "type": "AMMO",
++    "name": { "str": "8x40mm caseless, handmade" },
++    "description": "Handmade duplicates of Rivtech 8x40mm caseless 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": "8mm_hvp_reloaded",
++    "copy-from": "8mm_hvp",
++    "type": "AMMO",
++    "name": { "str": "8x40mm HVP, handmade" },
++    "description": "Handmade duplicates of Rivtech 8x40mm HVP 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": "8mm_inc_reloaded",
++    "copy-from": "8mm_inc",
++    "type": "AMMO",
++    "name": { "str": "8x40mm tracer, handmade" },
++    "description": "Handmade duplicates of Rivtech 8x40mm tracer 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/obsoletion/migration.json b/data/json/obsoletion/migration.json
+index aae147246c5..1d37113786d 100644
+--- a/data/json/obsoletion/migration.json
++++ b/data/json/obsoletion/migration.json
+@@ -69,10 +69,30 @@
+     "type": "MIGRATION",
+     "replace": "40x46mm_m651"
+   },
++  {
++    "id": "8mm_bootleg",
++    "type": "MIGRATION",
++    "replace": "8mm_jhp_reloaded"
++  },
+   {
+     "id": "8mm_bootleg_jsp",
+     "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",
+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
++++ b/data/json/recipes/ammo/rifle.json
+@@ -395,6 +395,135 @@
+     "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
+     "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ] ]
+   },
++  {
++    "type": "recipe",
++    "result": "8mm_jhp_reloaded",
++    "category": "CC_AMMO",
++    "subcategory": "CSC_AMMO_RIFLE",
++    "skill_used": "fabrication",
++    "skills_required": [ "cooking", 2 ],
++    "difficulty": 8,
++    "time": 35000,
++    "batch_time_factors": [ 60, 5 ],
++    "book_learn": [ [ "recipe_caseless", 5 ] ],
++    "charges": 40,
++    "qualities": [ { "id": "CHEM", "level": 2 } ],
++    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
++    "components": [
++      [ [ "adhesive", 1, "LIST" ] ],
++      [ [ "plastic_chunk", 5 ] ],
++      [ [ "gunpowder", 280 ] ],
++      [ [ "oxy_powder", 80 ] ],
++      [ [ "lead", 80 ] ],
++      [
++        [ "gold_small", 4 ],
++        [ "silver_small", 4 ],
++        [ "tin", 4 ],
++        [ "bismuth", 4 ],
++        [ "solder_wire", 4 ],
++        [ "platinum_small", 4 ]
++      ],
++      [ [ "copper", 40 ] ],
++      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
++    ]
++  },
++  {
++    "type": "recipe",
++    "result": "8mm_caseless_reloaded",
++    "category": "CC_AMMO",
++    "subcategory": "CSC_AMMO_RIFLE",
++    "skill_used": "fabrication",
++    "skills_required": [ "cooking", 2 ],
++    "difficulty": 9,
++    "time": 45000,
++    "batch_time_factors": [ 60, 5 ],
++    "book_learn": [ [ "recipe_caseless", 5 ] ],
++    "charges": 40,
++    "qualities": [ { "id": "CHEM", "level": 2 } ],
++    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
++    "components": [
++      [ [ "adhesive", 1, "LIST" ] ],
++      [ [ "plastic_chunk", 5 ] ],
++      [ [ "gunpowder", 320 ] ],
++      [ [ "oxy_powder", 80 ] ],
++      [ [ "lead", 120 ] ],
++      [
++        [ "gold_small", 4 ],
++        [ "silver_small", 4 ],
++        [ "tin", 4 ],
++        [ "bismuth", 4 ],
++        [ "solder_wire", 4 ],
++        [ "platinum_small", 4 ]
++      ],
++      [ [ "copper", 80 ] ],
++      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
++    ]
++  },
++  {
++    "type": "recipe",
++    "result": "8mm_hvp_reloaded",
++    "category": "CC_AMMO",
++    "subcategory": "CSC_AMMO_RIFLE",
++    "skill_used": "fabrication",
++    "skills_required": [ "cooking", 2 ],
++    "difficulty": 9,
++    "time": 55000,
++    "batch_time_factors": [ 60, 5 ],
++    "book_learn": [ [ "recipe_caseless", 5 ] ],
++    "charges": 40,
++    "qualities": [ { "id": "CHEM", "level": 2 } ],
++    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
++    "components": [
++      [ [ "adhesive", 1, "LIST" ] ],
++      [ [ "plastic_chunk", 5 ] ],
++      [ [ "gunpowder", 400 ] ],
++      [ [ "oxy_powder", 120 ] ],
++      [ [ "lead", 80 ] ],
++      [
++        [ "gold_small", 40 ],
++        [ "silver_small", 40 ],
++        [ "tin", 40 ],
++        [ "bismuth", 40 ],
++        [ "solder_wire", 40 ],
++        [ "platinum_small", 40 ]
++      ],
++      [ [ "copper", 80 ] ],
++      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
++    ]
++  },
++  {
++    "type": "recipe",
++    "result": "8mm_inc_reloaded",
++    "category": "CC_AMMO",
++    "subcategory": "CSC_AMMO_RIFLE",
++    "skill_used": "fabrication",
++    "skills_required": [ "cooking", 2 ],
++    "difficulty": 9,
++    "time": 55000,
++    "batch_time_factors": [ 60, 5 ],
++    "book_learn": [ [ "recipe_caseless", 5 ] ],
++    "charges": 40,
++    "qualities": [ { "id": "CHEM", "level": 2 } ],
++    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
++    "components": [
++      [ [ "adhesive", 1, "LIST" ] ],
++      [ [ "plastic_chunk", 5 ] ],
++      [ [ "gunpowder", 320 ] ],
++      [ [ "oxy_powder", 160 ] ],
++      [ [ "incendiary", 80 ] ],
++      [ [ "lead", 80 ] ],
++      [
++        [ "gold_small", 4 ],
++        [ "silver_small", 4 ],
++        [ "tin", 4 ],
++        [ "bismuth", 4 ],
++        [ "solder_wire", 4 ],
++        [ "platinum_small", 4 ]
++      ],
++      [ [ "copper", 40 ] ],
++      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
++    ]
++  },
+   {
+     "result": "5x50dart",
+     "type": "recipe",
+@@ -406,15 +535,15 @@
+     "time": "2 m",
+     "batch_time_factors": [ 60, 5 ],
+     "book_learn": [ [ "recipe_caseless", 4 ] ],
+-    "charges": 1,
+-    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
++    "charges": 8,
++    "using": [ [ "bullet_forming", 16 ], [ "ammo_bullet", 16 ] ],
+     "tools": [ [ [ "mold_plastic", -1 ] ] ],
+     "components": [
+-      [ [ "5x50_hull", 1 ] ],
++      [ [ "5x50_hull", 8 ] ],
+       [ [ "plastic_chunk", 1 ] ],
+-      [ [ "smrifle_primer", 1 ] ],
+-      [ [ "gunpowder", 3 ] ],
+-      [ [ "combatnail", 1 ] ]
++      [ [ "smrifle_primer", 8 ] ],
++      [ [ "gunpowder", 24 ] ],
++      [ [ "combatnail", 8 ] ]
+     ]
+   },
+   {
+@@ -428,15 +557,15 @@
+     "time": "2 m",
+     "batch_time_factors": [ 60, 5 ],
+     "book_learn": [ [ "recipe_caseless", 4 ] ],
+-    "charges": 1,
+-    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ] ],
++    "charges": 8,
++    "using": [ [ "bullet_forming", 16 ], [ "ammo_bullet", 24 ] ],
+     "tools": [ [ [ "mold_plastic", -1 ] ] ],
+     "components": [
+-      [ [ "5x50_hull", 1 ] ],
++      [ [ "5x50_hull", 8 ] ],
+       [ [ "plastic_chunk", 1 ] ],
+-      [ [ "smrifle_primer", 1 ] ],
+-      [ [ "gunpowder", 4 ] ],
+-      [ [ "scrap", 1 ] ]
++      [ [ "smrifle_primer", 8 ] ],
++      [ [ "gunpowder", 32 ] ],
++      [ [ "scrap", 8 ] ]
+     ]
+   },
+   {
+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 @@
+     "tools": [ [ [ "chemistry_set", 50 ], [ "hotplate", 50 ], [ "toolset", 50 ] ] ],
+     "components": [ [ [ "oxy_powder", 200 ] ], [ [ "ammonia", 2 ], [ "lye_powder", 200 ] ], [ [ "charcoal", 5 ] ] ]
+   },
+-  {
+-    "type": "recipe",
+-    "result": "8mm_bootleg",
+-    "category": "CC_AMMO",
+-    "subcategory": "CSC_AMMO_PISTOL",
+-    "skill_used": "fabrication",
+-    "skills_required": [ "cooking", 2 ],
+-    "difficulty": 8,
+-    "time": 45000,
+-    "book_learn": [ [ "recipe_caseless", 5 ], [ "recipe_bullets", 9 ], [ "manual_pistol", 10 ], [ "manual_rifle", 10 ] ],
+-    "qualities": [ { "id": "CHEM", "level": 2 } ],
+-    "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "press", -1 ] ] ],
+-    "components": [
+-      [ [ "acid", 1 ] ],
+-      [ [ "plastic_chunk", 5 ] ],
+-      [ [ "oxy_powder", 100 ] ],
+-      [ [ "incendiary", 100 ] ],
+-      [
+-        [ "lead", 75 ],
+-        [ "gold_small", 75 ],
+-        [ "silver_small", 75 ],
+-        [ "tin", 75 ],
+-        [ "bismuth", 75 ],
+-        [ "solder_wire", 75 ]
+-      ],
+-      [ [ "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",
+-- 
+2.41.0
+