Pain Recovery Deobsoletion

data/json/mutations/mutations.json

@@ -3201,6 +3201,16 @@
     "category": [ "URSINE", "CATTLE", "CHIMERA", "BEAST", "LIZARD", "MEDICAL" ],
     "hp_modifier_secondary": 0.2
   },
+  {
+    "type": "mutation",
+    "id": "PAINREC1",
+    "name": { "str": "Pain Recovery" },
+    "points": 1,
+    "description": "You recover from pain slightly faster than normal.",
+    "starting_trait": true,
+    "changes_to": [ "NOPAIN" ],
+    "pain_recovery": 1.0
+  },
   {
     "type": "mutation",
     "id": "MUT_TOUGH2",
@@ -3240,7 +3250,7 @@
     "description": "You've developed a serious appetite for pain, and take pride in your scars.",
     "valid": false,
     "prereqs": [ "MASOCHIST", "PAINRESIST", "ADDICTIVE" ],
-    "prereqs2": [ "PAINREC2", "PAINREC3" ],
+    "prereqs2": [ "PAINREC1", "ADDICTIVE" ],
     "threshreq": [ "THRESH_MEDICAL" ],
     "leads_to": [ "MUT_TOUGH" ],
     "changes_to": [ "CENOBITE" ],
@@ -3258,7 +3268,6 @@
     "valid": false,
     "purifiable": false,
     "prereqs": [ "MASOCHIST_MED" ],
-    "prereqs2": [ "PAINREC3", "ADDICTIVE" ],
     "threshreq": [ "THRESH_MEDICAL" ],
     "category": [ "MEDICAL" ]
   },
@@ -3271,7 +3280,7 @@
     "valid": false,
     "purifiable": false,
     "prereqs": [ "MASOCHIST", "PAINRESIST" ],
-    "prereqs2": [ "PAINREC3" ],
+    "prereqs2": [ "PAINREC1" ],
     "cancels": [ "MORE_PAIN", "MORE_PAIN2", "MORE_PAIN3" ],
     "threshreq": [ "THRESH_MEDICAL" ],
     "category": [ "MEDICAL" ]

data/json/obsoletion/mutations.json

@@ -17,15 +17,6 @@
     "valid": false,
     "player_display": false
   },
-  {
-    "type": "mutation",
-    "id": "PAINREC1",
-    "name": { "str": "Pain Recovery" },
-    "points": 0,
-    "description": "You recover from pain slightly faster than normal.  DUMMIED OUT because it wasn't actually functional…",
-    "valid": false,
-    "player_display": false
-  },
   {
     "type": "mutation",
     "id": "PAINREC2",

src/character.cpp

@@ -4562,7 +4562,8 @@ void Character::regen( int rate_multiplier )
 {
     int pain_ticks = rate_multiplier;
     while( get_pain() > 0 && pain_ticks-- > 0 ) {
-        mod_pain( -roll_remainder( 0.2f + get_pain() / 50.0f ) );
+        mod_pain( -roll_remainder( ( 0.2f + get_pain() / 50.0f ) * ( 1.0f +
+                                   mutation_value( "pain_recovery" ) ) ) );
     }
 
     float rest = rest_quality();
@@ -6723,6 +6724,7 @@ float calc_mutation_value_multiplicative( const std::vector<const mutation_branc
 
 static const std::map<std::string, std::function <float( std::vector<const mutation_branch *> )>>
 mutation_value_map = {
+    { "pain_recovery", calc_mutation_value<&mutation_branch::pain_recovery> },
     { "healing_awake", calc_mutation_value<&mutation_branch::healing_awake> },
     { "healing_resting", calc_mutation_value<&mutation_branch::healing_resting> },
     { "mending_modifier", calc_mutation_value<&mutation_branch::mending_modifier> },

src/character.h

@@ -2154,7 +2154,6 @@ class Character : public Creature, public visitable<Character>
         void suffer_from_chemimbalance();
         void suffer_from_schizophrenia();
         void suffer_from_asthma( int current_stim );
-        void suffer_from_pain();
         void suffer_in_sunlight();
         void suffer_from_sunburn();
         void suffer_from_other_mutations();

src/mutation.h

@@ -110,6 +110,8 @@ struct mutation_branch {
         int bodytemp_min = 0;
         int bodytemp_max = 0;
         int bodytemp_sleep = 0;
+        // Pain Recovery per turn:
+        float pain_recovery = 0.0f;
         // Healing per turn
         float healing_awake = 0.0f;
         float healing_resting = 0.0f;

src/mutation_data.cpp

@@ -374,6 +374,7 @@ void mutation_branch::load( const JsonObject &jo, const std::string & )
         vitamin_absorb_multi.emplace( material_id( pair.get_string( 0 ) ), vit );
     }
 
+    optional( jo, was_loaded, "pain_recovery", pain_recovery, 0.0f );
     optional( jo, was_loaded, "healing_awake", healing_awake, 0.0f );
     optional( jo, was_loaded, "healing_resting", healing_resting, 0.0f );
     optional( jo, was_loaded, "mending_modifier", mending_modifier, 1.0f );

src/suffer.cpp

@@ -1460,10 +1460,6 @@ void Character::suffer_without_sleep( const int sleep_deprivation )
     }
 }
 
-void Character::suffer_from_pain()
-{
-}
-
 void Character::suffer()
 {
     const int current_stim = get_stim();
@@ -1520,7 +1516,6 @@ void Character::suffer()
     }
 
     suffer_without_sleep( sleep_deprivation );
-    suffer_from_pain();
     //Suffer from enchantments
     enchantment_cache->activate_passive( *this );