From dd6c43831331d4971641283bbbf758d582f38247 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 20 Oct 2021 09:26:07 -0700 Subject: [PATCH 1/6] eatpoison no longer allows zombiemeat --- src/consumption.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index b1a911aac2a09..07f36731e5fb0 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -952,7 +952,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 ); From 3bc8843d14ba7767da31b312449994ef80ec4386 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 20 Oct 2021 09:44:10 -0700 Subject: [PATCH 2/6] Intestinal Fortitude affects mutant toxin --- data/json/mutations/mutations.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 9f8c026e804d0..e345f6f2bf010 100644 --- a/data/json/mutations/mutations.json +++ b/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 }, From 95f42c53f0b83038e1905f2fad01a35f9fb65ac6 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 20 Oct 2021 10:21:37 -0700 Subject: [PATCH 3/6] Update EATDEAD --- data/json/mutations/mutations.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index e345f6f2bf010..e6b3bb6b5f3b3 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -3608,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 From cb5b0f4ad5bc68f5dbbc219c2a66f916191692f1 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 20 Oct 2021 11:41:41 -0700 Subject: [PATCH 4/6] =?UTF-8?q?Fix=20...=20->=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/json/mutations/mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index e6b3bb6b5f3b3..9b3bba241770c 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -3608,7 +3608,7 @@ "id": "EATDEAD", "name": { "str": "Eater Of The Dead" }, "points": 4, - "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.", + "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" ], From 99a12de48bc7b86416f5fcbd2ad9beb98be98f0c Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 20 Oct 2021 14:03:28 -0700 Subject: [PATCH 5/6] A sacrificial offering of " " to please the gods --- data/json/mutations/mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 9b3bba241770c..d0a68bed1c47e 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -3608,7 +3608,7 @@ "id": "EATDEAD", "name": { "str": "Eater Of The Dead" }, "points": 4, - "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.", + "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" ], From daa0e90a9d648afdc60a0334add7317bce5d6aab Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Thu, 21 Oct 2021 11:07:01 -0700 Subject: [PATCH 6/6] clean unneeded reference --- src/consumption.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index 07f36731e5fb0..208c4e8708741 100644 --- a/src/consumption.cpp +++ b/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" );