Clean out 50 bmg from the reverts.

Remove some clutter from the handloaded revert.

4 files changed, 15 insertions, 108 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 83f2a18..9b5ec6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202310040030
 _pkgver=2023-10-04-0030
-pkgrel=5
+pkgrel=6
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -55,17 +55,10 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-19_Fix-Repair-Nanobots-3308.patch"
         "revert-20_Fix-tidy-warnings-3310.patch"
 
-        #"revert-21-1_perf-cache-character-s-dead-state-3282.patch"
-        #"revert-21-2_Fix-eternal-drowning-when-NPC-is-thrown-into-deep-wa.patch"
-        #"revert-21-3_fix-only-set-cached_dead_state-if-npc-is-actually-de.patch"
-        #"revert-21-4_perf-correctly-cache-and-invalidate-dead-state-3304.patch"
-
-        "ammo-01_inconsistent-ammo-names.patch"
-        "ammo-03_fix-reloaded-50bmg.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"
+        "ammo-13_fix-reloaded-50bmg.patch"
 
         "armor-01_ankle-ammo-pouch-is-not-a-backpack.patch"
         "armor-02_fix-survivor-fingerless-gloves-warmth.patch"
@@ -171,11 +164,11 @@ b2sums=('57b0a71622ac7d363d90d57afc184425db5ba31ded1440b69e760ad55597b9d9e4d75cc
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
-        '17eca53b168574006ad517949cda3a7268be06488a83696ecd8c8fba31ae04edd141c86e7114a8796fdb3e8aa865f56df02a166dbdc76bcb1082905a7c5556c1'
+        '5fee4822e1b80fc831494f1fc94666ba3cb60d56273b1dbcdb169e22ae1a753d874736b4c26bd7ed8bf8fca1e5dac047fb965be29d71d171ca4695e6eef692c8'
         'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543'
-        'fedcde7b8993f810e529e492c73c61d7acc4dd1965ac0d1abcb3bb1bdd23a689988d66fe9012c0cf9c4f524999aff42224ee3ccb850b8d9256ee596db3d9ffd8'
+        'f52685186ddec48e21a49d75913a4d8d65c43a28164ec7c7c3beb89a2551b6aa6a91a221c0b3dd03e3f18339f94197fff2ec78d481a7267d75f7c27a0c1f587a'
         'e1eafcb481c11104e682e4cafd81f7d70261a7397c38bb4acf85f8999a16446c1fe508802d362b1a30e4c659966b635dc4cae75ef99416bacd866cb5aa9ed545'
-        '7c06a4bea4da71f00645c12fe1d244a5010480acec48cf0a98c9f6030f2c6ad7bcf4c8959ce9cfc2db4412cf5ce8dfdea60993bafb7fcda765f9b7030b20a226'
+        'ec8b918bc644b51c63246b33adc512a7c7eb1f1c5c72da043a4c6e9b548199d4ae28b634d002931663fdc4e3026ac455ec8fbf6b49246b99eed325dd9d1c231b'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
         'd78d2bb16e19d1bcd9b3a46182048f41705cf8ddba89e051aef7f0e28aea52536467fa4a1e39db9f64d7cb53d19882e7e12a77613369a51d8fd937192609d0ff'
         '63d334661bfe5270910de1c9689892aadfabbc5ee1a14508caccfd0639404f337900906fe91dab453ee5036290e485231d9072b977970d438c938ce55f8d2bf3'
@@ -185,11 +178,10 @@ b2sums=('57b0a71622ac7d363d90d57afc184425db5ba31ded1440b69e760ad55597b9d9e4d75cc
         'ee3722ba1367d993605c0cee12e67b8e10dcda0401c4480d8915bd3ac587c8a3b84379ef6f98d6e93cf433b1dae7a0db35937271787bc6b893b373dc1d44ae7d'
         'dcb8a004230da09e73a340c1acaf3c0071a8c26e3bce9a707b8e1624854aadc9e45f6f3f0d99549ccef5c11a6396dc082691895c437d50188e1b292cb8c10751'
         '19a91d07aff74b5718c239c50a559e17295cbca4b472bb75fd37b3569930c0454928e7f14f7e387eddf9d29a4e50d1fbed319e9e00338c50d40849ea0e2ee545'
-        '61236054eedd254a6e53c19d74b6b686e257644bd3d52120187e3c01131686b71c007addd8d999978e351769e44cd7a589f32178f9d7870201621669d41369e3'
-        '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
         'eed0a3489e58a497c5941c182a83fb16d92c708a702da6365b39c81428b6cec1bff8fe78749f9f510cb880166a6851d61195e3066b8c19e2d3d763dd6ef38cfa'
         '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
         '365e1ac9f9ee636f2578f6fd8ab16b6460894cb9b76cf0aee5d8a55f42d882d6ee0b04e80194f4c346bfdb0778e11e30b8c03541b4d351602ccfd63cee7e3cf0'
+        '6f79418343f29e3758e826417e475d957e0c372fab8c06855f5a86b4636ce6e8c68a770a4a3ec327361ec69d042d627062b2c2db23e5e437cef855683242545e'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
         '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3'
@@ -304,12 +296,6 @@ prepare() {
 
   # # # Reverts
   echo "Applying revert patches"
-  # # Revert the bugtastic dead npc cache changes for now:
-  # This is causing a huge amount of serious bugs. Revert until things are fixed properly.
-  #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-21-4_perf-correctly-cache-and-invalidate-dead-state-3304.patch
-  #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-21-3_fix-only-set-cached_dead_state-if-npc-is-actually-de.patch
-  #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-21-2_Fix-eternal-drowning-when-NPC-is-thrown-into-deep-wa.patch
-  #patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-21-1_perf-cache-character-s-dead-state-3282.patch
 
   # # Revert easy-mode limb mending and related commits
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-20_Fix-tidy-warnings-3310.patch
@@ -335,13 +321,9 @@ prepare() {
   # Needless item removal
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch
 
-  # Still more ammo patches to revert
+  # Revert ammo reblance 6,7,8
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-10_still-another-ammo-patch-to-undo.patch
-
-  # Revert yet more ammo rebalancing
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-09_undo-yet-more-ammo-balancing.patch
-
-  # Revert balance pass of rifle ammunition.
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-08_undo-rifle-balance-pass.patch
 
   # Fix the duplication of 4570_bp
@@ -370,11 +352,8 @@ prepare() {
   # # Ammo fixes
   echo "Applying ammo fixes"
   # Fix mulitple inconsistent ammunition names and handloaded status.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-01_inconsistent-ammo-names.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
+  # Offladed to ammo rebalance mod
+  #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-01_inconsistent-ammo-names.patch
 
   # Fix black powder scrap shot not being flagged as black powder.
   # Offloaded to ammo rebalance mod
@@ -384,7 +363,7 @@ prepare() {
   # Having copy-from items occuring earlier in a json than the item being copied from prevents items based on it being modified.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-10_ammo-order-fix.patch
 
-  # Fix 40mm rounds volume.
+  # Fix 40mm round volume:
   # 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
 
@@ -393,6 +372,11 @@ prepare() {
   # Abstract change, so this cannot be fixed by a mod.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-12_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.
+  # This is fixed here instead of a mod so as to prevent copy-from dependency loops.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-13_fix-reloaded-50bmg.patch
+
 
   # # armor fixes
   echo "Applying armor fixes"
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch
index 2ffb29c..38ba1d8 100644
--- a/revert-07_Remove-handload-quality-distinction-1481.patch
+++ b/revert-07_Remove-handload-quality-distinction-1481.patch
@@ -3,35 +3,6 @@ From: KheirFerrum <102964889+KheirFerrum@users.noreply.github.com>
 Date: Tue, 3 May 2022 04:51:35 +0100
 Subject: [PATCH 06/10] Remove handload quality distinction (#1481)
 
-* Make Factory Ammo
-
-* Obsoletion, Recipe balancing, Migration Test
-
-Uncraft and Craft were heavily unbalanced and pulling materials out of thin air during uncraft.
-
-Moved all reloaded ammo into the obsoletion/items.json
-
-MIgration missed 5x50mm flechettes, fixed that.
-
-* Fix bugs
-
-Bugtest revealed human error. Fixed and retested.
-
-* Styling fixes
-
-* Fixed Item groups. reloaded_4570_bp unobsoleted.
-
-reloaded_4570_bp probably removed because of reloaded prefix, but is actually a blackpowder load, and the recipe still remains in the game, so I put it back since it appears to be an oversight.
-
-All reference to reloaded ammunition in item_groups has been replaced with factory ammo.
-
-* 4570_bp
-
-For some reason this predates my changes to the system???
-
-This means that all this time we've had a recipe that leads to an obsoleted item.
-
-Added back into the game and made it reversible because I don't really understand why it was removed.
 ---
  .../itemgroups/Weapons_Mods_Ammo/ammo.json    | 118 ++--
  data/json/items/ammo/10mm.json                |   9 -
diff --git a/revert-08_undo-rifle-balance-pass.patch b/revert-08_undo-rifle-balance-pass.patch
index 2d7295e..7f2eb7f 100644
--- a/revert-08_undo-rifle-balance-pass.patch
+++ b/revert-08_undo-rifle-balance-pass.patch
@@ -11,7 +11,6 @@ Subject: [PATCH 074/177] Ammo rebalance project, part 6 (#1851)
  data/json/items/ammo/36paper.json | 4 ++--
  data/json/items/ammo/44paper.json | 4 ++--
  data/json/items/ammo/4570.json    | 8 +++++---
- data/json/items/ammo/50.json      | 6 ++++--
  data/json/items/ammo/545x39.json  | 5 +++--
  data/json/items/ammo/700nx.json   | 3 ++-
  data/json/items/ammo/762.json     | 2 +-
@@ -141,30 +140,6 @@ index 360afcdb1c5..bc4f6de6ecb 100644
 +    "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -16 }, "recoil": -900 }
    },
    {
-diff --git a/data/json/items/ammo/50.json b/data/json/items/ammo/50.json
-index 058da3c5608..3edf19bbc59 100644
---- a/data/json/items/ammo/50.json
-+++ b/data/json/items/ammo/50.json
-@@ -27,7 +27,8 @@
-     "ammo_type": "50",
-     "casing": "50_casing",
-     "range": 110,
--    "damage": { "damage_type": "bullet", "amount": 131, "armor_penetration": 28 },
-+    "//": "Base damage of 131, balance reduction to roughly 75%.",
-+    "damage": { "damage_type": "bullet", "amount": 100, "armor_penetration": 56 },
-     "dispersion": 150,
-     "recoil": 5000,
-     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
-@@ -49,7 +50,8 @@
-     "name": { "str": ".50 BMG M2 AP" },
-     "description": "Variant of the .50 BMG round that uses a core of very dense, hardened tungsten steel.  Penetration is increased, but damage is reduced.",
-     "count": 10,
--    "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } },
-+    "//": "Balanced as AP, 7/8 damage, arpen matches damage.",
-+    "relative": { "damage": { "damage_type": "bullet", "amount": -12, "armor_penetration": 32 } },
-     "dispersion": 600
-   },
-   {
 diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json
 index 13b13adcf22..1ef50ff5e28 100644
 --- a/data/json/items/ammo/545x39.json
diff --git a/revert-10_still-another-ammo-patch-to-undo.patch b/revert-10_still-another-ammo-patch-to-undo.patch
index d880c5f..0cd3b51 100644
--- a/revert-10_still-another-ammo-patch-to-undo.patch
+++ b/revert-10_still-another-ammo-patch-to-undo.patch
@@ -12,7 +12,6 @@ Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258)
  data/json/items/ammo/3006.json   |  2 +-
  data/json/items/ammo/300blk.json |  2 +-
  data/json/items/ammo/4570.json   | 10 +++++-----
- data/json/items/ammo/50.json     |  4 ++--
  data/json/items/ammo/545x39.json |  4 ++--
  data/json/items/ammo/700nx.json  |  4 ++--
  data/json/items/ammo/762.json    |  2 +-
@@ -105,28 +104,6 @@ index bc4f6de6ecb..048d32d35c7 100644
 +    "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -25 }, "recoil": -900 }
    },
    {
-diff --git a/data/json/items/ammo/50.json b/data/json/items/ammo/50.json
-index 3edf19bbc59..3338049784d 100644
---- a/data/json/items/ammo/50.json
-+++ b/data/json/items/ammo/50.json
-@@ -28,7 +28,7 @@
-     "casing": "50_casing",
-     "range": 110,
-     "//": "Base damage of 131, balance reduction to roughly 75%.",
--    "damage": { "damage_type": "bullet", "amount": 100, "armor_penetration": 56 },
-+    "damage": { "damage_type": "bullet", "amount": 100, "armor_penetration": 44 },
-     "dispersion": 150,
-     "recoil": 5000,
-     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
-@@ -51,7 +51,7 @@
-     "description": "Variant of the .50 BMG round that uses a core of very dense, hardened tungsten steel.  Penetration is increased, but damage is reduced.",
-     "count": 10,
-     "//": "Balanced as AP, 7/8 damage, arpen matches damage.",
--    "relative": { "damage": { "damage_type": "bullet", "amount": -12, "armor_penetration": 32 } },
-+    "relative": { "damage": { "damage_type": "bullet", "amount": -12, "armor_penetration": 31 } },
-     "dispersion": 600
-   },
-   {
 diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json
 index 1ef50ff5e28..de5d665d24d 100644
 --- a/data/json/items/ammo/545x39.json