From fe581e690fe669b1f95a7866bcaf81cb2364e9d7 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 23 Feb 2022 13:29:42 -0500 Subject: [PATCH] v1.2.0: fixed pharmacophobia still blocking some health potion recipes --- .../shatteredpixeldungeon/items/food/Blandfruit.java | 5 ----- .../items/potions/AlchemicalCatalyst.java | 1 + .../shatteredpixeldungeon/items/potions/Potion.java | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java index d32da53ed..9bdee99ee 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java @@ -260,11 +260,6 @@ public class Blandfruit extends Food { if (fruit.quantity() >= 1 && fruit.potionAttrib == null && seed.quantity() >= 1){ - if (Dungeon.isChallenged(Challenges.NO_HEALING) - && seed instanceof Sungrass.Seed){ - return false; - } - return true; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/AlchemicalCatalyst.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/AlchemicalCatalyst.java index 2ca68d038..64160fa12 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/AlchemicalCatalyst.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/AlchemicalCatalyst.java @@ -60,6 +60,7 @@ public class AlchemicalCatalyst extends Potion { @Override public void apply(Hero hero) { Potion p = Reflection.newInstance(Random.chances(potionChances)); + //Don't allow this to roll healing in pharma while (Dungeon.isChallenged(Challenges.NO_HEALING) && p instanceof PotionOfHealing){ p = Reflection.newInstance(Random.chances(potionChances)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java index 7459df2f9..9034854a1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java @@ -514,8 +514,7 @@ public class Potion extends Item { } while (result instanceof PotionOfHealing - && (Dungeon.isChallenged(Challenges.NO_HEALING) - || Random.Int(10) < Dungeon.LimitedDrops.COOKING_HP.count)) { + && Random.Int(10) < Dungeon.LimitedDrops.COOKING_HP.count) { result = (Potion) Generator.randomUsingDefaults(Generator.Category.POTION); }