From 9e6d5ed0fabb5af82de2119f37a603e148bbcf87 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Fri, 12 Mar 2021 17:10:03 -0800
Subject: Add patch for gynoid and vampire custom traits

---
 PKGBUILD     | 11 +++++++++--
 custom.patch | 21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 custom.patch

diff --git a/PKGBUILD b/PKGBUILD
index 013fbdd..8a7d502 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=(cataclysm-dda cataclysm-dda-tiles)
 pkgname=cataclysm-dda
 pkgver=0.E.3
 _pkgver=0.E-3
-pkgrel=1.20
+pkgrel=1.23
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -48,6 +48,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
         "jc_npcs-eat-when-hungry.patch"
         "jc_stop-non-faction-npc-sleep-depirvation.patch"
         "jc_stop-sleeping-on-tables.patch"
+        
+        "custom.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"
@@ -75,7 +77,8 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
-        'c5397b4b740966e4b75629d98021141686ac3150b3af803e59afa3b062ba561248c77cbf8e2b7f2a97a273e7fbfdd76ab76d6485344318d0cdb5bb374f46e4c3'
+        'fc03723f95c83016594930e76dd585487033075d6a677dc9ee52c9ea0d280cfdc238f43179cd5a313aaab119c40e3a9fc167767b15b27ec8a87e88b1194a0284'
+        'b6a6c9c1791bc625b773aa1d0b90f98f0821aa06807353f1c179cbbb9090391e9ab7fe8d567a029bcf94dddf31c40d3e525d1033d2de81520726c0e69021f278'
         'f54bb10b6c5920b22942b1e312c315280afb720d3a897dce9333563cae3343668460d24b7d01bf36768974c729d92177e886f5ee0d22d746b19454a2ab6208fb'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
@@ -150,6 +153,10 @@ prepare() {
 
   # Fix NPCs preferring tables to cots or woodstoves to the floor
   patch -Np1 -i "$srcdir"/jc_stop-sleeping-on-tables.patch
+
+
+  # Some personal quirks that simply lack a means short of patching the source
+  patch -Np1 -i "$srcdir"/custom.patch
 }
 
 build() {
diff --git a/custom.patch b/custom.patch
new file mode 100644
index 0000000..ccac036
--- /dev/null
+++ b/custom.patch
@@ -0,0 +1,21 @@
+--- a/src/suffer.cpp
++++ b/src/suffer.cpp
+@@ -118,6 +118,8 @@
+ static const trait_id trait_FRESHWATEROSMOSIS( "FRESHWATEROSMOSIS" );
+ static const trait_id trait_GILLS( "GILLS" );
+ static const trait_id trait_GILLS_CEPH( "GILLS_CEPH" );
++static const trait_id trait_THRESH_GYNOID( "THRESH_GYNOID" );
++static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" );
+ static const trait_id trait_JITTERY( "JITTERY" );
+ static const trait_id trait_KILLER( "KILLER" );
+ static const trait_id trait_LEAVES( "LEAVES" );
+@@ -245,7 +247,8 @@
+ 
+ void Character::suffer_while_underwater()
+ {
+-    if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) ) {
++    if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) &&
++        !has_trait( trait_THRESH_GYNOID ) && !has_trait( trait_THRESH_VAMP ) ) {
+         oxygen--;
+     }
+     if( oxygen < 12 && worn_with_flag( "REBREATHER" ) ) {
-- 
cgit v1.2.1