From 7ba27799ccd1bbefba5a67d9182873b3d22ff2a7 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 14 Jun 2022 13:04:58 -0700
Subject: Add hotfix for stomach contents not being saved.

---
 PKGBUILD                              | 15 ++++++++++-----
 hotfix-01_save-stomach-contents.patch | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 hotfix-01_save-stomach-contents.patch

diff --git a/PKGBUILD b/PKGBUILD
index c6e5d54..110e305 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=202206081648
-_pkgver=2022-06-08-1648
-pkgrel=1
+pkgver=202206102134
+_pkgver=2022-06-10-2134
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -30,6 +30,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
 
+        "hotfix-01_save-stomach-contents.patch"
+
         "revert-01_removed-traits.patch"
         "revert-02_revert-book-revamp.patch"
         "revert-03_generic-nv.patch"
@@ -128,10 +130,11 @@ 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=('3ac8f39e979c38d5445788753ea2b86a7bdc7a77f2907712fcbe19c817dc59ad2629c5d430bb649ddef25475f0b973403e4a37b4dac82849917d75af17107438'
+b2sums=('503e046ff99bb831d6b050789ab8121457a746dd4033d00d2244b44339ff581810a971559c17b2856799a7bcd9978313fa64e0cde576cbf0df879dc4629e2bc1'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
+        '6eb5c097290987791acd21585ea63279bc8296fe852c2068f218355ba9f0b6d6086fda2204fdd91443829c97ce7bd78faf829898d3080bb5420e024df3cde317'
         '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
         '5a33531c5742bbee44b1b3edec89cfceb6e0f161a5e0f0b131149fec010be4ab45095fdc558d0dd0023182cde66200f387f819aa392410dd317c0bc8dddb6294'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
@@ -220,11 +223,13 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-06-08-1648|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-06-10-2134|' Makefile
 
 
   # # # Hotfixes
   #echo "Applying hotfixes"
+  # Fix stomach contents not being saved, leading to excess hunger on game load
+  patch -Np1 -i "$srcdir"/hotfix-01_save-stomach-contents.patch
 
 
   # # # Reverts
diff --git a/hotfix-01_save-stomach-contents.patch b/hotfix-01_save-stomach-contents.patch
new file mode 100644
index 0000000..f65f0e1
--- /dev/null
+++ b/hotfix-01_save-stomach-contents.patch
@@ -0,0 +1,18 @@
+--- a/src/savegame_json.cpp
++++ b/src/savegame_json.cpp
+@@ -608,6 +608,7 @@
+         overmap_time_array.read_next( tdr );
+         overmap_time[pt] = tdr;
+     }
++    data.read( "stomach", stomach );
+     data.read( "automoveroute", auto_move_route );
+ 
+     known_traps.clear();
+@@ -740,6 +741,7 @@
+         }
+         json.end_array();
+     }
++    json.member( "stomach", stomach );
+     json.member( "automoveroute", auto_move_route );
+     json.member( "known_traps" );
+     json.start_array();
-- 
cgit v1.2.1