Updated to 2022-09-29-1442

5 files changed, 74 insertions, 70 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 62f6899..3ea079f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202209110044
-_pkgver=2022-09-11-0044
-pkgrel=2
+pkgver=202209291442
+_pkgver=2022-09-29-1442
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -98,6 +98,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "terrain-07_rehide-redacted.patch"
         "terrain-08_derelict-shed-is-s.patch"
         "terrain-09_make-firestation-shelter-wells-npc-drinkable.patch"
+        "terrain-10_fix-milbase_minefield.patch"
 
         "tools-01_foldable-bottle-is-container.patch"
         "tools-02_vacutainer-is-not-a-weapon.patch"
@@ -127,7 +128,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=('add267ccb3214b575009a3a97cd2e9dbd8022666d9863d82482f8989dd4eb90ebf55c09469c99cf5c02f09ffc983c2434bc720a6e22d3f61a7904aee0a14ae69'
+b2sums=('0dfc19a8fa2199d218b674b46f1b577d15b1df2b0d8fcb28d60fedf667d82300191a7e457ae41a6a4709a3769cad99e079942b59a90f6e71e9d88ebccf7f5abb'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -136,10 +137,10 @@ b2sums=('add267ccb3214b575009a3a97cd2e9dbd8022666d9863d82482f8989dd4eb90ebf55c09
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
-        '378ca1d12e8ffcdf9eedfb6fe9e07cf1203d5bc0679bacf48f11a8e5473ef5659fe7a6bc326e285693ebabb4fb0626a78940200ca115cfa4cb7fc4ca879ecb57'
-        '207f765e998c5a92db2030e25779c98d57ed50ce6664d94439e4fdb4654466b764723f7b58872a186dea5f7504793efe4d93df2d8390139649a45d32eec06848'
+        'b31b1899cb4d42e1c748be93ac164f8492339683695a34df30c15b734e3fa800b3cfcd1e95bd381501b427e20e45bdca9e9501fa81377d505f22d5549be947e4'
+        'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
-        '7fa3cc2cc13171aa395accc061a8582f0254a01377b3d60ded4c8d82c5a4f1af65b8e1b6c4fccf0b5fb9a6de1cd59121aae353e6d374726f058c3718bfb9743f'
+        '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
         '373186c55545b4e747c08db497dae0f1446d2830c862a1b8a0d1bd03d237acc9a4fa8854537c0f485528fc0ef05ec6a2f5e43a42c21689dd85178fb07667b51b'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
@@ -179,13 +180,14 @@ b2sums=('add267ccb3214b575009a3a97cd2e9dbd8022666d9863d82482f8989dd4eb90ebf55c09
         '651de880cefd51665d854414c451cc80a33ed8f34e7559a95514abd81a2f58348c37dd75f272468eefd56562ba8c99093a6dd9af3ea57796a9db15164a40eda3'
         '7e41fc3a95073008ca2d71c2266d6d1a17af7803d493b447d40b15a86184c8ce3728b8d3d36765d408b1c46633d1bfa980d878cbac2e04b51ef518d44dfb7295'
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
+        'f830baa8e9d2f2d844520ef3199a7ac62913afb016d40028d99865ba5c6143c08aa8cec9322a67d808fa526954a78416c90cf35ef31cc8dc4dec64950f58adfd'
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
         'a45b2a53b6725dfd4780049a7522befe49c2a0c4efa4fb1dcb5cf53c7af18d329d2ba02aa6ac150342a3e66a46fd17f5e6e76a8db15c677a237edbb5cf4f5af7'
         '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac'
         '77bfba77f3548d267dc8142125bf26608c723bbdb2834317b3ea031ac64d9ff49bb4d75e29e2c759c03a662955697576d1c93153e9fb3e5dee86466bc29c78e1'
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
-        '3616a6305e89963ee8041fd5a3784063ca5b6513b7fe56a5c24eda1bbe07377793d54f07010aad1212cf2310fcf5b5d3e157f8d8b7a85dfc0cdf5ff71f2ed884'
+        '59907554ca4304bf338e7fee9c4df144cc58db1f836ca9d43b2f9ce59c88f9136c2ce31a6c549f598c2f9217c80be00ec63b5f4ff6f713d2ce94faec699fb3ba'
         '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         '3f65bf65f730101b215a38101e2a01b4be85746ec5e691d0f1e0f43f1ea1fd47de203299fe7c505160fe831987bd091879243878d91b88ed9ab14712837bd786'
@@ -197,7 +199,7 @@ b2sums=('add267ccb3214b575009a3a97cd2e9dbd8022666d9863d82482f8989dd4eb90ebf55c09
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         '8b2a4afdaabc62787e1a33efe2b19cd5083c250f1160cf6452da2eeda581b05becd9d0b65cdc052834905f511d899309ef8f7a8be46d8fc5406d1dcb9ff5d416'
-        'efb3bb0608f107b9ddd5278ad1aaf2629e2f22f789a84a115ff38e16bc40b6bc746d0b0dc29d270c3f0d07c3369f45cca12d046a971283f4f31836fb23f03214'
+        '5f674f0cf9fca45f7231287d2779aa72500b19f3746f8b6ab2ae25903aceca06f76d15f8fd5fdda240a94b7ac11a26730ae7c230c80ce0284168efc517eccf23'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'ab67483296320c0b577f5a68a2058ca49ea2350346c21c47bb29871589a59096330859993fd7cfcd7e0e7389727b15519f196c5a58dee9f7acca721302265ff1'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -227,7 +229,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-09-11-0044|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-09-29-1442|' Makefile
 
 
   # # # Hotfixes
@@ -467,6 +469,10 @@ prepare() {
   # They were missing the water_well blueprint_provides.
   patch -Np1 -i "$srcdir"/terrain-09_make-firestation-shelter-wells-npc-drinkable.patch
 
+  # Fix military base minefield entrance rotation:
+  # Both sides use the same tile, but it was incorrectly rotated 180 degrees. Fixed to 270 degrees.
+  patch -Np1 -i "$srcdir"/terrain-10_fix-milbase_minefield.patch
+
 
   # # tool fixes
   echo "Applying tool fixes"
diff --git a/ammo-01_inconsistent-ammo-names.patch b/ammo-01_inconsistent-ammo-names.patch
index 2cf57bc..1de5127 100644
--- a/ammo-01_inconsistent-ammo-names.patch
+++ b/ammo-01_inconsistent-ammo-names.patch
@@ -144,7 +144,7 @@
      "type": "AMMO",
 -    "name": { "str": ".50 BMG tracer, reloaded" },
 +    "name": { "str": ".50 BMG M17 tracer, reloaded" },
-     "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.  This one has been hand-reloaded.",
+     "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.",
      "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
 @@ -90,7 +90,7 @@
@@ -153,7 +153,7 @@
      "type": "AMMO",
 -    "name": { "str": ".50 BMG AP, reloaded" },
 +    "name": { "str": ".50 BMG M2 AP, reloaded" },
-     "description": "Variant of the .50 BMG round that uses a core hardened steel.  Penetration is increased, but damage is reduced.  This one has been hand-reloaded.",
+     "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
@@ -165,7 +165,7 @@
 -    "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.  This one has been hand-reloaded.",
+     "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
diff --git a/ammo-03_fix-reloaded-50bmg.patch b/ammo-03_fix-reloaded-50bmg.patch
index 88b561a..ab618c9 100644
--- a/ammo-03_fix-reloaded-50bmg.patch
+++ b/ammo-03_fix-reloaded-50bmg.patch
@@ -1,6 +1,6 @@
 --- a/data/json/items/ammo/50.json
 +++ b/data/json/items/ammo/50.json
-@@ -78,10 +78,10 @@
+@@ -78,9 +78,9 @@
    },
    {
      "id": "reloaded_50bmg",
@@ -9,8 +9,6 @@
      "type": "AMMO",
 -    "name": { "str": ".50 BMG Match, reloaded" },
 +    "name": { "str": ".50 BMG M33 Ball, reloaded" },
--    "description": ".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
-+    "description": ".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.  This one has been hand-reloaded.",
+     "description": ".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
      "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/etc-02_add-missing-price-postapoc.patch b/etc-02_add-missing-price-postapoc.patch
index 0636201..8e6c9e3 100644
--- a/etc-02_add-missing-price-postapoc.patch
+++ b/etc-02_add-missing-price-postapoc.patch
@@ -7,9 +7,9 @@
 -    "price": 2800000,
 +    "price": 240000,
 +    "price_postapoc": 5000,
-     "to_hit": -1,
-     "bashing": 12,
      "material": [ "steel", "plastic" ],
+     "color": "dark_gray",
+     "ammo": "223",
 @@ -302,7 +303,8 @@
          ]
        ]
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch
index 28f296b..4e0600e 100644
--- a/revert-07_Remove-handload-quality-distinction-1481.patch
+++ b/revert-07_Remove-handload-quality-distinction-1481.patch
@@ -367,7 +367,7 @@ index 6c69fe4e4d..95fcb846f5 100644
 -    "copy-from": "300_winmag",
 -    "type": "AMMO",
 -    "name": { "str": ".300 Winchester Magnum, reloaded" },
--    "description": "The .300 Winchester Magnum is extremely versatile and has been adopted by many shooting disciplines.  The cartridge has found use by hunters, military units, and law enforcement departments.  This one has been hand-reloaded.",
+-    "description": "The .300 Winchester Magnum is extremely versatile and has been adopted by many shooting disciplines.  The cartridge has found use by hunters, military units, and law enforcement departments.",
 -    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
 -    "extend": { "effects": [ "RECYCLED" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -424,7 +424,7 @@ index acf9dc62cc..bdff5be36f 100644
 -    "copy-from": "300blk",
 -    "type": "AMMO",
 -    "name": { "str": ".300 AAC Blackout, reloaded" },
--    "description": ".300 AAC Blackout is an intermediate cartridge that achieves ballistics similar to the 7.62x39 but allows use on the AR-15 platform.  The round is necked-up from the 5.56mm NATO, but feeds from a STANAG magazine.  It requires a specific barrel, so will not work in a standard M4 or similar carbine.  This one has been hand-reloaded.",
+-    "description": ".300 AAC Blackout is an intermediate cartridge that achieves ballistics similar to the 7.62x39 but allows use on the AR-15 platform.  The round is necked-up from the 5.56mm NATO, but feeds from a STANAG magazine.  It requires a specific barrel, so will not work in a standard M4 or similar carbine.",
 -    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
 -    "extend": { "effects": [ "RECYCLED" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -779,7 +779,7 @@ index 94082b3805..360afcdb1c 100644
 -    "copy-from": "4570_sp",
 -    "type": "AMMO",
 -    "name": { "str": ".45-70 SP, reloaded" },
--    "description": ".45-70 Government ammunition loaded with a 305 grain soft point round.  One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges.  This one has been hand-loaded.",
+-    "description": ".45-70 Government ammunition loaded with a 305 grain soft point round.  One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges.",
 -    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
 -    "extend": { "effects": [ "RECYCLED" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -789,7 +789,7 @@ index 94082b3805..360afcdb1c 100644
 -    "copy-from": "4570_pen",
 -    "type": "AMMO",
 -    "name": { "str": ".45-70 +P penetrator, reloaded" },
--    "description": ".45-70 Government +P ammunition loaded with a 305 grain solid copper penetrator projectile.  Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics.  This one has been hand-loaded.",
+-    "description": ".45-70 Government +P ammunition loaded with a 305 grain solid copper penetrator projectile.  Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics.",
 -    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
 -    "extend": { "effects": [ "RECYCLED" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -799,7 +799,7 @@ index 94082b3805..360afcdb1c 100644
 -    "copy-from": "4570_low",
 -    "type": "AMMO",
 -    "name": { "str": ".45-70 LFN cowboy, reloaded" },
--    "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms.  Quite a bit less powerful than modern ammo, but still packs a punch.  This one has been hand-loaded.",
+-    "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms.  Quite a bit less powerful than modern ammo, but still packs a punch.",
 -    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
 -    "extend": { "effects": [ "RECYCLED" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -809,7 +809,7 @@ index 94082b3805..360afcdb1c 100644
 -    "copy-from": "4570_low",
 -    "type": "AMMO",
 -    "name": { "str": ".45-70, black powder" },
--    "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet using black powder to original specifications.  Quite a bit less powerful and a lot dirtier than modern ammo, but still packs a punch.  This one has been hand-loaded.",
+-    "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet using black powder to original specifications.  Quite a bit less powerful and a lot dirtier than modern ammo, but still packs a punch.",
 -    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
 -    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -898,7 +898,7 @@ index 928f5c94a1..058da3c560 100644
 -    "copy-from": "50_incendiary",
 -    "type": "AMMO",
 -    "name": { "str": ".50 BMG tracer, reloaded" },
--    "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.  This one has been hand-reloaded.",
+-    "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.",
 -    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
 -    "extend": { "effects": [ "RECYCLED" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -918,7 +918,7 @@ index 928f5c94a1..058da3c560 100644
 -    "copy-from": "50ss",
 -    "type": "AMMO",
 -    "name": { "str": ".50 BMG AP, reloaded" },
--    "description": "Variant of the .50 BMG round that uses a core hardened steel.  Penetration is increased, but damage is reduced.  This one has been hand-reloaded.",
+-    "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" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -957,7 +957,7 @@ index 67b9e40515..13b13adcf2 100644
 -    "copy-from": "545",
 -    "type": "AMMO",
 -    "name": { "str": "5.45x39mm, reloaded" },
--    "description": "The 5.45x39mm was the standard ammunition for the AK series from 1974.  Its designers were inspired by the 5.56x45mm NATO cartridge.  This one has been hand-reloaded.",
+-    "description": "The 5.45x39mm was the standard ammunition for the AK series from 1974.  Its designers were inspired by the 5.56x45mm NATO cartridge.",
 -    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
 -    "extend": { "effects": [ "RECYCLED" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -1008,7 +1008,7 @@ index c1a285cb91..5a8901e578 100644
 -    "type": "AMMO",
 -    "name": { "str": "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.  This one has been hand-reloaded.",
+-    "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" ],
 -    "relative": { "range": -15, "dispersion": 40 },
 -    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.7 }, "recoil": 0.9 }
@@ -1158,7 +1158,7 @@ index 94c130a144..63b613e9ff 100644
 -    "copy-from": "9x18mm",
 -    "type": "AMMO",
 -    "name": { "str": "9x18mm, reloaded" },
--    "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM.  As the designation implies, it is a bit shorter in case length compared to 9mm Parabellum.  This one has been hand-reloaded.",
+-    "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM.  As the designation implies, it is a bit shorter in case length compared to 9mm Parabellum.",
 -    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
 -    "extend": { "effects": [ "RECYCLED" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -1179,7 +1179,7 @@ index 94c130a144..63b613e9ff 100644
 -    "copy-from": "9x18mmfmj",
 -    "type": "AMMO",
 -    "name": { "str": "9x18mm FMJ, reloaded" },
--    "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM.  This brass-jacketed round increases penetration slightly, at the cost of reduced expansion.  This one has been hand-reloaded.",
+-    "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM.  This brass-jacketed round increases penetration slightly, at the cost of reduced expansion.",
 -    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
 -    "extend": { "effects": [ "RECYCLED" ] },
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -3747,7 +3747,7 @@ index c9d3d3f94e..9530ee17b3 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/30-06.json b/data/json/uncraft/ammo/30-06.json
@@ -3767,7 +3767,7 @@ index 1ba26c4b91..b235e58d0a 100644
 +      [ [ "gunpowder", 12 ] ],
 +      [ [ "copper", 4 ] ]
      ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
 @@ -23,11 +23,12 @@
      "time": "5 s",
@@ -3783,7 +3783,7 @@ index 1ba26c4b91..b235e58d0a 100644
 +      [ [ "gunpowder", 12 ] ],
 +      [ [ "copper", 4 ] ]
      ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
 @@ -39,11 +40,11 @@
      "time": "5 s",
@@ -3798,7 +3798,7 @@ index 1ba26c4b91..b235e58d0a 100644
 +      [ [ "gunpowder", 12 ] ],
 +      [ [ "copper", 4 ] ]
      ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
 diff --git a/data/json/uncraft/ammo/300.json b/data/json/uncraft/ammo/300.json
 index df0b9505d5..9995c40b9d 100644
@@ -3811,7 +3811,7 @@ index df0b9505d5..9995c40b9d 100644
 -      [ [ "copper", 21 ] ]
 +      [ [ "copper", 4 ] ]
      ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
 diff --git a/data/json/uncraft/ammo/300blk.json b/data/json/uncraft/ammo/300blk.json
 index dbc6a8a03a..bb4e4d4470 100644
@@ -3825,7 +3825,7 @@ index dbc6a8a03a..bb4e4d4470 100644
 +      [ [ "gunpowder", 6 ] ],
        [ [ "copper", 2 ] ]
      ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "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
@@ -3842,7 +3842,7 @@ index aa59e19273..69c4fe1af7 100644
 -      [ [ "copper", 6 ] ]
 -    ],
 +    "components": [ [ [ "lead", 6 ] ], [ [ "308_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 3 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/357mag.json b/data/json/uncraft/ammo/357mag.json
@@ -3861,7 +3861,7 @@ index 41d027ea61..b23c42b4df 100644
 +      [ [ "gunpowder", 5 ] ],
 +      [ [ "copper", 1 ] ]
 +    ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 diff --git a/data/json/uncraft/ammo/357sig.json b/data/json/uncraft/ammo/357sig.json
@@ -3880,7 +3880,7 @@ index 2a6a13dc7a..256089ff72 100644
 +      [ [ "gunpowder", 5 ] ],
 +      [ [ "copper", 1 ] ]
 +    ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 @@ -12,7 +18,7 @@
@@ -3889,7 +3889,7 @@ index 2a6a13dc7a..256089ff72 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/38.json b/data/json/uncraft/ammo/38.json
@@ -3902,13 +3902,13 @@ index b51fa23972..80e800b8a7 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 @@ -14,13 +14,5 @@
      "qualities": [ { "id": "PULL", "level": 1 } ],
      "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
 -  },
 -  {
 -    "result": "38_super",
@@ -3916,7 +3916,7 @@ index b51fa23972..80e800b8a7 100644
 -    "time": "5 s",
 -    "qualities": [ { "id": "PULL", "level": 1 } ],
 -    "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ],
--    "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+-    "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/380.json b/data/json/uncraft/ammo/380.json
@@ -3961,7 +3961,7 @@ index 7810c99fca..97311c220f 100644
 +    "time": "5 s",
 +    "qualities": [ { "id": "PULL", "level": 1 } ],
 +    "components": [ [ [ "lead", 2 ] ], [ [ "38super_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ],
-+    "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
++    "charges": 1
 +  },
    {
      "result": "38super_fmj",
@@ -3978,7 +3978,7 @@ index 7810c99fca..97311c220f 100644
 +      [ [ "gunpowder", 3 ] ],
 +      [ [ "copper", 1 ] ]
 +    ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/40.json b/data/json/uncraft/ammo/40.json
@@ -3991,7 +3991,7 @@ index 6c7265ba44..7fbbf9ce90 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 diff --git a/data/json/uncraft/ammo/44.json b/data/json/uncraft/ammo/44.json
@@ -4010,7 +4010,7 @@ index e191b9aae3..a8c9331718 100644
 -      [ [ "copper", 7 ] ]
 -    ],
 +    "components": [ [ [ "lead", 4 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 @@ -22,7 +16,7 @@
@@ -4019,7 +4019,7 @@ index e191b9aae3..a8c9331718 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/45.json b/data/json/uncraft/ammo/45.json
@@ -4032,7 +4032,7 @@ index 3b9fbbde76..ab84f634e4 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 diff --git a/data/json/uncraft/ammo/454.json b/data/json/uncraft/ammo/454.json
@@ -4051,7 +4051,7 @@ index bae0e66db6..d2dc8fe1ba 100644
 -      [ [ "copper", 20 ] ]
 -    ],
 +    "components": [ [ [ "lead", 4 ] ], [ [ "454_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/4570.json b/data/json/uncraft/ammo/4570.json
@@ -4079,7 +4079,7 @@ index cc388b9279..0aec1b3de8 100644
 +      [ [ "lgrifle_primer", 1 ] ],
 +      [ [ "gunpowder", 17 ] ]
 +    ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 @@ -26,7 +32,17 @@
@@ -4088,7 +4088,7 @@ index cc388b9279..0aec1b3de8 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
 +  },
 +  {
 +    "id": "reloaded_4570_bp",
@@ -4111,7 +4111,7 @@ index ca3b831d8a..056243fcb0 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/460.json b/data/json/uncraft/ammo/460.json
@@ -4130,7 +4130,7 @@ index c9dac3edbc..3e6517ae9a 100644
 +      [ [ "gunpowder", 6 ] ],
 +      [ [ "copper", 2 ] ]
 +    ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 @@ -16,7 +22,7 @@
@@ -4139,7 +4139,7 @@ index c9dac3edbc..3e6517ae9a 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/500.json b/data/json/uncraft/ammo/500.json
@@ -4158,7 +4158,7 @@ index b79146ae5c..5a71a1bf4f 100644
 -      [ [ "copper", 24 ] ]
 -    ],
 +    "components": [ [ [ "lead", 5 ] ], [ [ "500_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 2 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/50bmg.json b/data/json/uncraft/ammo/50bmg.json
@@ -4184,7 +4184,7 @@ index f3e1d4d100..c586ca687e 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 @@ -16,7 +16,7 @@
@@ -4193,7 +4193,7 @@ index f3e1d4d100..c586ca687e 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/556.json b/data/json/uncraft/ammo/556.json
@@ -4206,7 +4206,7 @@ index 036fe8bd7c..7ba9ad0b02 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 @@ -22,7 +22,7 @@
@@ -4216,7 +4216,7 @@ index 036fe8bd7c..7ba9ad0b02 100644
 -      [ [ "copper", 2 ] ]
 +      [ [ "copper", 1 ] ]
      ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
 diff --git a/data/json/uncraft/ammo/5x50.json b/data/json/uncraft/ammo/5x50.json
 index a3666d2303..55dad02d10 100644
@@ -4235,7 +4235,7 @@ index a3666d2303..55dad02d10 100644
 +      [ [ "gunpowder", 3 ] ],
 +      [ [ "combatnail", 1 ] ]
 +    ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 @@ -16,7 +23,14 @@
@@ -4251,7 +4251,7 @@ index a3666d2303..55dad02d10 100644
 +      [ [ "gunpowder", 4 ] ],
 +      [ [ "scrap", 1 ] ]
 +    ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/700nx.json b/data/json/uncraft/ammo/700nx.json
@@ -4271,7 +4271,7 @@ index bceaf805ca..0ea364b745 100644
 +      [ [ "gunpowder", 30 ] ],
 +      [ [ "copper", 5 ] ]
      ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
 diff --git a/data/json/uncraft/ammo/762x39.json b/data/json/uncraft/ammo/762x39.json
 index 93334eabc3..7d046c7938 100644
@@ -4283,7 +4283,7 @@ index 93334eabc3..7d046c7938 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
    {
 @@ -16,7 +16,7 @@
@@ -4292,7 +4292,7 @@ index 93334eabc3..7d046c7938 100644
      "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 ] ] ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
  ]
 diff --git a/data/json/uncraft/ammo/762x51.json b/data/json/uncraft/ammo/762x51.json
@@ -4306,7 +4306,7 @@ index 87933be7e4..dc277d7c17 100644
 -      [ [ "copper", 6 ] ]
 +      [ [ "copper", 3 ] ]
      ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    },
 @@ -23,11 +23,12 @@
      "time": "5 s",
@@ -4320,7 +4320,7 @@ index 87933be7e4..dc277d7c17 100644
 -      [ [ "copper", 6 ] ]
 +      [ [ "copper", 3 ] ]
      ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
 diff --git a/data/json/uncraft/ammo/762x54.json b/data/json/uncraft/ammo/762x54.json
 index 1e2d1be2ea..69681e16fa 100644
@@ -4339,7 +4339,7 @@ index 1e2d1be2ea..69681e16fa 100644
 +      [ [ "gunpowder", 10 ] ],
 +      [ [ "copper", 3 ] ]
      ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "charges": 1
    }
 diff --git a/data/json/uncraft/ammo/9mm.json b/data/json/uncraft/ammo/9mm.json
 index aca3815900..e3b7ac566c 100644
@@ -4364,7 +4364,7 @@ index 870af31ad4..ffe80a2a66 100644
 -      [ [ "copper", 2 ] ]
 +      [ [ "copper", 1 ] ]
      ],
-     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+     "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