Merge pull request CleverRaven#52375 from anoobindisguise/anoobindisg…

…uise-eatpoisondead

EATPOISON now affects mutant toxins, does not allow eating zombie meat

data/json/mutations/mutations.json

@@ -3593,12 +3593,13 @@
     "id": "EATPOISON",
     "name": { "str": "Intestinal Fortitude" },
     "points": 3,
-    "description": "Your guts have developed the ability to handle poisonous food.  Mostly.",
+    "description": "Your guts have developed the ability to handle the toxic elements of mutated flesh.  Mostly.",
     "changes_to": [ "EATDEAD" ],
     "prereqs": [ "NAUSEA", "VOMITOUS", "POISRESIST", "POISONOUS" ],
     "//": "Yes, you eventually got over the massive digestive upset.  Mutations aren't easy on a system!",
     "prereqs2": [ "SAPROVORE", "TOLERANCE" ],
     "threshreq": [ "THRESH_TROGLOBITE", "THRESH_CHIMERA", "THRESH_RAPTOR", "THRESH_RAT", "THRESH_MOUSE", "THRESH_BATRACHIAN" ],
+    "vitamins_absorb_multi": [ [ "all", [ [ "mutant_toxin", 0.25 ] ] ] ],
     "category": [ "TROGLOBITE", "RAPTOR", "RAT", "CHIMERA", "BATRACHIAN" ],
     "valid": false
   },
@@ -3607,10 +3608,11 @@
     "id": "EATDEAD",
     "name": { "str": "Eater Of The Dead" },
     "points": 4,
-    "description": "Eating rotting, long-dead flesh is good for the struggle, and safe--if still completely unappealing--for you.",
+    "description": "Your digestion has evolved further.  In addition to mutated meat, you can also stomach the tainted and long-dead flesh of zombies… if you can stand the taste, of course.",
     "prereqs": [ "EATPOISON" ],
     "threshreq": [ "THRESH_CHIMERA", "THRESH_RAT", "THRESH_MOUSE" ],
     "cancels": [ "VEGETARIAN", "HERBIVORE", "RUMINANT", "GRAZER" ],
+    "vitamins_absorb_multi": [ [ "all", [ [ "mutant_toxin", 0.25 ] ] ] ],
     "category": [ "RAT", "CHIMERA", "MOUSE" ],
     "flags": [ "IMMUNE_SPOIL" ],
     "valid": false

src/consumption.cpp

@@ -105,7 +105,6 @@ static const trait_id trait_CANNIBAL( "CANNIBAL" );
 static const trait_id trait_CARNIVORE( "CARNIVORE" );
 static const trait_id trait_EATDEAD( "EATDEAD" );
 static const trait_id trait_EATHEALTH( "EATHEALTH" );
-static const trait_id trait_EATPOISON( "EATPOISON" );
 static const trait_id trait_GIZZARD( "GIZZARD" );
 static const trait_id trait_GOURMAND( "GOURMAND" );
 static const trait_id trait_HERBIVORE( "HERBIVORE" );
@@ -952,7 +951,7 @@ static bool eat( item &food, Character &you, bool force )
 
     // If it's poisonous... poison us.
     // TODO: Move this to a flag
-    if( food.poison > 0 && !you.has_trait( trait_EATPOISON ) &&
+    if( food.poison > 0 &&
         !you.has_trait( trait_EATDEAD ) ) {
         if( food.poison >= rng( 2, 4 ) ) {
             you.add_effect( effect_poison, food.poison * 10_minutes );