Port out 8x40mm ammo to my ammo rebalance mod.

6 files changed, 170 insertions, 401 deletions

diff --git a/PKGBUILD b/PKGBUILD
index efcc80c..619234e 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=202309161201
-_pkgver=2023-09-16-1201
-pkgrel=1
+pkgver=202309171522
+_pkgver=2023-09-17-1522
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -54,7 +54,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-03_fix-reloaded-50bmg.patch"
-        "ammo-04_4570-can-be-dismantled.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-10_ammo-order-fix.patch"
@@ -85,6 +85,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "meds-01_antibiotics-unhealthy.patch"
 
         "migration-01_remove-ucp.patch"
+        #"migration-02_remove-8mm-fmj.patch"
 
         "mission-01_typos.patch"
 
@@ -154,7 +155,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=('65a07ff21dba5ecdd1d6ec0586597dd02966baaccba83ce62c4e3d6ac0747c6a3e5eb1192ba3fe81ac27e8117adb1fcc24e6c52a43c9bc3740859cb9de42b862'
+b2sums=('b3ec5268da460d8a1bfcbf24b52109dad611db181eba6759566bf532e3e2502f32db5d6d492408872c7a6d081e74d686338f0cee48a5a949cf30e50576150811'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -163,22 +164,21 @@ b2sums=('65a07ff21dba5ecdd1d6ec0586597dd02966baaccba83ce62c4e3d6ac0747c6a3e5eb11
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
-        'ca7b1e96dbd399315b40ca789dad9b5c573a164231834a6a3b8448ab4d98787dc66264e9fc9cf230a06ab58ad4308520f8cadfd79ab8e8a6daf377d98a496490'
+        'fe11304ee87f08f6691a77e5e814073fdb577d60a83df614c98cb05577375b03c979df1f1fa048c5d54798d0054cfc4f3f512d45009a85b6be228792482d5cd6'
         'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543'
         '43d89f815f7c7d7e57463174ad3bfa304a21c93dd34659dfa95824582f482fb97ef70f6d4c83be29b2b10b22c27ff1d19ce4ea1e2a0653fce35d53cdb30fb897'
-        'a2f5d904c4671b05bcbbf3ffffcc1b3bcbeaec13406151103121c66bc4fbce2476b2c607af81447c0409e0065722ec87b740aaa01dc65001a6fc4f8abb76ac62'
+        '0cc87fa8cb54b3001cc24f9c19a19bdc3933475cbe68a120099ecba3efdea5f1af777976cbe35ab7dfea0e51ed60ba0e3e1d9ff56702531f08ce0c0779c2555e'
         '7311e7cfaf4c47ac2cc62ec2590c7f5b09b86615400f87f47bc62418d0028dc78ef88380022a70cbdb5e542becee9ad443cbf03e2793443d0e11656e91c0abc5'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
         '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
         '63718656a6b1cd6e0d9dbff81190ac1b6113b08afd919d0015c708406a7a549718af6c3f9f8239514aedfe1ccf5c8a69207c43a675644fc990c713e8e31d007c'
         '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5'
         '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f'
-        '4553fedafaeee3081857d31eaad0de75c3bb2a08e6dfdf28641351c6dfac835a0a410149402db82330a76181d4b3a19759dfd96e5a52e770732de18b0c319969'
+        '664d6d2d4427040b25d9971fa07b32d3c1343dd60a9702835568ba1e287422ab2659a4a4e324e422755b6c655e324ca203933b6815c7b2e512beb4f15c4a27d8'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
-        '376d0750c18f4218f8df74c5c311b17d7ff6181829831ddc51edf5b318ac3fa149c3d6b9b6ed0b39d34904974e8ae2d3588258844b4831198d4116397c60b14d'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
-        '5d5fb4cd0a686f1a67cc696d9a3c8f29f5555289b561a9379f67e927ac02e6d23ad0710f9a97bde84f8104be36d8d118a1c26471c994c639069720ec90c38047'
+        'ef1de0a729dd64c753c4b7bc097297f4304bb0d714ba3ccc6697fc2d7a775b433eb7bdfc14208059b749276ac9eb33be28d6336849acc5851b22ed1b3b457e02'
         '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
         '365e1ac9f9ee636f2578f6fd8ab16b6460894cb9b76cf0aee5d8a55f42d882d6ee0b04e80194f4c346bfdb0778e11e30b8c03541b4d351602ccfd63cee7e3cf0'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
@@ -216,7 +216,7 @@ b2sums=('65a07ff21dba5ecdd1d6ec0586597dd02966baaccba83ce62c4e3d6ac0747c6a3e5eb11
         '9fbf8cf2aaa18c5cccca24783f40503cf7b7c66731f65450cc312e8b29145c56c23d31d19063dccdf3790ec06480d773d7d64de1672f38b7a4740a8aa0fd4f7d'
         'abafa39e57cf04396b841833215aca427655dd3b56ebc260b8a57d6376360b31a4b1d4493da76ec4dc0129939ab9e23cada70dd6f49e647f02bce12c81f6451a'
         'e6eda6cf4831df11facb124ab80972ddffabc8e2a61f8180275c7a95a8f00917301e9b8912f2418138c9dabd91c979d5d5b5d0b2b4b8eae3891f9c1880a4c526'
-        '8eba2f66280defcc930424d695baff297cff32e91e73f01210bb3f26389ea9e93b4b4d9e2c5a5a048756eff219d51c3fbf3f05690c3c984afcc32c3928df91aa'
+        'de272d4124994e707946255a2bb0c15de912f2d049e777487be962080f2e27463e61c6cd7f3d6d0b4b82002ef18baafdf4e64c8c42de82aff380c53d6eddba9c'
         '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
         '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
@@ -285,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-16-1201"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-09-17-1522"|' Makefile
 
 
   # # # Hotfixes
@@ -362,7 +362,7 @@ prepare() {
 
   # Fix 4570_bp not being reverisble:
   # Easier to fix here than futher the mess of revert patches.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-04_4570-can-be-dismantled.patch
+  #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-04_4570-can-be-dismantled.patch
 
   # Fix .22 casings not stacking when every other casing stacks.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-05_22-casings-can-stack.patch
@@ -471,10 +471,13 @@ prepare() {
   # # missions fixes
   echo "Applying migration fixes"
   # Remove UCP from migration list:
-  # I can hack around this in my mod, but better to remove it here.
-  # It has been gone so long, no save old enough is likely to even load.
+  # Removing item migrations with mods does not seem to work, so here this is.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/migration-01_remove-ucp.patch
 
+  # Remove 8mm FMJ from migration list:
+  # Removing item migrations with mods does not seem to work, so here this is.
+  #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/migration-02_remove-8mm-fmj.patch
+
 
   # # missions fixes
   echo "Applying mission fixes"
diff --git a/ammo-04_4570-can-be-dismantled.patch b/ammo-04_4570-can-be-dismantled.patch
deleted file mode 100644
index 4224e2c..0000000
--- a/ammo-04_4570-can-be-dismantled.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/data/json/recipes/ammo/rifle.json
-+++ b/data/json/recipes/ammo/rifle.json
-@@ -34,6 +34,7 @@
-     "batch_time_factors": [ 60, 5 ],
-     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
-     "charges": 1,
-+    "reversible": true,
-     "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
-     "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ] ]
-   },
diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch
index 502c1bc..01e7733 100644
--- a/ammo-10_ammo-order-fix.patch
+++ b/ammo-10_ammo-order-fix.patch
@@ -392,6 +392,150 @@
      "copy-from": "50bmg",
      "type": "AMMO",
 
+--- a/data/json/items/ammo/8x40mm.json
++++ b/data/json/items/ammo/8x40mm.json
+@@ -1,5 +1,36 @@
+ [
+   {
++    "id": "8mm_caseless",
++    "type": "AMMO",
++    "name": { "str_sp": "8x40mm caseless" },
++    "//": "Cased ammo tends to be roughly $1/shot, more or less.  Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.",
++    "description": "8x40mm caseless rounds.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
++    "weight": "12 g",
++    "volume": "250 ml",
++    "price": 225,
++    "price_postapoc": 8000,
++    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
++    "material": [ "plastic", "powder" ],
++    "symbol": "=",
++    "color": "pink",
++    "count": 40,
++    "stack_size": 40,
++    "ammo_type": "8x40mm",
++    "range": 42,
++    "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 25 },
++    "dispersion": 75,
++    "recoil": 2200,
++    "effects": [ "NEVER_MISFIRES" ]
++  },
++  {
++    "id": "8mm_jhp",
++    "copy-from": "8mm_caseless",
++    "type": "AMMO",
++    "name": { "str": "8x40mm JHP" },
++    "description": "8x40mm caseless rounds, jacketed hollowpoint.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
++    "relative": { "damage": { "damage_type": "bullet", "amount": 11, "armor_penetration": -22 } }
++  },
++  {
+     "id": "8mm_jhp_reloaded",
+     "copy-from": "8mm_jhp",
+     "type": "AMMO",
+@@ -20,6 +51,19 @@
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+   },
+   {
++    "id": "8mm_hvp",
++    "copy-from": "8mm_caseless",
++    "type": "AMMO",
++    "name": { "str": "8x40mm HVP" },
++    "description": "8x40mm caseless rounds, saboted high-velocity penetrator type.  Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette.  Being caseless rounds, these cannot be disassembled or reloaded.",
++    "price": 2500,
++    "price_postapoc": 50000,
++    "count": 20,
++    "//": "Balanced as AP, with 25% higher damage and 50% higher arpen",
++    "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 34 } },
++    "proportional": { "dispersion": 1.5, "recoil": 1.5 }
++  },
++  {
+     "id": "8mm_hvp_reloaded",
+     "copy-from": "8mm_hvp",
+     "type": "AMMO",
+@@ -30,6 +74,16 @@
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+   },
+   {
++    "id": "8mm_inc",
++    "copy-from": "8mm_caseless",
++    "type": "AMMO",
++    "name": { "str": "8x40mm tracer" },
++    "description": "8x40mm caseless rounds with tracers to help keep the weapon they are fired from on target at the risk of igniting flammable substances.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
++    "count": 20,
++    "proportional": { "dispersion": 0.8 },
++    "extend": { "effects": [ "INCENDIARY" ] }
++  },
++  {
+     "id": "8mm_inc_reloaded",
+     "copy-from": "8mm_inc",
+     "type": "AMMO",
+@@ -40,29 +94,6 @@
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+   },
+   {
+-    "id": "8mm_caseless",
+-    "type": "AMMO",
+-    "name": { "str_sp": "8x40mm caseless" },
+-    "//": "Cased ammo tends to be roughly $1/shot, more or less.  Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.",
+-    "description": "8x40mm caseless rounds.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+-    "weight": "12 g",
+-    "volume": "250 ml",
+-    "price": 225,
+-    "price_postapoc": 8000,
+-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+-    "material": [ "plastic", "powder" ],
+-    "symbol": "=",
+-    "color": "pink",
+-    "count": 40,
+-    "stack_size": 40,
+-    "ammo_type": "8x40mm",
+-    "range": 42,
+-    "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 25 },
+-    "dispersion": 75,
+-    "recoil": 2200,
+-    "effects": [ "NEVER_MISFIRES" ]
+-  },
+-  {
+     "id": "8mm_civilian",
+     "copy-from": "8mm_caseless",
+     "type": "AMMO",
+@@ -83,36 +114,5 @@
+       "dispersion": 1.2,
+       "recoil": 0.5
+     }
+-  },
+-  {
+-    "id": "8mm_hvp",
+-    "copy-from": "8mm_caseless",
+-    "type": "AMMO",
+-    "name": { "str": "8x40mm HVP" },
+-    "description": "8x40mm caseless rounds, saboted high-velocity penetrator type.  Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette.  Being caseless rounds, these cannot be disassembled or reloaded.",
+-    "price": 2500,
+-    "price_postapoc": 50000,
+-    "count": 20,
+-    "//": "Balanced as AP, with 25% higher damage and 50% higher arpen",
+-    "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 34 } },
+-    "proportional": { "dispersion": 1.5, "recoil": 1.5 }
+-  },
+-  {
+-    "id": "8mm_inc",
+-    "copy-from": "8mm_caseless",
+-    "type": "AMMO",
+-    "name": { "str": "8x40mm tracer" },
+-    "description": "8x40mm caseless rounds with tracers to help keep the weapon they are fired from on target at the risk of igniting flammable substances.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+-    "count": 20,
+-    "proportional": { "dispersion": 0.8 },
+-    "extend": { "effects": [ "INCENDIARY" ] }
+-  },
+-  {
+-    "id": "8mm_jhp",
+-    "copy-from": "8mm_caseless",
+-    "type": "AMMO",
+-    "name": { "str": "8x40mm JHP" },
+-    "description": "8x40mm caseless rounds, jacketed hollowpoint.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+-    "relative": { "damage": { "damage_type": "bullet", "amount": 11, "armor_penetration": -22 } }
+   }
+ ]
+
 --- a/data/json/items/ammo/shot.json
 +++ b/data/json/items/ammo/shot.json
 @@ -1,5 +1,50 @@
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch
index f2139f2..a383e27 100644
--- a/revert-07_Remove-handload-quality-distinction-1481.patch
+++ b/revert-07_Remove-handload-quality-distinction-1481.patch
@@ -3384,22 +3384,8 @@ index 84d930b02d..c1d954073c 100644
      "type": "recipe",
      "category": "CC_AMMO",
      "subcategory": "CSC_AMMO_RIFLE",
-@@ -392,7 +377,7 @@
-     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
-     "charges": 1,
-     "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
--    "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ] ]
-+    "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ] ]
-   },
-   {
-     "result": "reloaded_4570_bp",
-@@ -406,11 +391,12 @@
-     "batch_time_factors": [ 60, 5 ],
-     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
-     "charges": 1,
-+    "reversible": true,
-     "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
-     "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ] ]
+@@ -406,7 +391,7 @@
+     ]
    },
    {
 -    "result": "reloaded_5x50dart",
@@ -3407,14 +3393,6 @@ index 84d930b02d..c1d954073c 100644
      "type": "recipe",
      "category": "CC_AMMO",
      "subcategory": "CSC_AMMO_RIFLE",
-@@ -421,7 +407,6 @@
-     "batch_time_factors": [ 60, 5 ],
-     "book_learn": [ [ "recipe_caseless", 4 ] ],
-     "charges": 1,
--    "reversible": true,
-     "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
-     "tools": [ [ [ "mold_plastic", -1 ] ] ],
-     "components": [
 @@ -433,7 +418,29 @@
      ]
    },
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index f22c895..596e33a 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -311,21 +311,10 @@ diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json
 index 25d9b16a37b..8ca62a1bfb3 100644
 --- a/data/json/items/ammo/8x40mm.json
 +++ b/data/json/items/ammo/8x40mm.json
-@@ -27,7 +27,7 @@
-     "stack_size": 40,
-     "ammo_type": "8x40mm",
-     "range": 42,
--    "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 18 },
-+    "damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 25 },
-     "dispersion": 75,
-     "recoil": 2200,
-     "effects": [ "NEVER_MISFIRES" ]
-@@ -39,15 +39,12 @@
-     "name": { "str": "8x40mm sporting" },
-     "description": "8x40mm caseless rounds, light sporting load sold for civilian use.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] },
--    "proportional": { "price": 0.8, "damage": { "damage_type": "bullet", "amount": 0.5 }, "dispersion": 1.2, "recoil": 0.5 }
--  },
+@@ -39,14 +39,6 @@
+       "dispersion": 1.2,
+       "recoil": 0.5
+   },
 -  {
 -    "id": "8mm_fmj",
 -    "copy-from": "8mm_caseless",
@@ -333,34 +322,10 @@ index 25d9b16a37b..8ca62a1bfb3 100644
 -    "name": { "str": "8x40mm FMJ" },
 -    "description": "8x40mm caseless rounds, full metal jacket.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
 -    "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 10 } }
-+    "proportional": {
-+      "price": 0.8,
-+      "damage": { "damage_type": "bullet", "amount": 0.5, "armor_penetration": 0.5 },
-+      "dispersion": 1.2,
-+      "recoil": 0.5
-+    }
-   },
+-  },
    {
      "id": "8mm_hvp",
-@@ -58,7 +55,9 @@
-     "price": 2500,
-     "price_postapoc": 50000,
-     "count": 20,
--    "relative": { "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": 20 } }
-+    "//": "Balanced as AP, with 25% higher damage and 50% higher arpen",
-+    "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 34 } },
-+    "proportional": { "dispersion": 1.5, "recoil": 1.5 }
-   },
-   {
-     "id": "8mm_inc",
-@@ -76,6 +75,6 @@
-     "type": "AMMO",
-     "name": { "str": "8x40mm JHP" },
-     "description": "8x40mm caseless rounds, jacketed hollowpoint.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
--    "relative": { "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": -10 } }
-+    "relative": { "damage": { "damage_type": "bullet", "amount": 11, "armor_penetration": -22 } }
-   }
- ]
+     "copy-from": "8mm_caseless",
 diff --git a/data/json/items/ammo/flintlock.json b/data/json/items/ammo/flintlock.json
 index f7fc54e73da..c51ab370e4a 100644
 --- a/data/json/items/ammo/flintlock.json
diff --git a/revert-17_Rivtech-mainline-3092.patch b/revert-17_Rivtech-mainline-3092.patch
index 409665e..b0c8f6b 100644
--- a/revert-17_Rivtech-mainline-3092.patch
+++ b/revert-17_Rivtech-mainline-3092.patch
@@ -3,285 +3,13 @@ From: borsek <bor.arah@gmail.com>
 Date: Sun, 27 Aug 2023 22:53:29 +0100
 Subject: [PATCH] Rivtech mainline (#3092)
 
-* Update rifle.json
-
-* Update 8x40mm.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/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/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,15 @@
-     "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",
 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 ],
@@ -326,45 +54,6 @@ index dc0713e00bc..64b2d43cdf6 100644
      ]
    },
    {
-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,34 +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": "smg_9mm",
 -- 
 2.41.0