Remove more clutter from patches.

4 files changed, 13 insertions, 50 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fc16682..570cf41 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=1
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -171,21 +171,21 @@ b2sums=('57b0a71622ac7d363d90d57afc184425db5ba31ded1440b69e760ad55597b9d9e4d75cc
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
-        'fe11304ee87f08f6691a77e5e814073fdb577d60a83df614c98cb05577375b03c979df1f1fa048c5d54798d0054cfc4f3f512d45009a85b6be228792482d5cd6'
+        '23f1d086c6faf35bf139d0ec490f9e14a2155fb04425112a54118ea645b446216e897f313de3bfc8e754152eb4c505fae345b2c8a7008629473f5439959eb4c9'
         'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543'
         'cebd24bd72ace004972900eac56fc2b4d43d22d0fb7dbac014b55848f80067ba9c09e721543784bb9db19f28af3803288bd2be5821cbb97ebfac7a94868191a5'
-        '34f3e3a7d323991976cf53a86ddf3685b9c52c204dd66c25c67019cc1bb608eea1f2380a9a5e5f68f3cbdc1f484ca78991e0eaf0aa60217b4cea6a55ea670795'
+        'e1eafcb481c11104e682e4cafd81f7d70261a7397c38bb4acf85f8999a16446c1fe508802d362b1a30e4c659966b635dc4cae75ef99416bacd866cb5aa9ed545'
         '7311e7cfaf4c47ac2cc62ec2590c7f5b09b86615400f87f47bc62418d0028dc78ef88380022a70cbdb5e542becee9ad443cbf03e2793443d0e11656e91c0abc5'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
-        '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
-        '63718656a6b1cd6e0d9dbff81190ac1b6113b08afd919d0015c708406a7a549718af6c3f9f8239514aedfe1ccf5c8a69207c43a675644fc990c713e8e31d007c'
+        'd78d2bb16e19d1bcd9b3a46182048f41705cf8ddba89e051aef7f0e28aea52536467fa4a1e39db9f64d7cb53d19882e7e12a77613369a51d8fd937192609d0ff'
+        '909df4e1b7182e7d18e76b22c2ed0dc5d20ba4ca7df8ac03ada87ea03c623645ffe598161800c84f74aeb1d5d80923cbdf946eb9a88677216de3a13d81092455'
         '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5'
         '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f'
         '664d6d2d4427040b25d9971fa07b32d3c1343dd60a9702835568ba1e287422ab2659a4a4e324e422755b6c655e324ca203933b6815c7b2e512beb4f15c4a27d8'
         'ee3722ba1367d993605c0cee12e67b8e10dcda0401c4480d8915bd3ac587c8a3b84379ef6f98d6e93cf433b1dae7a0db35937271787bc6b893b373dc1d44ae7d'
         'dcb8a004230da09e73a340c1acaf3c0071a8c26e3bce9a707b8e1624854aadc9e45f6f3f0d99549ccef5c11a6396dc082691895c437d50188e1b292cb8c10751'
         '19a91d07aff74b5718c239c50a559e17295cbca4b472bb75fd37b3569930c0454928e7f14f7e387eddf9d29a4e50d1fbed319e9e00338c50d40849ea0e2ee545'
-        'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
+        'ab128ffcdfed701761c927ea7a8a355b6a10991d124f1d4ee309b030f9825ad8631eee19dfc89f49b9e8af7892fb4cf68066f90498c39084aad067f9a0a953a6'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
         'f0643d3588527dbbdb11ead32b64e0d7a3aaafd0d7ba594bf79fae2ce15de758178d0419b2cfd98e642c55579a50a128527c68ba8e1d216ba6dc2c4e5b8129fd'
         '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
diff --git a/ammo-01_inconsistent-ammo-names.patch b/ammo-01_inconsistent-ammo-names.patch
index 1de5127..584b613 100644
--- a/ammo-01_inconsistent-ammo-names.patch
+++ b/ammo-01_inconsistent-ammo-names.patch
@@ -156,17 +156,6 @@
      "description": "Variant of the .50 BMG round that uses a core hardened steel.  Penetration is increased, but damage is reduced.",
      "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
---- a/data/json/items/ammo/5x50.json
-+++ b/data/json/items/ammo/5x50.json
-@@ -38,7 +38,7 @@
-     "id": "reloaded_5x50dart",
-     "copy-from": "5x50dart",
-     "type": "AMMO",
--    "name": { "str": "5x50mm flechette, reloaded" },
-+    "name": { "str": "RA110 5x50mm flechette, reloaded" },
-     "price_postapoc": 1200,
-     "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.",
-     "effects": [ "COOKOFF", "RECYCLED" ],
 --- a/data/json/items/ammo/762x25.json
 +++ b/data/json/items/ammo/762x25.json
 @@ -68,7 +68,8 @@
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch
index a383e27..28791d8 100644
--- a/revert-07_Remove-handload-quality-distinction-1481.patch
+++ b/revert-07_Remove-handload-quality-distinction-1481.patch
@@ -1002,9 +1002,9 @@ index c1a285cb91..5a8901e578 100644
 --- a/data/json/items/ammo/5x50.json
 +++ b/data/json/items/ammo/5x50.json
 @@ -33,16 +33,5 @@
-     "price_postapoc": 2400,
-     "relative": { "range": -10, "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": 20 }, "dispersion": 20 },
-     "proportional": { "recoil": 1.1 }
+     "//": "Balanced as AP, with 25% higher damage and 50% higher arpen"
+     "relative": { "range": -10, "damage": { "damage_type": "bullet", "amount": 8, "armor_penetration": 13 } },
+     "proportional": { "dispersion": 1.5, "recoil": 1.5 }
 -  },
 -  {
 -    "id": "reloaded_5x50dart",
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index 6d2f0c3..11d3a7e 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -23,7 +23,6 @@ Doi
  data/json/itemgroups/military.json            |  4 +-
  data/json/items/ammo/40x46mm.json             | 57 ++++++++-----------
  data/json/items/ammo/40x53mm.json             | 29 +++-------
- data/json/items/ammo/5x50.json                |  8 ++-
  data/json/items/ammo/8x40mm.json              | 23 ++++----
  data/json/items/generic/casing.json           |  8 +--
  data/json/items/handloaded_bullets.json       |  8 ++-
@@ -280,31 +279,6 @@ index 4541de0dab2..aeb0d2e732e 100644
 -    "extend": { "effects": [ "SHOT" ] }
    }
  ]
-diff --git a/data/json/items/ammo/5x50.json b/data/json/items/ammo/5x50.json
-index efd00754091..49ba3eb858e 100644
---- a/data/json/items/ammo/5x50.json
-+++ b/data/json/items/ammo/5x50.json
-@@ -15,7 +15,8 @@
-     "ammo_type": "5x50",
-     "casing": "5x50_hull",
-     "range": 60,
--    "damage": { "damage_type": "bullet", "amount": 20, "armor_penetration": 30 },
-+    "//": "Balanced as AP",
-+    "damage": { "damage_type": "bullet", "amount": 30, "armor_penetration": 26 },
-     "dispersion": 60,
-     "recoil": 400,
-     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-@@ -31,7 +32,8 @@
-     "weight": "9 g",
-     "price": 1688,
-     "price_postapoc": 2400,
--    "relative": { "range": -10, "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": 20 }, "dispersion": 20 },
--    "proportional": { "recoil": 1.1 }
-+    "//": "Balanced as AP, with 25% higher damage and 50% higher arpen",
-+    "relative": { "range": -10, "damage": { "damage_type": "bullet", "amount": 8, "armor_penetration": 13 } },
-+    "proportional": { "dispersion": 1.5, "recoil": 1.5 }
-   }
- ]
 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
@@ -332,7 +306,7 @@ index 510b4ba9c1f..f486ad3126a 100644
      "type": "GENERIC",
      "category": "spare_parts",
      "name": { "str": "40x46mm M212 casing" },
--    "description": "A large canister from a spent 40mm cartridge.",
+-    "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",
@@ -341,7 +315,7 @@ index 510b4ba9c1f..f486ad3126a 100644
      "type": "GENERIC",
      "category": "spare_parts",
      "name": { "str": "40x46mm M118 casing" },
--    "description": "A large canister from a spent 40mm cartridge.",
+-    "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",
@@ -350,7 +324,7 @@ index 510b4ba9c1f..f486ad3126a 100644
      "type": "GENERIC",
      "category": "spare_parts",
      "name": { "str": "40x46mm M199 casing" },
--    "description": "A large canister from a spent 40mm cartridge.",
+-    "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",
@@ -359,7 +333,7 @@ index 510b4ba9c1f..f486ad3126a 100644
      "type": "GENERIC",
      "category": "spare_parts",
      "name": { "str": "40x46mm M195 casing" },
--    "description": "A large canister from a spent 40mm cartridge.",
+-    "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",