diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-09-10 18:58:30 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-09-10 18:58:30 -0700 |
| commit | a1876fc16a57ee0bcbeff9b206396beccad5bfb0 (patch) | |
| tree | db4244eaa56adee00526174e9d777c7f5948efd7 | |
| parent | Update ammo order patch to fix 00 shot. (diff) | |
| download | cataclysm-bn-a1876fc16a57ee0bcbeff9b206396beccad5bfb0.tar.xz | |
Remove pain recovery source changes from vampirism patch.
| -rw-r--r-- | vampirism.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/vampirism.patch b/vampirism.patch index d47c965..c9c44c3 100644 --- a/vampirism.patch +++ b/vampirism.patch @@ -30,16 +30,6 @@ --- a/src/character.cpp +++ b/src/character.cpp -@@ -280,6 +280,9 @@ - static const trait_id trait_NOMAD2( "NOMAD2" ); - static const trait_id trait_NOMAD3( "NOMAD3" ); - static const trait_id trait_NOPAIN( "NOPAIN" ); -+static const trait_id trait_PAINREC1( "PAINREC1" ); -+static const trait_id trait_PAINREC2( "PAINREC2" ); -+static const trait_id trait_PAINREC3( "PAINREC3" ); - static const trait_id trait_PACKMULE( "PACKMULE" ); - static const trait_id trait_PADDED_FEET( "PADDED_FEET" ); - static const trait_id trait_PAWS( "PAWS" ); @@ -311,6 +311,8 @@ static const trait_id trait_TOUGH_FEET( "TOUGH_FEET" ); static const trait_id trait_TRANSPIRATION( "TRANSPIRATION" ); @@ -49,23 +39,6 @@ static const trait_id trait_VISCOUS( "VISCOUS" ); static const trait_id trait_WATERSLEEP( "WATERSLEEP" ); static const trait_id trait_WEBBED( "WEBBED" ); -@@ -4429,7 +4432,15 @@ - { - int pain_ticks = rate_multiplier; - while( get_pain() > 0 && pain_ticks-- > 0 ) { -- mod_pain( -roll_remainder( 0.2f + get_pain() / 50.0f ) ); -+ if( has_trait( trait_PAINREC1 ) ) { -+ mod_pain( -roll_remainder( 0.2f + get_pain() / 45.0f ) ); -+ } else if( has_trait( trait_PAINREC2 ) ) { -+ mod_pain( -roll_remainder( 0.2f + get_pain() / 40.0f ) ); -+ } else if( has_trait( trait_PAINREC3 ) ) { -+ mod_pain( -roll_remainder( 0.2f + get_pain() / 30.0f ) ); -+ } else { -+ mod_pain( -roll_remainder( 0.2f + get_pain() / 50.0f ) ); -+ } - } - - float rest = rest_quality(); @@ -4631,6 +4631,7 @@ const bool npc_no_food = is_npc() && get_option<bool>( "NO_NPC_FOOD" ); const bool foodless = debug_ls || npc_no_food; |