Rebuild for several mod updates

Add craftable survivor headgear mod
Apply ammo name hotfix
Apply workaround for npc eating

3 files changed, 143 insertions, 9 deletions

diff --git a/0004-inconsistent-ammo-names.patch b/0004-inconsistent-ammo-names.patch
new file mode 100644
index 0000000..a98c955
--- /dev/null
+++ b/0004-inconsistent-ammo-names.patch
@@ -0,0 +1,89 @@
+--- a/data/json/items/ammo/45.json
++++ b/data/json/items/ammo/45.json
+@@ -63,7 +63,7 @@
+     "id": "reloaded_45_acp",
+     "copy-from": "45_acp",
+     "type": "AMMO",
+-    "name": { "str": ".45 FMJ, reloaded" },
++    "name": { "str": ".45 ACP FMJ, reloaded" },
+     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+--- a/data/json/items/ammo/223.json
++++ b/data/json/items/ammo/223.json
+@@ -55,7 +55,7 @@
+     "id": "bp_556",
+     "copy-from": "556",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO, black powder" },
++    "name": { "str": "5.56 NATO M855A1, black powder" },
+     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+@@ -82,7 +82,7 @@
+     "id": "reloaded_556",
+     "copy-from": "556",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO, reloaded" },
++    "name": { "str": "5.56 NATO M855A1, reloaded" },
+     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+--- a/data/json/items/ammo/308.json
++++ b/data/json/items/ammo/308.json
+@@ -26,7 +26,7 @@
+     "id": "762_51",
+     "copy-from": "308",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm M80" },
++    "name": { "str": "7.62x51mm NATO M80" },
+     "casing": "762_51_casing",
+     "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.",
+     "relative": { "damage": -2, "pierce": 4, "dispersion": -10 },
+@@ -54,7 +54,7 @@
+     "id": "bp_762_51",
+     "copy-from": "762_51",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm, black powder" },
++    "name": { "str": "7.62x51mm NATO M80, black powder" },
+     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+@@ -63,7 +63,7 @@
+     "id": "bp_762_51_incendiary",
+     "copy-from": "762_51_incendiary",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm tracer, black powder" },
++    "name": { "str": "7.62x51mm NATO tracer, black powder" },
+     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+@@ -81,7 +81,7 @@
+     "id": "reloaded_762_51",
+     "copy-from": "762_51",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm, reloaded" },
++    "name": { "str": "7.62x51mm NATO M80, reloaded" },
+     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+@@ -90,7 +90,7 @@
+     "id": "reloaded_762_51_incendiary",
+     "copy-from": "762_51_incendiary",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm incendiary, reloaded" },
++    "name": { "str": "7.62x51mm NATO incendiary, reloaded" },
+     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+--- 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" },
+     "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.",
+     "effects": [ "COOKOFF", "RECYCLED" ],
+     "relative": { "range": -15, "dispersion": 40 },
diff --git a/0005-npcs-eat-when-hungry.patch b/0005-npcs-eat-when-hungry.patch
new file mode 100644
index 0000000..2074bef
--- /dev/null
+++ b/0005-npcs-eat-when-hungry.patch
@@ -0,0 +1,30 @@
+--- a/src/npcmove.cpp
++++ b/src/npcmove.cpp
+@@ -1829,7 +1829,9 @@
+     }
+ 
+     if( one_in( 3 ) && ( get_thirst() > 40 ||
+-                         get_stored_kcal() + stomach.get_calories() < get_healthy_kcal() * 0.95 ) ) {
++                         get_stored_kcal() + stomach.get_calories() < get_healthy_kcal() * 0.95 ||
++                         ( get_hunger() > 160 &&
++                           ( get_stored_kcal() + stomach.get_calories() < get_healthy_kcal() ) ) ) ) {
+         if( consume_food_from_camp() ) {
+             return npc_noop;
+         }
+@@ -3697,12 +3699,15 @@
+         return true;
+     }
+     faction *yours = g->u.get_faction();
+-    int camp_kcals = std::min( std::max( 0, 19 * get_healthy_kcal() / 20 - get_stored_kcal() -
++    int camp_kcals = std::min( std::max( 0, get_healthy_kcal() - get_stored_kcal() -
+                                          stomach.get_calories() ), yours->food_supply );
+     if( camp_kcals > 0 ) {
+         mod_hunger( -camp_kcals );
+         mod_stored_kcal( camp_kcals );
+         yours->food_supply -= camp_kcals;
++        stomach.mod_calories( camp_kcals );
++        stomach.mod_contents( -2400_ml );
++        stomach.mod_contents( 1200_ml );
+         return true;
+     }
+     return false;
diff --git a/PKGBUILD b/PKGBUILD
index 2e2a222..b1a17b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=(cataclysm-dda cataclysm-dda-tiles)
 pkgname=cataclysm-dda
 pkgver=0.E.2
 _pkgver=0.E-2
-pkgrel=1.31
+pkgrel=1.38
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -29,7 +29,9 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
         "cataclysm-dda-tiles.desktop"
         "0001-vehicle-heater-cooler-intensity-reduced.patch"
         "0002-quiverfull-house-correct-stairs.patch"
-        "0003-ankle-ammo-pouch-is-not-a-backpack.patch"        
+        "0003-ankle-ammo-pouch-is-not-a-backpack.patch"
+        "0004-inconsistent-ammo-names.patch"
+        "0005-npcs-eat-when-hungry.patch"
         "cataclysm-dda-tileset_undeadpeople-legacy.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-tileset_undeadpeople-legacy.git/snapshot/cataclysm-dda-tileset_undeadpeople-legacy-master.tar.xz"
         "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"
@@ -38,6 +40,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
         "cataclysm-dda-mod_recipe-fixes.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_recipe-fixes.git/snapshot/cataclysm-dda-mod_recipe-fixes-master.tar.xz"
         "cataclysm-dda-mod_caseless-crafting.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_caseless-crafting.git/snapshot/cataclysm-dda-mod_caseless-crafting-master.tar.xz"
         "cataclysm-dda-mod_grenade-crafting.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_grenade-crafting.git/snapshot/cataclysm-dda-mod_grenade-crafting-master.tar.xz"
+        "cataclysm-dda-mod_survivorheadgear-crafting.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_survivorheadgear-crafting.git/snapshot/cataclysm-dda-mod_survivorheadgear-crafting-master.tar.xz"
         "cataclysm-dda-mod_hk-loadout.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_hk-loadout.git/snapshot/cataclysm-dda-mod_hk-loadout-master.tar.xz"
         "cataclysm-dda-mod_battle-maid-redone.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_battle-maid-redone.git/snapshot/cataclysm-dda-mod_battle-maid-redone-master.tar.xz"
         )
@@ -47,14 +50,17 @@ b2sums=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5
         '3659d59eec3167bdb647cb622f15fe899516980ac92972393589574db23a580368b449812ec75ec74cfb86082a1c12896fc9f26b7c16c36ed9ad8506d41eac67'
         '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa'
         'af47a9372ba990bc97d17362c8d89847177e6cbefaa241c23bcdc670ef29d82bf150983f4c730753cabaa77a01f8e966307831cdc192a92237d5f3e8e6599d2b'
-        '98051211d71f887f230252638c49bde3f293072c0c21ea7f97c34a92837debc24d70f6579a1acf57f3d4dc6c6a815fa9ddd2e0572c0d9fee3e302fcad4762522'
-        'f2260095156b10136aad79df6155ce3f78b5ab94be5f394bec9f11925921d4a1505ae7dc0a32e7434b28a1bea2c489206c62450af9027574ba882ac9356f6620'
+        '3936f88fab90b344299a62bb5bc836d03b1bb8293d2ca4cbb8a48468497119db2174f2b37a1775c0aed1be07107c4ae815f6308efa633abf76bbd6ba458ff66b'
+        'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904'
+        'faafc1c184d7ed405b554944dfee94494499ea2e3921198e7aac1c3cae64617d5a1d10c92b92c9c994dd76301eba09e44eebc4fd0dfa43435ec5f0d13db9a5ae'
+        '18d638604bf299081268e61f39b80944b8d83b59b8fd27190201cea199114f67965c12972280b0b704016c51c799a295f5e316785063d8199a2033fbec8a69d9'
         '353fed5883383063b2b2d3a81f3a5d5364a0351d037f5456e9d89d4eeee3b20b3e1f9c74c3d458193deb8ac1fa41d73d86e8364a623a6344c32c55437f362d4b'
-        '36625d21245d5bb9769b1e7916ed8d644cdf56efa1c64c15c8b76d9cd90cdfa7c35324bebdf71426687d6f18b53aa1fb9675d0ba1ea93432ad001b0a54615682'
-        '083713ad07d085bc9120812a354f294bcad12cf4b53a0e6da52bccc2a7319490740191740affb658b2ba2b3de91dda081e62e948bbe62b8f6e2f4613f71a0687'
-        'f9f5975639792afb2411cec7d9e8580c9a82b1e1aaa38d7df9ebeae6d5aee36e061e4fbbf2836e538bd58898bda4062df201eb2abbc2009500a8b77e0c249074'
-        'ef41120eeaa0ea584a5efbed55cbd48814cadbb2ea0ca1b063032375841bb9b8aa6fb07b636811f5ca24ee1995333e5515c4143380d6e85e6cc0f4e50006e6d1'
-        '0b743bc6c8c187ab876ab972676cee7f0d7e7a46b3e73fc9f77b7d86eae2eddb5a970bb02215ea0ff5de5f9b94322cb97b6803e2b9fd526b9438d779dcb845c1'
+        '7287a10e71580c6924956f18d3f14c21a22bc80f9f40b9e8baa46e7f0c37367cd595879a41fdcd4ca2a27b517a8dfe77c23e71d136154636a14469685987ad99'
+        '786f052975e81c857c9875fa7e8b672d50a21724c09a7f61187862d03e9a34b33aa812a067dc2d8aef874157dd7918389fe7f0462d360d5c2f9e87e7c774ecb8'
+        '0a3d92f96e8e5e35928ffb421a95805f6953d1c1cb7f7aaab990d3f0091a8eaefe02624c8a303b09a90a736e1da60b754287346ce609f8db6ed558005de31852'
+        '0df5b69f4e56d41cdfc8365d2eda8361ec0dd8f474b578c9f90f7764b803fc63adaff1c4d7d2ebfcbd30a5e210a8836a03267531cb328e5629d96ea491e39ef9'
+        'a76bd972ea95fbf05e42592e768becc655214d37382e3ca308032ceb784994c7ec5af12319bf069263500428b75b05fb7176d9e25bd60478e1016edb1e39020d'
+        '1ba3f9b94d75aaa2b836caf30b8a3d677a551ace1c581a9a41270b9b9b8cf47966900a3d8ea6491bfc826b28ef012586a5bbefb0b6a4732bb5375a9c718c3caf'
         'e5d405c8699ac94839669b3f91039d27a92a80edff0ba3638da10937092b3987bf6d77eb460b34d6258d6a642638f2b927381f0f6acb56ea7d90399cb1e8bde8'
         '5670a45e5e4f755c28ed29be4c6a2d62611f20ef03d1fc5ddb1be4cff14b20911af7b73d0110e45428a2e3c1caa471e8ad6f6f28fbac2bea44fc4aa1d0b98a45')
 
@@ -80,6 +86,12 @@ prepare() {
 
   # Fix Ankle Ammo Pouch to not look like a backpack
   patch -Np1 -i "$srcdir"/0003-ankle-ammo-pouch-is-not-a-backpack.patch
+
+  # Fix mulitple inconsistent ammuntion names (.45 ACP, 5.56 NATO, 7.62 NATO, RA110)
+  patch -Np1 -i "$srcdir"/0004-inconsistent-ammo-names.patch
+
+  # Fix NPCs not eating until they drop below normal weight and not becoming full from eating the basecamp stockpile
+  patch -Np1 -i "$srcdir"/0005-npcs-eat-when-hungry.patch
 }
 
 build() {
@@ -124,6 +136,9 @@ package_cataclysm-dda() {
   mv "$srcdir/cataclysm-dda-mod_grenade-crafting-master" "$srcdir/grenade-crafting"
   cp --reflink -r "$srcdir/grenade-crafting" "$pkgdir/usr/share/cataclysm-dda/mods"
 
+  mv "$srcdir/cataclysm-dda-mod_survivorheadgear-crafting-master" "$srcdir/survivorheadgear-crafting"
+  cp --reflink -r "$srcdir/survivorheadgear-crafting" "$pkgdir/usr/share/cataclysm-dda/mods"
+
   mv "$srcdir/cataclysm-dda-mod_hk-loadout-master" "$srcdir/hk-loadout"
   cp --reflink -r "$srcdir/hk-loadout" "$pkgdir/usr/share/cataclysm-dda/mods"