Skip to content

Commit cd1bbfd

Browse files
Make numb mutation non-purifiable and make player not feel guilt if they have it. (#82760)
* NUMB morale patch * Update mutations.json * made numb come before psychopath * made numb come before pacifist and psychopath * remove stupid spacing I added there for no reason Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 0746a81 commit cd1bbfd

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

data/json/mutations/mutations.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10269,6 +10269,7 @@
1026910269
"types": [ "HUMAN_EMPATHY" ],
1027010270
"category": [ "MEDICAL" ],
1027110271
"threshreq": [ "THRESH_MEDICAL" ],
10272+
"purifiable": false,
1027210273
"flags": [ "NUMB" ]
1027310274
},
1027410275
{

src/magic_spell_effect.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ static const mtype_id mon_generator( "mon_generator" );
9595
static const species_id species_HALLUCINATION( "HALLUCINATION" );
9696
static const species_id species_SLIME( "SLIME" );
9797

98+
static const trait_id trait_NUMB( "NUMB" );
9899
static const trait_id trait_PACIFIST( "PACIFIST" );
99100
static const trait_id trait_PSYCHOPATH( "PSYCHOPATH" );
100101

@@ -1645,7 +1646,7 @@ void spell_effect::guilt( const spell &sp, Creature &caster, const tripoint_bub_
16451646
guilt_thresholds[max_kills] = _( "You feel uneasy about killing %s." );
16461647

16471648
Character &guy = *guilt_target;
1648-
if( guy.has_trait( trait_PSYCHOPATH ) ||
1649+
if( guy.has_trait( trait_NUMB ) || guy.has_trait( trait_PSYCHOPATH ) ||
16491650
guy.has_flag( json_flag_PRED3 ) || guy.has_flag( json_flag_PRED4 ) ) {
16501651
// specially immune.
16511652
return;

0 commit comments

Comments
 (0)