Port to Bright Nights

1 files changed, 29 insertions, 28 deletions

diff --git a/custom.patch b/custom.patch
index 694b919..15b5ef5 100644
--- a/custom.patch
+++ b/custom.patch
@@ -1,24 +1,3 @@
---- 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" ) ) {
 --- a/src/character.cpp
 +++ b/src/character.cpp
 @@ -251,6 +251,7 @@
@@ -26,9 +5,9 @@
  static const trait_id trait_THRESH_PLANT( "THRESH_PLANT" );
  static const trait_id trait_THRESH_SPIDER( "THRESH_SPIDER" );
 +static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" );
+ static const trait_id trait_TOUGH_FEET( "TOUGH_FEET" );
  static const trait_id trait_TRANSPIRATION( "TRANSPIRATION" );
  static const trait_id trait_URSINE_EYE( "URSINE_EYE" );
- static const trait_id trait_VISCOUS( "VISCOUS" );
 @@ -4775,7 +4775,7 @@
  
  void Character::update_bodytemp()
@@ -40,7 +19,7 @@
          return;
 --- a/src/map_field.cpp
 +++ b/src/map_field.cpp
-@@ -87,6 +87,7 @@
+@@ -88,6 +88,7 @@
  static const trait_id trait_M_SKIN3( "M_SKIN3" );
  static const trait_id trait_THRESH_MARLOSS( "THRESH_MARLOSS" );
  static const trait_id trait_THRESH_MYCUS( "THRESH_MYCUS" );
@@ -48,7 +27,7 @@
  static const trait_id trait_WEB_WALKER( "WEB_WALKER" );
  
  void map::create_burnproducts( const tripoint &p, const item &fuel, const units::mass &burned_mass )
-@@ -1524,7 +1525,8 @@
+@@ -1395,7 +1396,8 @@
              if( ( cur.get_field_intensity() > 1 || !one_in( 3 ) ) && ( !inside || one_in( 3 ) ) ) {
                  u.add_env_effect( effect_teargas, bp_mouth, 5, 20_seconds );
              }
@@ -58,17 +37,39 @@
                  u.add_env_effect( effect_blind, bp_eyes, cur.get_field_intensity() * 2, 10_seconds );
              }
          }
-@@ -1651,8 +1653,8 @@
+@@ -1526,8 +1528,9 @@
              // The gas won't harm you inside a vehicle.
              if( !inside ) {
                  // Full body suits protect you from the effects of the gas.
--                if( !( u.worn_with_flag( flag_GAS_PROOF ) && u.get_env_resist( bp_mouth ) >= 15 &&
--                       u.get_env_resist( bp_eyes ) >= 15 ) ) {
+-                if( !( u.worn_with_flag( flag_GAS_PROOF ) && u.get_env_resist( bodypart_id( "mouth" ) ) >= 15 &&
+-                       u.get_env_resist( bodypart_id( "eyes" ) ) >= 15 ) ) {
 +                if( !( u.has_trait( trait_THRESH_VAMP ) ) && !( u.worn_with_flag( flag_GAS_PROOF ) &&
-+                        u.get_env_resist( bp_mouth ) >= 15 && u.get_env_resist( bp_eyes ) >= 15 ) ) {
++                        u.get_env_resist( bodypart_id( "mouth" ) ) >= 15 &&
++                        u.get_env_resist( bodypart_id( "eyes" ) ) >= 15 ) ) {
                      const int intensity = cur.get_field_intensity();
                      bool inhaled = u.add_env_effect( effect_poison, bp_mouth, 5, intensity * 1_minutes );
                      if( u.has_trait( trait_THRESH_MYCUS ) || u.has_trait( trait_THRESH_MARLOSS ) ||
+--- 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" ) ) {
 --- a/data/json/field_type.json
 +++ b/data/json/field_type.json
 @@ -303,7 +303,7 @@