Updated to 2021-07-31-0434

Add patch to fix ammunition ordering

2 files changed, 183 insertions, 6 deletions

diff --git a/0024-ammo-order-fix.patch b/0024-ammo-order-fix.patch
new file mode 100644
index 0000000..01c91fb
--- /dev/null
+++ b/0024-ammo-order-fix.patch
@@ -0,0 +1,167 @@
+--- a/data/json/items/ammo/22.json
++++ b/data/json/items/ammo/22.json
+@@ -1,16 +1,5 @@
+ [
+   {
+-    "id": "22_cphp",
+-    "copy-from": "22_lr",
+-    "type": "AMMO",
+-    "name": { "str": ".22 CPHP" },
+-    "description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets.  Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.",
+-    "//": "Hollowpoint damage increase of 25%",
+-    "damage": { "damage_type": "stab", "amount": 20, "armor_penetration": 0 },
+-    "relative": { "range": 3 },
+-    "proportional": { "recoil": 1.5 }
+-  },
+-  {
+     "id": "22_lr",
+     "type": "AMMO",
+     "name": { "str": ".22 LR" },
+@@ -35,6 +24,17 @@
+     "effects": [ "COOKOFF" ]
+   },
+   {
++    "id": "22_cphp",
++    "copy-from": "22_lr",
++    "type": "AMMO",
++    "name": { "str": ".22 CPHP" },
++    "description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets.  Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.",
++    "//": "Hollowpoint damage increase of 25%",
++    "damage": { "damage_type": "stab", "amount": 20, "armor_penetration": 0 },
++    "relative": { "range": 3 },
++    "proportional": { "recoil": 1.5 }
++  },
++  {
+     "id": "22_ratshot",
+     "copy-from": "22_cphp",
+     "type": "AMMO",
+--- a/data/json/items/ammo/38.json
++++ b/data/json/items/ammo/38.json
+@@ -1,14 +1,5 @@
+ [
+   {
+-    "id": "38_fmj",
+-    "copy-from": "38_special",
+-    "type": "AMMO",
+-    "name": { "str": ".38 FMJ" },
+-    "description": ".38 Special ammunition with brass jacketed 130gr bullets.  The .38 Special round has been known from its inception for its accuracy and low recoil.",
+-    "//": "Base damage of 20, balance increase of two-nineths.",
+-    "relative": { "damage": { "damage_type": "stab", "amount": -6, "armor_penetration": 14 } }
+-  },
+-  {
+     "id": "38_special",
+     "type": "AMMO",
+     "name": { "str": ".38 Special" },
+@@ -33,6 +24,15 @@
+     "effects": [ "COOKOFF" ]
+   },
+   {
++    "id": "38_fmj",
++    "copy-from": "38_special",
++    "type": "AMMO",
++    "name": { "str": ".38 FMJ" },
++    "description": ".38 Special ammunition with brass jacketed 130gr bullets.  The .38 Special round has been known from its inception for its accuracy and low recoil.",
++    "//": "Base damage of 20, balance increase of two-nineths.",
++    "relative": { "damage": { "damage_type": "stab", "amount": -6, "armor_penetration": 14 } }
++  },
++  {
+     "id": "reloaded_38_fmj",
+     "copy-from": "38_fmj",
+     "type": "AMMO",
+--- a/data/json/items/ammo/40.json
++++ b/data/json/items/ammo/40.json
+@@ -1,14 +1,5 @@
+ [
+   {
+-    "id": "40fmj",
+-    "copy-from": "40sw",
+-    "type": "AMMO",
+-    "name": { "str": ".40 S&W FMJ" },
+-    "description": ".40 S&W ammunition with 180gr FMJ bullets.  Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.",
+-    "//": "Base damage of 23, balance increase of two-nineths.",
+-    "relative": { "damage": { "damage_type": "stab", "amount": -7, "armor_penetration": 16 } }
+-  },
+-  {
+     "id": "40sw",
+     "type": "AMMO",
+     "name": { "str": ".40 S&W JHP" },
+@@ -33,6 +24,15 @@
+     "effects": [ "COOKOFF" ]
+   },
+   {
++    "id": "40fmj",
++    "copy-from": "40sw",
++    "type": "AMMO",
++    "name": { "str": ".40 S&W FMJ" },
++    "description": ".40 S&W ammunition with 180gr FMJ bullets.  Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.",
++    "//": "Base damage of 23, balance increase of two-nineths.",
++    "relative": { "damage": { "damage_type": "stab", "amount": -7, "armor_penetration": 16 } }
++  },
++  {
+     "id": "bp_40fmj",
+     "copy-from": "40fmj",
+     "type": "AMMO",
+--- a/data/json/items/ammo/45.json
++++ b/data/json/items/ammo/45.json
+@@ -1,14 +1,5 @@
+ [
+   {
+-    "id": "45_acp",
+-    "copy-from": "45_jhp",
+-    "type": "AMMO",
+-    "name": { "str": ".45 ACP FMJ" },
+-    "description": ".45 ACP ammunition with 230gr FMJ bullets.  Noted for its stopping power, the .45 ACP round has been common for almost 150 years.",
+-    "//": "Base damage of 27, balance increase of two-nineths.",
+-    "relative": { "damage": { "damage_type": "stab", "amount": -8, "armor_penetration": 18 } }
+-  },
+-  {
+     "id": "45_jhp",
+     "type": "AMMO",
+     "name": { "str": ".45 ACP JHP" },
+@@ -32,6 +23,15 @@
+     "effects": [ "COOKOFF" ]
+   },
+   {
++    "id": "45_acp",
++    "copy-from": "45_jhp",
++    "type": "AMMO",
++    "name": { "str": ".45 ACP FMJ" },
++    "description": ".45 ACP ammunition with 230gr FMJ bullets.  Noted for its stopping power, the .45 ACP round has been common for almost 150 years.",
++    "//": "Base damage of 27, balance increase of two-nineths.",
++    "relative": { "damage": { "damage_type": "stab", "amount": -8, "armor_penetration": 18 } }
++  },
++  {
+     "id": "45_super",
+     "copy-from": "45_jhp",
+     "type": "AMMO",
+--- a/data/json/items/ammo/460.json
++++ b/data/json/items/ammo/460.json
+@@ -1,13 +1,5 @@
+ [
+   {
+-    "id": "460_fmj",
+-    "copy-from": "460_rowland",
+-    "type": "AMMO",
+-    "name": { "str": ".460 Rowland HCFN" },
+-    "description": "A plated, hard cast flat nosed variant of the .460 Rowland round.  This increases penetration slightly at the cost of reduced damage from expansion.",
+-    "relative": { "damage": { "damage_type": "stab", "amount": -4, "armor_penetration": 8 } }
+-  },
+-  {
+     "id": "460_rowland",
+     "copy-from": "44magnum",
+     "type": "AMMO",
+@@ -18,6 +10,14 @@
+     "proportional": { "range": 0.95, "damage": { "damage_type": "stab", "amount": 0.95, "armor_penetration": 0.95 }, "recoil": 0.95 }
+   },
+   {
++    "id": "460_fmj",
++    "copy-from": "460_rowland",
++    "type": "AMMO",
++    "name": { "str": ".460 Rowland HCFN" },
++    "description": "A plated, hard cast flat nosed variant of the .460 Rowland round.  This increases penetration slightly at the cost of reduced damage from expansion.",
++    "relative": { "damage": { "damage_type": "stab", "amount": -4, "armor_penetration": 8 } }
++  },
++  {
+     "id": "bp_460_fmj",
+     "copy-from": "460_fmj",
+     "type": "AMMO",
diff --git a/PKGBUILD b/PKGBUILD
index 8001b86..efb42a2 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=202107242012
-_pkgver=2021-07-24-2012
-pkgrel=3
+pkgver=202107310434
+_pkgver=2021-07-31-0434
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -58,6 +58,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "0021-foldable-bottle-is-container.patch"
         "0022-fix-evac3-background-visible.patch"
         "0023-fix-rubbersplosion.patch"
+        "0024-ammo-order-fix.patch"
 
         "jc_ammo-loudness-ap-times-2.patch"
         "jc_allow-bio-firestarter-on-smoker.patch"
@@ -66,6 +67,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "jc_stop-non-faction-npc-malnourishment.patch"
         "jc_stop-sleeping-on-tables.patch"
         "jc_allow-hacker-laptop.patch"
+        "jc_restore-inf-immune.patch"
         
         "custom.patch"
 
@@ -74,7 +76,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=('d48372e505f370558e2c7f48acb52db5419f42940c0e6ba9c8bb442556b9672f5c76cc8eabbb1bbac178c182173ed43199c0e4437ade15274fb9f32ba6448195'
+b2sums=('ebb0aba2614372af488322cf9b445ea20c17e76699cd019ecb73b7dc07ecdd7d1ef98fc4bab3cb67d88dec6c45034323d80b8ed79ded32c32a04342d6cf8e3df'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -105,6 +107,7 @@ b2sums=('d48372e505f370558e2c7f48acb52db5419f42940c0e6ba9c8bb442556b9672f5c76cc8
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
         'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
+        'c47d002dc55af6c74a830205626eab57922f3f79143a5e1ddbc9ac8dc75c1ef4f2adf6a1816f8abe0b43e9a81a9021d1c9c7f62d76fdf67fa5fe00bbeca73962'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9'
         '8e9bf6ff4bafc6397c6631392aaddd2866537943ae3bbdb95282945acba385d66f6d9879fd283eeafbb8df4e927f3ecc061fb36ecb5d38dbddecd2fd9c735e56'
@@ -112,8 +115,9 @@ b2sums=('d48372e505f370558e2c7f48acb52db5419f42940c0e6ba9c8bb442556b9672f5c76cc8
         'e5d7b75d3bced70d5f77bd8860c53f888b1f2495b4a6bf0b1284e3fc1e831a58bc691b4a11419cd7d14427165158d7ebf3f5c690733e4f3ee5194b9bf9bd001a'
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9'
+        '0bc675f798113cc744337ac2864c54510af89fc59450a3bf250cc49c1a1b17ebeddc007e38491978d367555ed7f4895266d68f50f01d30f79a7cacdc01f0f207'
         '0dc275d5e1aa79b2cf73f7e997ea2b602690787ae15e3abdd3b9195bb409d511c74d4f7dca4bf1753a9afb4618f04cb462769c24999357dea62593a379411f42'
-        '8ebe9659ecf69f449ef18857fdece2e814be98e426a925cc61e07ed382962f3ec17bdbccbcdada59571b5a0ce9bc4e5b438e9904db9b3af832e8c9468244081e'
+        '59665e75f28e04a7c1da4dca3242626bab8298849fec5af099550fc3ee36cc6badd7794aaad7b8b3f1b85790df3b89b4d0bb91dcda809b109bf729bb40b0a972'
         'ba0bd9be874e134914334a5baaef843162003adc0253dae32f1a052da6da59e108808852f51b05350ae6ae074f8d15d88cfcf93f49174c47b924f0f9d7fbd206'
         '2b506d69016b5eac7b72341d30900dded43b5c54471547db43968c7b8724d95aff622aa133afb161e200b1b8e470b47422966230458e7b41a112d47fdcdf27f0'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -133,7 +137,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2021-07-24-2012|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2021-07-31-0434|' Makefile
 
 
   # Backports from 0.F
@@ -221,6 +225,9 @@ prepare() {
   # Fix rubber items dismantling into 10x item volume of rubber
   patch -Np1 -i "$srcdir"/0023-fix-rubbersplosion.patch
 
+  # Fix ammo ordering so as to not prevent those items being modded
+  patch -Np1 -i "$srcdir"/0024-ammo-order-fix.patch
+
 
   # Various other fixes for bugs I came across that modify src
   # Fix ammo loudness mulitplying by six instead of two
@@ -244,6 +251,9 @@ prepare() {
   # Allow the hacker_laptop to utilize the extra functions
   patch -Np1 -i "$srcdir"/jc_allow-hacker-laptop.patch
 
+  # Restore the Infection Immune Trait and Revert Infection Resistant to as before
+  patch -Np1 -i "$srcdir"/jc_restore-inf-immune.patch
+
 
   # Some personal quirks that simply lack a means short of patching the source
   patch -Np1 -i "$srcdir"/custom.patch