Updated to 2021-09-05-1136.

Fix custom patch for 2021-09-05-1136 sunburn changes.

2 files changed, 59 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1424af5..4db4b8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202109041536
-_pkgver=2021-09-04-1536
+pkgver=202109051136
+_pkgver=2021-09-05-1136
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -71,14 +71,13 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "jc_restore-inf-immune.patch"
         
         "custom.patch"
-        "custom-2.patch"
 
         "cataclysm-dda-tileset_undeadpeople.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-tileset_undeadpeople.git/snapshot/cataclysm-dda-tileset_undeadpeople-master.tar.xz"
         "cataclysm-dda-mod_battle-maid-redone-tileset.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_battle-maid-redone-tileset.git/snapshot/cataclysm-dda-mod_battle-maid-redone-tileset-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"
         )
-b2sums=('92a5970290209ac0631b6e86d8d3bf903be2ba190be0a9d6a9997fb6dac1a8af92e744dd5e56165383eeeef7371169bfa6cff6e25e5aaa2226c432d4d8e8a81a'
+b2sums=('9efab58aeda3902df13afa96d0b8a05025b015982c8b7dc130b386a1465665ddb9496809b5140fc6b0a3c6a9f12b341666906c06821e04e3963fab5d22bfff4c'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -119,8 +118,7 @@ b2sums=('92a5970290209ac0631b6e86d8d3bf903be2ba190be0a9d6a9997fb6dac1a8af92e744d
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9'
         '749badf61daf2957ecc1ad880628e8ffa1fac70e08523151c86f17fec2e6a5e65240fa2545f54936163bdb1dc677a258d138ebccada1c54694d2a39d830d2755'
-        '1d3eb730c5da98882cbd2ceb321cf246ffe1391d7df3f066d11ee3c1ac77887d7a0f03fe166374966ee7bd8bcdbf66ef962986cda6095df3f0f743745426d9b6'
-        'b72be57fc41fb7fd405ab362eb40cf94eb0cd31d502877d1e7bfb95610053f0f08cc950af3e55c07dfb63fcc2024c477a13b48390c8c249e3bcb89d2a957e9c2'
+        'a118f7aba737850fa6e7fb2880d34ece90f4b68c3e5c166ec8174a467dfab8ec5d1e57582aa2e01398b0eb9a5d2f74064dca763db627b0c3c3970da84c20aafe'
         '1a9518dadbc619cb97ca6dae4b6833083a312bd58d4596e4a231c005b3c89335a56bca62b644fc97340bdb37ff0f94043b5ba0b2d8ac379c8ef8b24adf2e7104'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '83ea75e6c14667c134bf683f330235c40c7bb94c65e19a6fc4a09ba38da254d09264a86cba4cafcbcf9b79916bd8e16976cb1b49be2475fe315616a3cc857820'
@@ -141,7 +139,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2021-09-04-1536|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2021-09-05-1136|' Makefile
 
 
   # Backports from 0.F
@@ -262,11 +260,8 @@ prepare() {
   patch -Np1 -i "$srcdir"/jc_restore-inf-immune.patch
 
 
-  # Some personal quirks that simply lack a means short of patching the source.
+  # A series of changes to add both gynoid and vampire mutation lines.
   patch -Np1 -i "$srcdir"/custom.patch
-
-  # Expand the vampirism patchset to add an entirely new food category so vampires can only drink blood.
-  patch -Np1 -i "$srcdir"/custom-2.patch
 }
 
 build() {
diff --git a/custom.patch b/custom.patch
index 6046066..322b809 100644
--- a/custom.patch
+++ b/custom.patch
@@ -428,24 +428,62 @@
          oxygen--;
      }
      if( oxygen < 12 && worn_with_flag( "REBREATHER" ) ) {
-@@ -759,6 +763,17 @@
-         }
+@@ -742,7 +746,8 @@
+         return;
      }
  
-+    if( has_trait( trait_VAMP_CURSE ) && one_in( 10 ) ) {
-+        if( !( weapon.has_flag( "RAIN_PROTECT" ) ) ) {
-+            add_msg_if_player( m_bad, _( "The sunlight sears your skin!" ) );
-+            if( has_effect( effect_sleep ) && !has_effect( effect_narcosis ) ) {
-+                wake_up();
-+            }
-+            mod_pain( 5 );
-+            hurtall( 5, nullptr );
-+        }
+-    if( has_trait( trait_ALBINO ) || has_effect( effect_datura ) || has_trait( trait_SUNBURN ) ) {
++    if( has_trait( trait_ALBINO ) || has_effect( effect_datura ) || has_trait( trait_SUNBURN ) ||
++        has_trait( trait_VAMP_CURSE ) ) {
+         suffer_from_sunburn();
+     }
+ 
+@@ -768,6 +773,13 @@
+         mod_int_bonus( -4 );
+         mod_per_bonus( -4 );
+     }
++    if( has_trait( trait_VAMP_CURSE ) ) {
++        mod_str_bonus( -4 );
++        mod_dex_bonus( -4 );
++        add_miss_reason( _( "You can't tolerate the sunlight!" ), 4 );
++        mod_int_bonus( -4 );
++        mod_per_bonus( -4 );
 +    }
-+
-     if( ( has_trait( trait_TROGLO ) || has_trait( trait_TROGLO2 ) ) &&
-         g->weather.weather == WEATHER_SUNNY ) {
-         mod_str_bonus( -1 );
+ }
+ 
+ std::map<bodypart_id, float> Character::bodypart_exposure()
+@@ -799,7 +811,8 @@
+ 
+ void Character::suffer_from_sunburn()
+ {
+-    if( !has_trait( trait_ALBINO ) && !has_effect( effect_datura ) && !has_trait( trait_SUNBURN ) ) {
++    if( !has_trait( trait_ALBINO ) && !has_effect( effect_datura ) && !has_trait( trait_SUNBURN ) &&
++        !has_trait( trait_VAMP_CURSE ) ) {
+         return;
+     }
+ 
+@@ -816,6 +829,12 @@
+             return;
+         }
+         sunlight_effect = _( "The sunlight burns" );
++    } else if( has_trait( trait_VAMP_CURSE ) ) {
++        // Sunburn effects occur about 10 times per minute
++        if( !one_turn_in( 6_seconds ) ) {
++            return;
++        }
++        sunlight_effect = _( "The sunlight sears" );
+     }
+ 
+     // Sunglasses can keep the sun off the eyes.
+@@ -893,7 +912,7 @@
+     }
+ 
+     // Solar Sensitivity (SUNBURN) trait causes injury to exposed parts
+-    if( has_trait( trait_SUNBURN ) ) {
++    if( has_trait( trait_SUNBURN ) || has_trait( trait_VAMP_CURSE ) ) {
+         mod_pain( 1 );
+         // Check exposure of all body parts
+         for( const std::pair<const bodypart_id, float> &bp_exp : bp_exposure ) {
 
 --- a/data/json/field_type.json
 +++ b/data/json/field_type.json