Add more items to the fmc and tacoma brokers.

4 files changed, 50 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4460f10..b26bdf5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,9 +15,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202303302208
-_pkgver=2023-03-30-2208
-pkgrel=1
+pkgver=202304032237
+_pkgver=2023-04-03-2237
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -120,6 +120,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "vehicles-03_black-box-can-be-installed.patch"
 
         "weapon-01_fix-v29-copy-from.patch"
+        "weapon-02_Fix-usp45-load-order.patch"
 
         "etc-01_fix-rubbersplosion.patch"
         "etc-02_add-missing-price-postapoc.patch"
@@ -143,7 +144,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=('685409136260f37b9c4ef7ba8fa58f1dcecf4de3fcc6b3617aed01ad67b1ab4483e347c2e9b58d3143acb7938609c85d701bdcb0150ed681b735a12d2735ec2b'
+b2sums=('88c6f4768236b9c89609373b3632b5bc5f440b8bf47f9053053f36539be21a69c4e9310ef596e7a24ee157b9db3bdd6c6d26e90dcb570fa7a87e3b5d7380280a'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -192,8 +193,8 @@ b2sums=('685409136260f37b9c4ef7ba8fa58f1dcecf4de3fcc6b3617aed01ad67b1ab4483e347c
         'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad'
         '93be2ff64a3217f92b369c067121683083859c7e939535e55f11818dc346d4862a50faa371315ad28ab54c9778c749d7684e8a7d68a18f774be3c2fe7891bd62'
         '246a189a0002e755bbed91257c324d0f34bab724f38a31bad1d5eb8bc5b126ecb3a0af8f69a6d0f5f084930c670d2747942beabab0b684f7f66a13044dec394a'
-        'ac1a522d84fcfdea371027d05d486b752f921d03280d3db38766945ddb22c8ece946a2a67cbba656c31486c68a49a557d692e971fd7fd8b220865a3178628674'
-        '57df0c21e59fe69da396267881d5a16bf791187fc6c7ca7a8746daad00b8a81d389c84ba24efb4ba603f20cd03f03964e017fa836439b04e5ab7a14497f15468'
+        '6dbc174a3c3b89b86d92ae3b467bfe535c6125cef776492bf865b6adb9d5995c72255376cd44eb8085b09ceca522f11bbd305b7beff096eed11954a44084d676'
+        '4063dff5926b998e4faa0d04e7260009159fc40323922d46f1de00ad8dea453947e79fc085ac7c1d23e23b6537abcb794af3f3c5e3b6c040a2332c41612bef94'
         '88dd4e6a53b948ddd5bdf9a567a116f70047cc6cf5fb695b72b9ab571641e9af52e386c6e0b442c9dd794de39d57b26891dc8bb83e4c92506547f395d340915b'
         '9fbf8cf2aaa18c5cccca24783f40503cf7b7c66731f65450cc312e8b29145c56c23d31d19063dccdf3790ec06480d773d7d64de1672f38b7a4740a8aa0fd4f7d'
         'abafa39e57cf04396b841833215aca427655dd3b56ebc260b8a57d6376360b31a4b1d4493da76ec4dc0129939ab9e23cada70dd6f49e647f02bce12c81f6451a'
@@ -216,6 +217,7 @@ b2sums=('685409136260f37b9c4ef7ba8fa58f1dcecf4de3fcc6b3617aed01ad67b1ab4483e347c
         '4a1724784d6b4f113e8c1954d399d07adc941a2e992e1c95ab38dbc5c31940e90ff4cec51d22da3bf971880817b4356e473747303146c2ab1be55ee4565aca41'
         '209387731490549d7b3d546ab149cea22e0ea1291356884f358cd87ca7d5425ca9a72f6f2cb7af46956634ffdb1a61d1ebfbfdbb5a2fc9fdc26d29acdc2ab0c0'
         '0661d98d1a106c736f5e23da60e81354786569d5e2124d1247297eac8ae95ae7f9971b5c80063ef7569eb7288da1ed012e8f0301e82400dff2c3c93cdbd93999'
+        'a357104e814cde6669ab0b76d8d869ddd7fb03cf38bf1b32993780a31ac07e50cfc5d1af3e87d969ca3f9650ea3aefba3c55bf626c4c40502205a130a86c25a5'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
         'f428818d1d4df4e46ec844458cfd5f9eef5d19a89778837502eb74ed6d421113ae9a9bc2fd4fb2bcf41d433635c34912e90b90a8993e92164e6a1efe0ebae82f'
         'b41ce5db19de2f4a5857debe31560b7b8216412e5df795032363839429f732b2d2359b3679a795c55a997913588f7d495c300df402529317ef2d03de24a74273'
@@ -230,9 +232,9 @@ b2sums=('685409136260f37b9c4ef7ba8fa58f1dcecf4de3fcc6b3617aed01ad67b1ab4483e347c
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5'
-        '496a8ba6769b68114a189c317eafb6607e6e11a942231964137b7cd171d6decb5162aee8aa4ba3ccea86cf0e4bc25082a6bbe0858028aed2bd4c8612b4fccab8'
+        'd30bc1b6193e7ed024a34b9e0b6fee5995e6e05a070d42746f785c82d941fbf0a7925aad7ae27cb8a9c32c23640b85510b951b1b23cd20ac8f01f5fddb70edd8'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
-        '14ef4cc6b05f8d9b0d6196c4b6f35cc8083bdf4820c19c320551158b47b570ee6b385f3d6b9888f614fb9d5325265feae810a2c5fff4a0deb42b01612bad6517'
+        'f032ed44a6bc7f5b8dd7a545706c7733c4043ded755c12c622314c3b1f206363d27358f2d765a774f6f32abbdd8c31994b1e075c5307dcf65fc4e7a77081a5c7'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
 prepare() {
@@ -266,7 +268,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-03-30-2208"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-04-03-2237"|' Makefile
 
 
   # # # Hotfixes
@@ -326,7 +328,7 @@ prepare() {
   # Fix black powder scrap shot not being flagged as black powder.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-06_fix-bp-scrap-not-being-bp.patch
 
-  # Fix ammo ordering so as to not prevent those items being modded.
+  # Fix ammo ordering so as to not prevent those items being modded:
   # 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
 
@@ -584,6 +586,10 @@ prepare() {
   # This class seems entirely made for this weapon, but it was not flagged to use it.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/weapon-01_fix-v29-copy-from.patch
 
+  # Fix the USP45 handgun not being modifiable:
+  # It uses copy-from usp_9mm that loads later, which prevented modifying it.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/weapon-02_Fix-usp45-load-order.patch
+
 
   # # Uncategorized for now
   echo "Applying uncategorized fixes"
diff --git a/npc-08_nurse-takes-more-meds.patch b/npc-08_nurse-takes-more-meds.patch
index 03635fb..510cfd0 100644
--- a/npc-08_nurse-takes-more-meds.patch
+++ b/npc-08_nurse-takes-more-meds.patch
@@ -3,9 +3,10 @@
 @@ -36,25 +36,65 @@
      "repeat_responses": {
        "for_item": [
-         "1st_aid",
+-        "1st_aid",
 +        "adderall",
 +        "adrenaline_injector",
++        "anesthetic",
 +        "anesthetic_kit",
          "antibiotics",
 +        "antifungal",
diff --git a/npc-09_broker-takes-more-foods.patch b/npc-09_broker-takes-more-foods.patch
index d12240b..707c65f 100644
--- a/npc-09_broker-takes-more-foods.patch
+++ b/npc-09_broker-takes-more-foods.patch
@@ -1,6 +1,6 @@
 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json	
 +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
-@@ -88,20 +88,135 @@
+@@ -88,20 +88,136 @@
      "dynamic_line": "Excellent.  What've you brought us?",
      "repeat_responses": {
        "for_item": [
@@ -128,6 +128,7 @@
 +        "drink_rumcola",
          "salt",
 -        "vinegar"
++        "salted_fish",
 +        "sausage",
 +        "soup_chicken",
 +        "soup_dumplings",
diff --git a/weapon-02_Fix-usp45-load-order.patch b/weapon-02_Fix-usp45-load-order.patch
new file mode 100644
index 0000000..68db5e9
--- /dev/null
+++ b/weapon-02_Fix-usp45-load-order.patch
@@ -0,0 +1,30 @@
+--- a/data/json/items/gun/45.json
++++ b/data/json/items/gun/45.json
+@@ -206,14 +206,24 @@
+   },
+   {
+     "id": "usp_45",
+-    "copy-from": "usp_9mm",
++    "copy-from": "pistol_base",
+     "type": "GUN",
+     "name": { "str": "USP .45" },
++    "description": "A popular pistol, widely used among law enforcement.  Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.",
+     "weight": "930 g",
+-    "ammo": "45",
++    "volume": "500 ml",
++    "price": 68000,
+     "price_postapoc": 2500,
+-    "ranged_damage": { "damage_type": "bullet", "amount": 0 },
++    "to_hit": -2,
++    "material": [ "steel", "plastic" ],
++    "color": "dark_gray",
++    "ammo": "45",
++    "dispersion": 400,
++    "durability": 9,
++    "blackpowder_tolerance": 48,
++    "min_cycle_recoil": 450,
+     "built_in_mods": [ "match_trigger" ],
++    "magazine_well": "250 ml",
+     "magazines": [ [ "45", [ "usp45mag" ] ] ]
+   },
+   {