more fixes

Dan1ss1mo · Mar 8, 2023 · b53ea93 · b53ea93
1 parent bab702c
commit b53ea93
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
@@ -4451,7 +4451,7 @@
     "threshreq": [ "THRESH_MEDICAL" ],
     "//": "MASOCHIST_MED, CENOBITE, and NOPAIN don't cancel each other.  By design.  Poor painless people...",
     "category": [ "MEDICAL" ],
-    "pain_multiplier": 0.0
+    "flags": [ "PAIN_IMMUNE" ]
   },
   {
     "type": "mutation",

diff --git a/src/character.cpp b/src/character.cpp
@@ -5779,7 +5779,6 @@ 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 = {
     { "healing_awake", calc_mutation_value<&mutation_branch::healing_awake> },
-    { "pain_multiplier", calc_mutation_value_multiplicative<&mutation_branch::pain_multiplier> },
     { "pain_modifier", calc_mutation_value<&mutation_branch::pain_modifier> },
     { "healing_multiplier", calc_mutation_value_multiplicative<&mutation_branch::healing_multiplier> },
     { "mending_modifier", calc_mutation_value_multiplicative<&mutation_branch::mending_modifier> },

diff --git a/src/mutation.h b/src/mutation.h
@@ -204,7 +204,6 @@ struct mutation_branch {
         cata::optional<float> healing_multiplier = cata::nullopt;
         // Limb mending bonus
         cata::optional<float> mending_modifier = cata::nullopt;
-        cata::optional<float> pain_multiplier = cata::nullopt;
         cata::optional<float> pain_modifier = cata::nullopt;
         // Bonus HP multiplier. That is, 1.0 doubles hp, -0.5 halves it.
         cata::optional<float> hp_modifier = cata::nullopt;

diff --git a/src/mutation_data.cpp b/src/mutation_data.cpp
@@ -384,7 +384,6 @@ void mutation_branch::load( const JsonObject &jo, const std::string & )
     }
 
     optional( jo, was_loaded, "healing_awake", healing_awake, cata::nullopt );
-    optional( jo, was_loaded, "pain_multiplier", pain_multiplier, cata::nullopt );
     optional( jo, was_loaded, "pain_modifier", pain_modifier, cata::nullopt );
     optional( jo, was_loaded, "healing_multiplier", healing_multiplier, cata::nullopt );
     optional( jo, was_loaded, "mending_modifier", mending_modifier, cata::nullopt );