Offload many 40mm and rivtech ammo changes to mods.

5 files changed, 11 insertions, 414 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4451f10..286e41b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _pkgname=Cataclysm-BN
 pkgver=0.5.2
 #pkgver=202310040030
 #_pkgver=2023-10-04-0030
-pkgrel=2
+pkgrel=3
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -48,7 +48,6 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "revert-12_fix-i18n-metric-bullets-part-1-rename-.223-5.56x45mm.patch"
         "revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch"
         "revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch"
-        "revert-17_Rivtech-mainline-3092.patch"
         "revert-18-Simplify-broken-limb-mending-3054.patch"
         "revert-19_Fix-Repair-Nanobots-3308.patch"
         "revert-20_Fix-tidy-warnings-3310.patch"
@@ -56,7 +55,6 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "revert-22_feat-content-Biodiesel-Fuel-for-Gasoline-Engines-371.patch"
         "revert-23_fix-balance-no-more-EXP-gain-when-a-skill-is-maxed-o.patch"
         "revert-24_fix-repair-nanobots-not-working-at-all-on-broken-lim.patch"
-        "revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch"
         "revert-26_fix-npc-splints-and-clean-up-iterator-errors-3592.patch"
         "revert-27_fix-NPCs-keep-their-splints-on-3589.patch"
         "revert-28_feat-content-semi-plausible-smokeless-gunpowder-reci.patch"
@@ -163,14 +161,13 @@ b2sums=('9daaba287ef99aa3b33b6f3fbb129b97a2b4dcc265dd7affa08ccee1bdd41b4568e061a
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '5b0e957a5f80ea878c554711dab2fe6759deb3371532cd0f149cfc7a54ec914f445a4aeeff4263df58c947f03fe7be30f2ef175b9a81708e668fd037f9b8ccf8'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
-        'f418feaa3ce18c97cb05694687726d38a5ed49dc5277bbcd49f8f4e12498743b1561207a8cdb509034f8aed48d456ee58fc30da45cd42e2e4fee8e4dd7eb3dac'
+        '4a03288ecc9bb0f342add15413bdc060cb071105d35a4f53d4cce121956e4d95e2b7a9ab9dd9fbf1009c5f54c34776e1f724c3fd171eb5b6ff41db0dbe2fce07'
         '8ed59f0237d4becee71c5f79dd434972eda3a02c56c29642f69c8ac7e638d866df633e0e087b4392bb74017b6ea3641fd6155d86f0c71fc188be19e7a81cc23b'
-        '00b4020df6c0e306b3d16d3caf6abad7357343dfde3c5c901bc8fdc823554f4ae73d46ec47357678da5f3aa18a549dee742df023f37b0f8948a822e712e376b5'
+        'aaf108d56813472ba3e53b63fabc49adbbec01008e0df17f3fecf821784221f03c77eb822858983437dce993913eaa3679217830b101e54d57c6976c52559717'
         '1588c497a7f324cc96ed7aa194a9d99cd5f0ed9dd5db03321f03afcda381b7b2262bbc386f01cb756dd4cd53f73c244012339bb66315ef374a95afcfc2301085'
         '406130adb1be38e25bf750e10166ea55bd8e5c5e500ea81d8af547131a2eea04ce1e4b415f3fe87f4825aa515186b23e612a4961d2b44f538466044d7ec49624'
         'c6854d23ec8eec198e3ee1ca9a7cdb2c8c6f2c20a4e670d6752eb09ec99713dd52d659690e4dce935b11954f7d435d5ea35b4eda23bee3ee5759ef395c18b6ff'
         '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f'
-        '664d6d2d4427040b25d9971fa07b32d3c1343dd60a9702835568ba1e287422ab2659a4a4e324e422755b6c655e324ca203933b6815c7b2e512beb4f15c4a27d8'
         '9c8c49c7c70a40a195e4cafcb22b7e1fab1e276bc59c186e9b09fd77c525dc63fc64719e0f87083f2761172761c9a6dfaf8ff11b405976502e7f55e9606c42c0'
         'dcb8a004230da09e73a340c1acaf3c0071a8c26e3bce9a707b8e1624854aadc9e45f6f3f0d99549ccef5c11a6396dc082691895c437d50188e1b292cb8c10751'
         'b4ca2cb0e7c6c908277b178dae1b946ecdc2b88a8b0b4930450758e03c1f280b3740118cee274886693c158cd4604dc8487211b9185538eaa72852b18f0c67f2'
@@ -178,7 +175,6 @@ b2sums=('9daaba287ef99aa3b33b6f3fbb129b97a2b4dcc265dd7affa08ccee1bdd41b4568e061a
         '80d5920380282ba1c9bd81e8e7055af3c88ff2ecfb1d375ad9f1ddc29b3f61760119b9ec27c14266a020a32d8bdc6f1eb1bce35e847ed87faea0c7623f8b906e'
         '84b9d7d78ad2ab43f24aed79f6843e7fb8f600bb8edea384fa446f0a70bbbd5bdcc391de8bfa25667d3906df8ae8e9154701bb582e058d77e9326a08de3fc00e'
         'bdc83eecf20d82bd314ea6c053c19a990ab25aa067cdec8dab479d59b5169563bf7f368776ca18749918b5ce4a8df4e2a2e700dbbc3a36b38ee61f1b57cd416a'
-        '37c09dab5b6006794023713906e0d5a03824254d156169bc4a0643169b35958821e8d220020dfdb5fb0a587365382a1fcc08ceea6963c974a680901ed91708ba'
         '6735377f8611451333c8d7f009001aa652af9edeeddfcd0cd163d03ea84607803d260eb1338fa35f688954c3cb75bb7bdc41a5ad0497771815dd16afa86d54b3'
         '13e61e9144f4d7325c409553c72ea1fca07009939b53491ea24d208fba7539e7f09063911c76e7d45f7e6bda12a61bbde17a75c319a0b79518e6639d520fa4ef'
         'c4ee693418d394e3b946aa2b9a5f11c04bb0ff11234f830056963f4a755357552f9a769688a086f56f492ed479cf1a44032cfde45c03627adc5fb55f88f806e6'
@@ -322,10 +318,6 @@ prepare() {
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-19_Fix-Repair-Nanobots-3308.patch
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-18-Simplify-broken-limb-mending-3054.patch
 
-  # # Revert mainline craftable rivtech ammo
-  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch
-  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
 
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch
index b9b0786..696bfbe 100644
--- a/revert-07_Remove-handload-quality-distinction-1481.patch
+++ b/revert-07_Remove-handload-quality-distinction-1481.patch
@@ -3377,15 +3377,15 @@ index 84d930b02d..c1d954073c 100644
 +    "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/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index 8660096..01dd4e1 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -24,7 +24,6 @@ Doi
  data/json/items/ammo/40x46mm.json             | 57 ++++++++-----------
  data/json/items/ammo/40x53mm.json             | 29 +++-------
  data/json/items/ammo/8x40mm.json              | 23 ++++----
- data/json/items/generic/casing.json           |  8 +--
  data/json/items/migration.json                | 15 +++++
  data/json/obsoletion/recipes.json             | 10 ++++
  data/json/professions.json                    |  4 +-
@@ -74,60 +73,7 @@ diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.js
 index 530278fd5d8..352b67d154c 100644
 --- a/data/json/items/ammo/40x46mm.json
 +++ b/data/json/items/ammo/40x46mm.json
-@@ -22,7 +22,7 @@
-     "id": "40x46mm_m1006",
-     "copy-from": "40x46mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x46mm M1006" },
-+    "name": { "str": "40x46mm M1006 stun" },
-     "description": "A low velocity less-lethal 40x46mm round with a foam and plastic projectile intended to cause pain and disorientation to the target.  May still injure or kill.",
-     "weight": "68 g",
-     "damage": { "damage_type": "bash", "amount": 20 },
-@@ -33,7 +33,7 @@
-     "id": "40x46mm_m433",
-     "copy-from": "40x46mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x46mm M433" },
-+    "name": { "str": "40x46mm M433 HEDP" },
-     "description": "A low velocity 40x46mm HEDP grenade.  It can penetrate 2 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.",
-     "weight": "230 g",
-     "damage": { "damage_type": "bullet", "amount": 200, "armor_penetration": 30 },
-@@ -44,11 +44,11 @@
-     "id": "40x46mm_m576",
-     "copy-from": "40x46mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x46mm M576" },
-+    "name": { "str": "40x46mm M576 buckshot" },
-     "description": "A 40x46mm buckshot load, designed for use in thick vegetation or room clearing.",
-     "weight": "120 g",
-     "range": 12,
--    "damage": { "damage_type": "bullet", "amount": 120, "armor_penetration": 4 },
-+    "damage": { "damage_type": "bullet", "amount": 120 },
-     "recoil": 1000,
-     "casing": "40x46mm_m199_casing",
-     "extend": { "effects": [ "SHOT" ] }
-@@ -57,7 +57,7 @@
-     "id": "40x46mm_m651",
-     "copy-from": "40x46mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x46mm M651" },
-+    "name": { "str": "40x46mm M651 teargas" },
-     "description": "A low velocity 40mm tear gas canister.  It is effective for riot control and driving infantry from entrenched positions",
-     "weight": "290 g",
-     "damage": { "damage_type": "bullet", "amount": 15 },
-@@ -69,37 +69,25 @@
-     "id": "40x46mm_buckshot_m118",
-     "copy-from": "40x46mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x46mm buckshot" },
--    "description": "An improvised 40x46mm buckshot load somewhat resembling M576.",
-+    "name": { "str": "improvised 40x46mm buckshot" },
-+    "description": "An improvised 40x46mm buckshot load somewhat resembling M576.  Aside from using the M118 casing normally used by HEDP shells, it performs as well as buckshot loads using the intended M199 casing.",
-     "weight": "120 g",
-     "range": 10,
--    "damage": { "damage_type": "bullet", "amount": 90, "armor_penetration": 4 },
-+    "damage": { "damage_type": "bullet", "amount": 120 },
-     "recoil": 1000,
+@@ -69,19 +69,6 @@
      "casing": "40x46mm_m118_casing",
      "extend": { "effects": [ "SHOT" ] }
    },
@@ -147,120 +93,11 @@ index 530278fd5d8..352b67d154c 100644
    {
      "id": "40x46mm_slug_m118",
      "copy-from": "40x46mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x46mm slug" },
--    "description": "An improvised 40x46mm load resembling an oversized shotgun slug.",
-+    "name": { "str": "improvised 40x46mm slug" },
-+    "description": "An improvised 40x46mm load resembling an oversized shotgun slug.  Aside from using the M118 casing normally used by HEDP shells, it performs as well as slugs using the M199 casing.",
-     "weight": "120 g",
-     "range": 10,
--    "damage": { "damage_type": "bullet", "amount": 120, "armor_penetration": 6 },
-+    "//": "Balanced as FMJ.",
-+    "damage": { "damage_type": "bullet", "amount": 96, "armor_penetration": 42 },
-     "recoil": 1000,
-     "casing": "40x46mm_m118_casing"
-   },
-@@ -107,11 +95,12 @@
-     "id": "40x46mm_slug_m199",
-     "copy-from": "40x46mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x46mm slug" },
--    "description": "An improvised 40x46mm load resembling an oversized shotgun slug.",
-+    "name": { "str": "improvised 40x46mm slug" },
-+    "description": "An improvised 40x46mm load resembling an oversized shotgun slug, loaded into the M199 casing used by M576 buckshot shells.",
-     "weight": "120 g",
-     "range": 10,
--    "damage": { "damage_type": "bullet", "amount": 120, "armor_penetration": 6 },
-+    "//": "Balanced as FMJ.",
-+    "damage": { "damage_type": "bullet", "amount": 96, "armor_penetration": 42 },
-     "recoil": 1000,
-     "casing": "40x46mm_m199_casing"
-   },
-@@ -119,11 +108,12 @@
-     "id": "40x46mm_flechette_m118",
-     "copy-from": "40x46mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x46mm flechette" },
--    "description": "An improvised 40x46mm flechette load containing 70 steel darts.",
-+    "name": { "str": "improvised 40x46mm flechette" },
-+    "description": "An improvised 40x46mm flechette load containing 70 steel darts.  Aside from using the M118 casing normally used by HEDP shells, it performs as well as flechette shells using the M199 casing.",
-     "weight": "120 g",
-     "range": 10,
--    "damage": { "damage_type": "bullet", "amount": 75, "armor_penetration": 6 },
-+    "//": "Balanced as AP.",
-+    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
-     "recoil": 1000,
-     "casing": "40x46mm_m118_casing",
-     "extend": { "effects": [ "SHOT" ] }
-@@ -132,11 +122,12 @@
-     "id": "40x46mm_flechette_m199",
-     "copy-from": "40x46mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x46mm flechette" },
--    "description": "An improvised 40x46mm flechette load containing 70 steel darts.",
-+    "name": { "str": "improvised 40x46mm flechette" },
-+    "description": "An improvised 40x46mm flechette load containing 70 steel darts, loaded into the M199 casing used by M576 buckshot shells.",
-     "weight": "120 g",
-     "range": 10,
--    "damage": { "damage_type": "bullet", "amount": 75, "armor_penetration": 6 },
-+    "//": "Balanced as AP.",
-+    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
-     "recoil": 1000,
-     "casing": "40x46mm_m199_casing",
-     "extend": { "effects": [ "SHOT" ] }
 diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.json
 index 4541de0dab2..aeb0d2e732e 100644
 --- a/data/json/items/ammo/40x53mm.json
 +++ b/data/json/items/ammo/40x53mm.json
-@@ -22,11 +22,12 @@
-     "id": "40x53mm_m1001",
-     "copy-from": "40x53mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x53mm M1001" },
-+    "name": { "str": "40x53mm M1001 flechette" },
-     "description": "40x53mm canister shot loaded with 17 grain flechettes.",
-     "weight": "340 g",
-+    "//": "Balanced as AP.",
-     "range": 10,
--    "damage": { "damage_type": "bullet", "amount": 150, "armor_penetration": 10 },
-+    "damage": { "damage_type": "bullet", "amount": 91, "armor_penetration": 78 },
-     "recoil": 1000,
-     "casing": "40x53mm_m169_casing",
-     "extend": { "effects": [ "SHOT" ] }
-@@ -35,6 +36,6 @@
-     "id": "40x53mm_m430a1",
-     "copy-from": "40x53mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x53mm M430A1" },
-+    "name": { "str": "40x53mm M430A1 HEDP" },
-     "description": "A high velocity 40x53mm HEDP grenade.  It can penetrate 3 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.",
-     "weight": "340 g",
-@@ -47,11 +48,11 @@
-     "id": "40x53mm_buckshot_m169",
-     "copy-from": "40x53mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x53mm buckshot" },
-+    "name": { "str": "improvised 40x53mm buckshot" },
-     "description": "An improvised 40x53mm buckshot load somewhat resembling M576.",
-     "weight": "340 g",
-     "range": 10,
--    "damage": { "damage_type": "bullet", "amount": 100, "armor_penetration": 4 },
-+    "damage": { "damage_type": "bullet", "amount": 130 },
-     "recoil": 1200,
-     "casing": "40x53mm_m169_casing",
-     "extend": { "effects": [ "SHOT" ] }
-@@ -60,25 +61,13 @@
-     "id": "40x53mm_slug_m169",
-     "copy-from": "40x53mm_grenade",
-     "type": "AMMO",
--    "name": { "str": "40x53mm slug" },
-+    "name": { "str": "improvised 40x53mm slug" },
-     "description": "An improvised 40x53mm load resembling an oversized shotgun slug.",
-     "weight": "340 g",
-     "range": 10,
--    "damage": { "damage_type": "bullet", "amount": 130, "armor_penetration": 6 },
-+    "//": "Balanced as FMJ.",
-+    "damage": { "damage_type": "bullet", "amount": 104, "armor_penetration": 46 },
+@@ -60,17 +61,4 @@
      "recoil": 1200,
      "casing": "40x53mm_m169_casing"
 -  },
@@ -297,46 +134,6 @@ index 25d9b16a37b..8ca62a1bfb3 100644
    {
      "id": "8mm_hvp",
      "copy-from": "8mm_caseless",
-diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json
-index 510b4ba9c1f..f486ad3126a 100644
---- a/data/json/items/generic/casing.json
-+++ b/data/json/items/generic/casing.json
-@@ -148,7 +148,7 @@
-     "type": "GENERIC",
-     "category": "spare_parts",
-     "name": { "str": "40x46mm M212 casing" },
--    "description": "A large canister from a spent 40mm cartridge, used by M1006 stun rounds.",
-+    "description": "A large canister from a spent 40mm cartridge, used by M1006 stun rounds.  Not very useful now that the world has ended; less-lethal rounds aren't very useful against undead, and it likely won't tolerate higher pressures.",
-     "weight": "50 g",
-     "volume": "55ml",
-     "material": "steel",
-@@ -160,7 +160,7 @@
-     "type": "GENERIC",
-     "category": "spare_parts",
-     "name": { "str": "40x46mm M118 casing" },
--    "description": "A large canister from a spent 40mm cartridge, used by M433 HEDP rounds.",
-+    "description": "A large canister from a spent 40mm cartridge, used by M433 HEDP rounds.  It could be repurposed for makeshift buckshot and other handloads.",
-     "weight": "50 g",
-     "volume": "58ml",
-     "material": "steel",
-@@ -172,7 +172,7 @@
-     "type": "GENERIC",
-     "category": "spare_parts",
-     "name": { "str": "40x46mm M199 casing" },
--    "description": "A large canister from a spent 40mm cartridge, used by M576 buckshot rounds.",
-+    "description": "A large canister from a spent 40mm cartridge, used by M576 buckshot rounds.  It could be reused to make new buckshot or other makeshift handloads.",
-     "weight": "50 g",
-     "volume": "59ml",
-     "material": "steel",
-@@ -184,7 +184,7 @@
-     "type": "GENERIC",
-     "category": "spare_parts",
-     "name": { "str": "40x46mm M195 casing" },
--    "description": "A large canister from a spent 40mm cartridge, used by M651 teargas rounds.",
-+    "description": "A large canister from a spent 40mm cartridge, used by M651 teargas rounds.  Not very useful now that the world has ended; less-lethal rounds aren't very useful against undead, and it likely won't tolerate higher pressures.",
-     "weight": "50 g",
-     "volume": "45ml",
-     "material": "steel",
 diff --git a/data/json/items/migration.json b/data/json/items/migration.json
 index ed67da394f0..31158a8187c 100644
 --- a/data/json/obsoletion/migration.json
diff --git a/revert-17_Rivtech-mainline-3092.patch b/revert-17_Rivtech-mainline-3092.patch
deleted file mode 100644
index b0c8f6b..0000000
--- a/revert-17_Rivtech-mainline-3092.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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)
-
----
- data/json/recipes/ammo/rifle.json          | 153 +++++++++++++++++++--
- 6 files changed, 274 insertions(+), 124 deletions(-)
-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
-@@ -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 ] ]
-     ]
-   },
-   {
--- 
-2.41.0
-
diff --git a/revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch b/revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch
deleted file mode 100644
index 563e693..0000000
--- a/revert-25_feat-balance-improve-consistency-of-handmade-caseles.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 2af4ddb342e4b947a6682f675d2df2f2477c7d01 Mon Sep 17 00:00:00 2001
-From: YeOldeMiller <36291373+YeOldeMiller@users.noreply.github.com>
-Date: Wed, 13 Dec 2023 06:32:55 +0300
-Subject: [PATCH 251/318] feat(balance): improve consistency of handmade
- caseless ammo recipes (#3875)
-
-* Improve consistency of handmade caseless ammo recipes
-
-* 8x40 HVP ammo recipe: replace extra metals with flechettes
-
-* Remove nails from 20x66 flechette recipe
----
- data/json/recipes/ammo/rifle.json | 21 +++++++++++----------
- data/json/recipes/ammo/shot.json  | 12 +++++++++---
- 2 files changed, 20 insertions(+), 13 deletions(-)
-
-diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json
-index 64b2d43cdf6..68c1af6aa2d 100644
---- a/data/json/recipes/ammo/rifle.json
-+++ b/data/json/recipes/ammo/rifle.json
-@@ -424,7 +424,7 @@
-         [ "platinum_small", 4 ]
-       ],
-       [ [ "copper", 40 ] ],
--      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
-+      [ [ "smrifle_primer", 40 ], [ "lgpistol_primer", 40 ] ]
-     ]
-   },
-   {
-@@ -456,7 +456,7 @@
-         [ "platinum_small", 4 ]
-       ],
-       [ [ "copper", 80 ] ],
--      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
-+      [ [ "smrifle_primer", 40 ], [ "lgpistol_primer", 40 ] ]
-     ]
-   },
-   {
-@@ -479,16 +479,17 @@
-       [ [ "gunpowder", 400 ] ],
-       [ [ "oxy_powder", 120 ] ],
-       [ [ "lead", 80 ] ],
-+      [ [ "combatnail", 40 ] ],
-       [
--        [ "gold_small", 40 ],
--        [ "silver_small", 40 ],
--        [ "tin", 40 ],
--        [ "bismuth", 40 ],
--        [ "solder_wire", 40 ],
--        [ "platinum_small", 40 ]
-+        [ "gold_small", 4 ],
-+        [ "silver_small", 4 ],
-+        [ "tin", 4 ],
-+        [ "bismuth", 4 ],
-+        [ "solder_wire", 4 ],
-+        [ "platinum_small", 4 ]
-       ],
-       [ [ "copper", 80 ] ],
--      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
-+      [ [ "smrifle_primer", 40 ], [ "lgpistol_primer", 40 ] ]
-     ]
-   },
-   {
-@@ -521,7 +522,7 @@
-         [ "platinum_small", 4 ]
-       ],
-       [ [ "copper", 40 ] ],
--      [ [ "smrifle_primer", 1 ], [ "lgpistol_primer", 1 ] ]
-+      [ [ "smrifle_primer", 40 ], [ "lgpistol_primer", 40 ] ]
-     ]
-   },
-   {
-diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json
-index 9caa13c0daf..738d8086014 100644
---- a/data/json/recipes/ammo/shot.json
-+++ b/data/json/recipes/ammo/shot.json
-@@ -652,6 +652,7 @@
-     "skills_required": [ "cooking", 2 ],
-     "difficulty": 8,
-     "time": 45000,
-+    "charges": 20,
-     "batch_time_factors": [ 60, 5 ],
-     "book_learn": [ [ "recipe_caseless", 5 ] ],
-     "qualities": [ { "id": "CHEM", "level": 2 } ],
-@@ -662,7 +663,8 @@
-       [ [ "oxy_powder", 60 ] ],
-       [ [ "gunpowder", 120 ] ],
-       [ [ "lead", 160 ] ],
--      [ [ "gold_small", 5 ], [ "silver_small", 5 ], [ "tin", 5 ], [ "bismuth", 5 ], [ "solder_wire", 5 ] ]
-+      [ [ "gold_small", 5 ], [ "silver_small", 5 ], [ "tin", 5 ], [ "bismuth", 5 ], [ "solder_wire", 5 ] ],
-+      [ [ "shotgun_primer", 20 ] ]
-     ]
-   },
-   {
-@@ -674,6 +676,7 @@
-     "skills_required": [ "cooking", 2 ],
-     "difficulty": 8,
-     "time": 45000,
-+    "charges": 20,
-     "batch_time_factors": [ 60, 5 ],
-     "book_learn": [ [ "recipe_caseless", 5 ] ],
-     "qualities": [ { "id": "CHEM", "level": 2 } ],
-@@ -691,7 +694,8 @@
-         [ "bismuth", 10 ],
-         [ "solder_wire", 10 ]
-       ],
--      [ [ "nail", 240 ], [ "combatnail", 240 ] ]
-+      [ [ "combatnail", 240 ] ],
-+      [ [ "shotgun_primer", 20 ] ]
-     ]
-   },
-   {
-@@ -703,6 +707,7 @@
-     "skills_required": [ "cooking", 2 ],
-     "difficulty": 8,
-     "time": 45000,
-+    "charges": 20,
-     "batch_time_factors": [ 60, 5 ],
-     "book_learn": [ [ "recipe_caseless", 5 ] ],
-     "qualities": [ { "id": "CHEM", "level": 2 } ],
-@@ -713,7 +718,8 @@
-       [ [ "oxy_powder", 80 ] ],
-       [ [ "gunpowder", 160 ] ],
-       [ [ "lead", 240 ] ],
--      [ [ "gold_small", 8 ], [ "silver_small", 8 ], [ "tin", 8 ], [ "bismuth", 8 ], [ "solder_wire", 8 ] ]
-+      [ [ "gold_small", 8 ], [ "silver_small", 8 ], [ "tin", 8 ], [ "bismuth", 8 ], [ "solder_wire", 8 ] ],
-+      [ [ "shotgun_primer", 20 ] ]
-     ]
-   }
- ]
--- 
-2.42.0
-