Remove several bugfixes from the ammo revert patches.

Also update tileset.

3 files changed, 5 insertions, 636 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c24dfb8..4ac447b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202301082230
 _pkgver=2023-01-08-2230
-pkgrel=3
+pkgrel=4
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -136,9 +136,9 @@ b2sums=('ee5468cbab4c9d47183c0e3b1f2836d744e0dce62155de5c2a118cf69ea642d4ce77358
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
-        'b31b1899cb4d42e1c748be93ac164f8492339683695a34df30c15b734e3fa800b3cfcd1e95bd381501b427e20e45bdca9e9501fa81377d505f22d5549be947e4'
+        '2fc7f6a60e416c2c92cd2ade8c18e336bc32d78f3e9ea8787b56cdb07c4c94787846565ffac57e8c8b8cefb04f3b4fd8a95a56ffe21ee1f4a602872d2f1b7e18'
         '0ac92184f85d8b3dceee4a210b2f7f367aeb14c609d468e87205d0eb630e1b6bad6903b863ea61c3a032b665b2316871b6c70aa8508c604a7237a378fae39d92'
-        '52cbb536e1c25d28f76d9e5aa63aec29c2ee9219c8f4ab820bdf437d748b6c8a0382edf826fccee8088fef90d75125698a603f19f5b3f1ac78f1dd1dbd52e347'
+        '413986e00dca12e45a05a2b6092d3abe3cf6434de5be0d7a79f136630a1e0a55d30c233506f94fb157f41f7f7123a3629976e13b22d7a4c7675a669a0d8e9259'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
@@ -200,7 +200,7 @@ b2sums=('ee5468cbab4c9d47183c0e3b1f2836d744e0dce62155de5c2a118cf69ea642d4ce77358
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5'
-        'faed992a29c401874d1f31cf4fed8e9bec55f3b8ccf1fa0668754a678486c7b800743aee9136a273212ce401eca4bc640bbee356bd1bb917f00349b22dd6fa0c'
+        '5d875329c9136093337d87c02418668850f0a9efa32e0e7414de62222a6f7d3115172ea0d31612788026b76848d13fd4f28fb9110607e20fd58097f32e1174d0'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '14ef4cc6b05f8d9b0d6196c4b6f35cc8083bdf4820c19c320551158b47b570ee6b385f3d6b9888f614fb9d5325265feae810a2c5fff4a0deb42b01612bad6517'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch
index 4e0600e..e43b8b8 100644
--- a/revert-07_Remove-handload-quality-distinction-1481.patch
+++ b/revert-07_Remove-handload-quality-distinction-1481.patch
@@ -3737,357 +3737,11 @@ index 76d1d3f6b4..3cd7313750 100644
      "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 20 ], [ "ammo_shot", 1 ] ],
      "components": [ [ [ "gunpowder", 6 ] ] ]
    },
-diff --git a/data/json/uncraft/ammo/223.json b/data/json/uncraft/ammo/223.json
-index c9d3d3f94e..9530ee17b3 100644
---- a/data/json/uncraft/ammo/223.json
-+++ b/data/json/uncraft/ammo/223.json
-@@ -6,7 +6,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
--    "components": [ [ [ "lead", 3 ] ], [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 2 ] ] ],
-+    "components": [ [ [ "lead", 3 ] ], [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 1 ] ] ],
-     "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/30-06.json b/data/json/uncraft/ammo/30-06.json
-index 1ba26c4b91..b235e58d0a 100644
---- a/data/json/uncraft/ammo/30-06.json
-+++ b/data/json/uncraft/ammo/30-06.json
-@@ -7,11 +7,11 @@
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
-     "components": [
--      [ [ "lead", 6 ] ],
-+      [ [ "lead", 8 ] ],
-       [ [ "3006_casing", 1 ] ],
-       [ [ "lgrifle_primer", 1 ] ],
--      [ [ "gunpowder", 8 ] ],
--      [ [ "copper", 6 ] ]
-+      [ [ "gunpowder", 12 ] ],
-+      [ [ "copper", 4 ] ]
-     ],
-     "charges": 1
-   },
-@@ -23,11 +23,12 @@
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
-     "components": [
--      [ [ "incendiary", 6 ] ],
-+      [ [ "lead", 8 ] ],
-+      [ [ "incendiary", 8 ] ],
-       [ [ "3006_casing", 1 ] ],
-       [ [ "lgrifle_primer", 1 ] ],
--      [ [ "gunpowder", 8 ] ],
--      [ [ "copper", 6 ] ]
-+      [ [ "gunpowder", 12 ] ],
-+      [ [ "copper", 4 ] ]
-     ],
-     "charges": 1
-   },
-@@ -39,11 +40,11 @@
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
-     "components": [
--      [ [ "lead", 6 ] ],
-+      [ [ "lead", 8 ] ],
-       [ [ "3006_casing", 1 ] ],
-       [ [ "lgrifle_primer", 1 ] ],
--      [ [ "gunpowder", 8 ] ],
--      [ [ "copper", 6 ] ]
-+      [ [ "gunpowder", 12 ] ],
-+      [ [ "copper", 4 ] ]
-     ],
-     "charges": 1
-   }
-diff --git a/data/json/uncraft/ammo/300.json b/data/json/uncraft/ammo/300.json
-index df0b9505d5..9995c40b9d 100644
---- a/data/json/uncraft/ammo/300.json
-+++ b/data/json/uncraft/ammo/300.json
-@@ -11,7 +11,7 @@
-       [ [ "300_casing", 1 ] ],
-       [ [ "lgrifle_primer", 1 ] ],
-       [ [ "gunpowder", 16 ] ],
--      [ [ "copper", 21 ] ]
-+      [ [ "copper", 4 ] ]
-     ],
-     "charges": 1
-   }
-diff --git a/data/json/uncraft/ammo/300blk.json b/data/json/uncraft/ammo/300blk.json
-index dbc6a8a03a..bb4e4d4470 100644
---- a/data/json/uncraft/ammo/300blk.json
-+++ b/data/json/uncraft/ammo/300blk.json
-@@ -26,7 +26,7 @@
-       [ [ "lead", 5 ] ],
-       [ [ "300blk_casing", 1 ] ],
-       [ [ "smrifle_primer", 1 ] ],
--      [ [ "gunpowder", 3 ] ],
-+      [ [ "gunpowder", 6 ] ],
-       [ [ "copper", 2 ] ]
-     ],
-     "charges": 1
-diff --git a/data/json/uncraft/ammo/308.json b/data/json/uncraft/ammo/308.json
-index aa59e19273..69c4fe1af7 100644
---- a/data/json/uncraft/ammo/308.json
-+++ b/data/json/uncraft/ammo/308.json
-@@ -6,13 +6,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
--    "components": [
--      [ [ "lead", 6 ] ],
--      [ [ "308_casing", 1 ] ],
--      [ [ "lgrifle_primer", 1 ] ],
--      [ [ "gunpowder", 10 ] ],
--      [ [ "copper", 6 ] ]
--    ],
-+    "components": [ [ [ "lead", 6 ] ], [ [ "308_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 3 ] ] ],
-     "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/357mag.json b/data/json/uncraft/ammo/357mag.json
-index 41d027ea61..b23c42b4df 100644
---- a/data/json/uncraft/ammo/357mag.json
-+++ b/data/json/uncraft/ammo/357mag.json
-@@ -4,7 +4,13 @@
-     "type": "uncraft",
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ],
-+    "components": [
-+      [ [ "lead", 2 ] ],
-+      [ [ "357mag_casing", 1 ] ],
-+      [ [ "lgpistol_primer", 1 ] ],
-+      [ [ "gunpowder", 5 ] ],
-+      [ [ "copper", 1 ] ]
-+    ],
-     "charges": 1
-   },
-   {
-diff --git a/data/json/uncraft/ammo/357sig.json b/data/json/uncraft/ammo/357sig.json
-index 2a6a13dc7a..256089ff72 100644
---- a/data/json/uncraft/ammo/357sig.json
-+++ b/data/json/uncraft/ammo/357sig.json
-@@ -4,7 +4,13 @@
-     "type": "uncraft",
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ],
-+    "components": [
-+      [ [ "lead", 2 ] ],
-+      [ [ "357sig_casing", 1 ] ],
-+      [ [ "smpistol_primer", 1 ] ],
-+      [ [ "gunpowder", 5 ] ],
-+      [ [ "copper", 1 ] ]
-+    ],
-     "charges": 1
-   },
-   {
-@@ -12,7 +18,7 @@
-     "type": "uncraft",
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ],
-+    "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ],
-     "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/38.json b/data/json/uncraft/ammo/38.json
-index b51fa23972..80e800b8a7 100644
---- a/data/json/uncraft/ammo/38.json
-+++ b/data/json/uncraft/ammo/38.json
-@@ -4,7 +4,7 @@
-     "type": "uncraft",
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ],
-+    "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ], [ [ "copper", 1 ] ] ],
-     "charges": 1
-   },
-   {
-@@ -14,13 +14,5 @@
-     "qualities": [ { "id": "PULL", "level": 1 } ],
-     "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ],
-     "charges": 1
--  },
--  {
--    "result": "38_super",
--    "type": "uncraft",
--    "time": "5 s",
--    "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ],
--    "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/380.json b/data/json/uncraft/ammo/380.json
-index dc4b9db6bf..02b0348f30 100644
---- a/data/json/uncraft/ammo/380.json
-+++ b/data/json/uncraft/ammo/380.json
-@@ -5,7 +5,7 @@
-     "type": "uncraft",
-     "using": [ [ "ammo_380", 1 ] ],
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ]
-+    "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 2 ] ] ]
-   },
-   {
-     "result": "380_FMJ",
-@@ -13,7 +13,7 @@
-     "type": "uncraft",
-     "using": [ [ "ammo_380", 1 ] ],
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ]
-+    "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 2 ] ], [ [ "copper", 1 ] ] ]
-   },
-   {
-     "result": "380_p",
-@@ -21,6 +21,6 @@
-     "type": "uncraft",
-     "using": [ [ "ammo_380", 1 ] ],
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 4 ] ] ]
-+    "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ]
-   }
- ]
-diff --git a/data/json/uncraft/ammo/38super.json b/data/json/uncraft/ammo/38super.json
-index 7810c99fca..97311c220f 100644
---- a/data/json/uncraft/ammo/38super.json
-+++ b/data/json/uncraft/ammo/38super.json
-@@ -1,4 +1,12 @@
- [
-+  {
-+    "result": "38_super",
-+    "type": "uncraft",
-+    "time": "5 s",
-+    "qualities": [ { "id": "PULL", "level": 1 } ],
-+    "components": [ [ [ "lead", 2 ] ], [ [ "38super_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ],
-+    "charges": 1
-+  },
-   {
-     "result": "38super_fmj",
-     "type": "uncraft",
-@@ -6,7 +14,13 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "38super_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ],
-+    "components": [
-+      [ [ "lead", 2 ] ],
-+      [ [ "38super_casing", 1 ] ],
-+      [ [ "smpistol_primer", 1 ] ],
-+      [ [ "gunpowder", 3 ] ],
-+      [ [ "copper", 1 ] ]
-+    ],
-     "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/40.json b/data/json/uncraft/ammo/40.json
-index 6c7265ba44..7fbbf9ce90 100644
---- a/data/json/uncraft/ammo/40.json
-+++ b/data/json/uncraft/ammo/40.json
-@@ -4,7 +4,7 @@
-     "type": "uncraft",
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ],
-+    "components": [ [ [ "lead", 2 ] ], [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 1 ] ] ],
-     "charges": 1
-   },
-   {
-diff --git a/data/json/uncraft/ammo/44.json b/data/json/uncraft/ammo/44.json
-index e191b9aae3..a8c9331718 100644
---- a/data/json/uncraft/ammo/44.json
-+++ b/data/json/uncraft/ammo/44.json
-@@ -6,13 +6,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [
--      [ [ "lead", 7 ] ],
--      [ [ "44_casing", 1 ] ],
--      [ [ "lgpistol_primer", 1 ] ],
--      [ [ "gunpowder", 10 ] ],
--      [ [ "copper", 7 ] ]
--    ],
-+    "components": [ [ [ "lead", 4 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ],
-     "charges": 1
-   },
-   {
-@@ -22,7 +16,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 10 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 10 ] ] ],
-+    "components": [ [ [ "lead", 5 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ] ],
-     "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/45.json b/data/json/uncraft/ammo/45.json
-index 3b9fbbde76..ab84f634e4 100644
---- a/data/json/uncraft/ammo/45.json
-+++ b/data/json/uncraft/ammo/45.json
-@@ -4,7 +4,7 @@
-     "type": "uncraft",
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ],
-+    "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 2 ] ] ],
-     "charges": 1
-   },
-   {
-diff --git a/data/json/uncraft/ammo/454.json b/data/json/uncraft/ammo/454.json
-index bae0e66db6..d2dc8fe1ba 100644
---- a/data/json/uncraft/ammo/454.json
-+++ b/data/json/uncraft/ammo/454.json
-@@ -6,13 +6,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [
--      [ [ "lead", 20 ] ],
--      [ [ "454_casing", 1 ] ],
--      [ [ "smrifle_primer", 1 ] ],
--      [ [ "gunpowder", 20 ] ],
--      [ [ "copper", 20 ] ]
--    ],
-+    "components": [ [ [ "lead", 4 ] ], [ [ "454_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ],
-     "charges": 1
-   }
- ]
 diff --git a/data/json/uncraft/ammo/4570.json b/data/json/uncraft/ammo/4570.json
 index cc388b9279..0aec1b3de8 100644
 --- a/data/json/uncraft/ammo/4570.json
 +++ b/data/json/uncraft/ammo/4570.json
-@@ -6,7 +6,7 @@
-     "qualities": [ { "id": "PULL", "level": 2 } ],
-     "components": [
-       [ [ "copper", 2 ] ],
--      [ [ "lead", 5 ] ],
-+      [ [ "lead", 8 ] ],
-       [ [ "4570_casing", 1 ] ],
-       [ [ "lgrifle_primer", 1 ] ],
-       [ [ "gunpowder", 15 ] ]
-@@ -18,7 +18,13 @@
-     "type": "uncraft",
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
--    "components": [ [ [ "copper", 7 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 17 ] ] ],
-+    "components": [
-+      [ [ "copper", 7 ] ],
-+      [ [ "lead", 8 ] ],
-+      [ [ "4570_casing", 1 ] ],
-+      [ [ "lgrifle_primer", 1 ] ],
-+      [ [ "gunpowder", 17 ] ]
-+    ],
-     "charges": 1
-   },
-   {
-@@ -26,7 +32,17 @@
-     "type": "uncraft",
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
--    "components": [ [ [ "lead", 9 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ] ],
-+    "components": [ [ [ "lead", 8 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ] ],
+@@ -26,3 +32,13 @@
      "charges": 1
 +  },
 +  {
@@ -4101,271 +3755,6 @@ index cc388b9279..0aec1b3de8 100644
 +    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
    }
  ]
-diff --git a/data/json/uncraft/ammo/45colt.json b/data/json/uncraft/ammo/45colt.json
-index ca3b831d8a..056243fcb0 100644
---- a/data/json/uncraft/ammo/45colt.json
-+++ b/data/json/uncraft/ammo/45colt.json
-@@ -4,7 +4,7 @@
-     "type": "uncraft",
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 5 ] ], [ [ "45colt_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ],
-+    "components": [ [ [ "lead", 4 ] ], [ [ "45colt_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ],
-     "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/460.json b/data/json/uncraft/ammo/460.json
-index c9dac3edbc..3e6517ae9a 100644
---- a/data/json/uncraft/ammo/460.json
-+++ b/data/json/uncraft/ammo/460.json
-@@ -6,7 +6,13 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 10 ] ] ],
-+    "components": [
-+      [ [ "lead", 3 ] ],
-+      [ [ "460_casing", 1 ] ],
-+      [ [ "lgpistol_primer", 1 ] ],
-+      [ [ "gunpowder", 6 ] ],
-+      [ [ "copper", 2 ] ]
-+    ],
-     "charges": 1
-   },
-   {
-@@ -16,7 +22,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 10 ] ] ],
-+    "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ] ],
-     "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/500.json b/data/json/uncraft/ammo/500.json
-index b79146ae5c..5a71a1bf4f 100644
---- a/data/json/uncraft/ammo/500.json
-+++ b/data/json/uncraft/ammo/500.json
-@@ -6,13 +6,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [
--      [ [ "lead", 24 ] ],
--      [ [ "500_casing", 1 ] ],
--      [ [ "lgpistol_primer", 1 ] ],
--      [ [ "gunpowder", 24 ] ],
--      [ [ "copper", 24 ] ]
--    ],
-+    "components": [ [ [ "lead", 5 ] ], [ [ "500_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 2 ] ] ],
-     "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/50bmg.json b/data/json/uncraft/ammo/50bmg.json
-index 211fbbd756..386eed9d65 100644
---- a/data/json/uncraft/ammo/50bmg.json
-+++ b/data/json/uncraft/ammo/50bmg.json
-@@ -7,7 +7,7 @@
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
-     "components": [
--      [ [ "lead", 12 ] ],
-+      [ [ "lead", 15 ] ],
-       [ [ "incendiary", 20 ] ],
-       [ [ "50_casing", 1 ] ],
-       [ [ "lgrifle_primer", 1 ] ],
-diff --git a/data/json/uncraft/ammo/545.json b/data/json/uncraft/ammo/545.json
-index f3e1d4d100..c586ca687e 100644
---- a/data/json/uncraft/ammo/545.json
-+++ b/data/json/uncraft/ammo/545.json
-@@ -6,7 +6,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 5 ] ], [ [ "copper", 2 ] ] ],
-+    "components": [ [ [ "lead", 3 ] ], [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 5 ] ], [ [ "copper", 1 ] ] ],
-     "charges": 1
-   },
-   {
-@@ -16,7 +16,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
--    "components": [ [ [ "lead", 3 ] ], [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 5 ] ], [ [ "copper", 3 ] ] ],
-+    "components": [ [ [ "lead", 3 ] ], [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 1 ] ] ],
-     "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/556.json b/data/json/uncraft/ammo/556.json
-index 036fe8bd7c..7ba9ad0b02 100644
---- a/data/json/uncraft/ammo/556.json
-+++ b/data/json/uncraft/ammo/556.json
-@@ -6,7 +6,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
--    "components": [ [ [ "lead", 3 ] ], [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ],
-+    "components": [ [ [ "lead", 3 ] ], [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 1 ] ] ],
-     "charges": 1
-   },
-   {
-@@ -22,7 +22,7 @@
-       [ [ "223_casing", 1 ] ],
-       [ [ "smrifle_primer", 1 ] ],
-       [ [ "gunpowder", 6 ] ],
--      [ [ "copper", 2 ] ]
-+      [ [ "copper", 1 ] ]
-     ],
-     "charges": 1
-   }
-diff --git a/data/json/uncraft/ammo/5x50.json b/data/json/uncraft/ammo/5x50.json
-index a3666d2303..55dad02d10 100644
---- a/data/json/uncraft/ammo/5x50.json
-+++ b/data/json/uncraft/ammo/5x50.json
-@@ -6,7 +6,14 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "5x50_hull", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ],
-+    "components": [
-+      [ [ "lead", 2 ] ],
-+      [ [ "5x50_hull", 1 ] ],
-+      [ [ "plastic_chunk", 1 ] ],
-+      [ [ "smrifle_primer", 1 ] ],
-+      [ [ "gunpowder", 3 ] ],
-+      [ [ "combatnail", 1 ] ]
-+    ],
-     "charges": 1
-   },
-   {
-@@ -16,7 +23,14 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 3 ] ], [ [ "5x50_hull", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ],
-+    "components": [
-+      [ [ "lead", 3 ] ],
-+      [ [ "5x50_hull", 1 ] ],
-+      [ [ "plastic_chunk", 1 ] ],
-+      [ [ "smrifle_primer", 1 ] ],
-+      [ [ "gunpowder", 4 ] ],
-+      [ [ "scrap", 1 ] ]
-+    ],
-     "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/700nx.json b/data/json/uncraft/ammo/700nx.json
-index bceaf805ca..0ea364b745 100644
---- a/data/json/uncraft/ammo/700nx.json
-+++ b/data/json/uncraft/ammo/700nx.json
-@@ -7,11 +7,11 @@
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
-     "components": [
--      [ [ "lead", 14 ] ],
-+      [ [ "lead", 10 ] ],
-       [ [ "700nx_casing", 1 ] ],
-       [ [ "lgrifle_primer", 1 ] ],
--      [ [ "gunpowder", 38 ] ],
--      [ [ "copper", 9 ] ]
-+      [ [ "gunpowder", 30 ] ],
-+      [ [ "copper", 5 ] ]
-     ],
-     "charges": 1
-   }
-diff --git a/data/json/uncraft/ammo/762x39.json b/data/json/uncraft/ammo/762x39.json
-index 93334eabc3..7d046c7938 100644
---- a/data/json/uncraft/ammo/762x39.json
-+++ b/data/json/uncraft/ammo/762x39.json
-@@ -6,7 +6,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
--    "components": [ [ [ "lead", 5 ] ], [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 7 ] ], [ [ "copper", 5 ] ] ],
-+    "components": [ [ [ "lead", 4 ] ], [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 1 ] ] ],
-     "charges": 1
-   },
-   {
-@@ -16,7 +16,7 @@
-     "difficulty": 5,
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
--    "components": [ [ [ "lead", 5 ] ], [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 5 ] ] ],
-+    "components": [ [ [ "lead", 4 ] ], [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 1 ] ] ],
-     "charges": 1
-   }
- ]
-diff --git a/data/json/uncraft/ammo/762x51.json b/data/json/uncraft/ammo/762x51.json
-index 87933be7e4..dc277d7c17 100644
---- a/data/json/uncraft/ammo/762x51.json
-+++ b/data/json/uncraft/ammo/762x51.json
-@@ -11,7 +11,7 @@
-       [ [ "762_51_casing", 1 ] ],
-       [ [ "lgrifle_primer", 1 ] ],
-       [ [ "gunpowder", 10 ] ],
--      [ [ "copper", 6 ] ]
-+      [ [ "copper", 3 ] ]
-     ],
-     "charges": 1
-   },
-@@ -23,11 +23,12 @@
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
-     "components": [
-+      [ [ "lead", 6 ] ],
-       [ [ "incendiary", 6 ] ],
-       [ [ "762_51_casing", 1 ] ],
-       [ [ "lgrifle_primer", 1 ] ],
-       [ [ "gunpowder", 10 ] ],
--      [ [ "copper", 6 ] ]
-+      [ [ "copper", 3 ] ]
-     ],
-     "charges": 1
-   }
-diff --git a/data/json/uncraft/ammo/762x54.json b/data/json/uncraft/ammo/762x54.json
-index 1e2d1be2ea..69681e16fa 100644
---- a/data/json/uncraft/ammo/762x54.json
-+++ b/data/json/uncraft/ammo/762x54.json
-@@ -7,11 +7,11 @@
-     "time": "5 s",
-     "qualities": [ { "id": "PULL", "level": 2 } ],
-     "components": [
--      [ [ "lead", 3 ] ],
-+      [ [ "lead", 7 ] ],
-       [ [ "762R_casing", 1 ] ],
-       [ [ "lgrifle_primer", 1 ] ],
--      [ [ "gunpowder", 8 ] ],
--      [ [ "copper", 10 ] ]
-+      [ [ "gunpowder", 10 ] ],
-+      [ [ "copper", 3 ] ]
-     ],
-     "charges": 1
-   }
-diff --git a/data/json/uncraft/ammo/9mm.json b/data/json/uncraft/ammo/9mm.json
-index aca3815900..e3b7ac566c 100644
---- a/data/json/uncraft/ammo/9mm.json
-+++ b/data/json/uncraft/ammo/9mm.json
-@@ -29,6 +29,6 @@
-     "type": "uncraft",
-     "using": [ [ "ammo_9mm", 1 ] ],
-     "qualities": [ { "id": "PULL", "level": 1 } ],
--    "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ]
-+    "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ], [ [ "copper", 1 ] ] ]
-   }
- ]
-diff --git a/data/json/uncraft/ammo/9x18mm.json b/data/json/uncraft/ammo/9x18mm.json
-index 870af31ad4..ffe80a2a66 100644
---- a/data/json/uncraft/ammo/9x18mm.json
-+++ b/data/json/uncraft/ammo/9x18mm.json
-@@ -31,7 +31,7 @@
-       [ [ "9x18mm_casing", 1 ] ],
-       [ [ "smpistol_primer", 1 ] ],
-       [ [ "gunpowder", 3 ] ],
--      [ [ "copper", 2 ] ]
-+      [ [ "copper", 1 ] ]
-     ],
-     "charges": 1
-   }
 diff --git a/data/mods/Generic_Guns/recipes/recipe_obsolete.json b/data/mods/Generic_Guns/recipes/recipe_obsolete.json
 index 3146c0a01c..e4e3796a10 100644
 --- a/data/mods/Generic_Guns/recipes/recipe_obsolete.json
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index 0b64fcf..5a4571b 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -719,26 +719,6 @@ index d10e81bd771..95a92381547 100644
              "charges": 25,
              "contents-item": [ "shoulder_strap", "suppressor", "holo_sight" ]
            },
-diff --git a/doc/GAME_BALANCE.md b/doc/GAME_BALANCE.md
-index 966b2861ff3..5a51a530d5c 100644
---- a/doc/GAME_BALANCE.md
-+++ b/doc/GAME_BALANCE.md
-@@ -272,12 +272,12 @@ If the resulting base damage is below specific thresholds, apply one of three mu
- 
- For liminal cases where the base damage is 20, 30, or 40 there is room for discretion regarding which balance increase to apply, if any. Discretion should be exercised based on which solution makes that ammunition distinct from other ammunition of similar power, as having two different ammotypes with identical power should be avoided. 
- 
--As for terminal ballistics, hollowpoints variant should be at least 25% more effective against a completely unarmored target, in order for the difference to be considered relevant. Conversely, the base FMJ variation should have a combined damage and armor penetration whose total is at least 25% greater than the damage of the hollowpoint variant. This recommendation will inform how much armor penetration the two variants should have. Armor-piercing variants have seven-eigths the damage of the standard FMJ variant, and a level of penetration identical to its damage.
-+As for terminal ballistics, hollowpoints variant should be at least 25% more effective against a completely unarmored target, in order for the difference to be considered relevant. Conversely, the base FMJ variation should have a combined damage and armor penetration whose total is at least 15% greater than the damage of the hollowpoint variant. This recommendation will inform how much armor penetration the two variants should have. Armor-piercing variants have seven-eigths the damage of the standard FMJ variant, and enough penetration to make the combined value 30% higher than the damage of hollowpoint.
- 
- The relative combined damage plus armor penetration for each variant can likewise be summarized as follows:
- 1. Hollowpoints are considered to have 100% combined damage (example: 100 damage, 0 arpen)
--2. Standard/FMJ variants are considered to have 125% combined damage, 80% damage and 45% arpen (example: 80 damage, 45 arpen)
--3. AP vairants are considered to have 140% combined damage, 70% damage and 70% arpen (example: 70 damage, 70 arpen)
-+2. Standard/FMJ variants are considered to have 115% combined damage, 80% damage and 35% arpen (example: 80 damage, 35 arpen)
-+3. AP variants are considered to have 130% combined damage, 70% damage and 60% arpen (example: 70 damage, 60 arpen)
- 
- # LIQUIDS:
- Multi-charge items are weighed by the charge/use.  If you have an item that contains 40 uses, it'll weigh 40x as much (when found in-game) as you entered in the JSON. Liquids are priced by the 250mL unit, but handled in containers.  This can cause problems if you create something that comes in (say) a gallon jug (15 charges) and price it at the cost of a jug's worth: it'll be 15x as expensive as intended.
 -- 
 2.39.0