LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.2.0: fixed pharmacophobia still blocking some health potion recipes

Browse Source
This commit is contained in:
Evan Debenham 2022-02-23 13:29:42 -05:00
parent b1a697916c
commit fe581e690f
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java
View File

@ -260,11 +260,6 @@ public class Blandfruit extends Food {
if (fruit.quantity() >= 1 && fruit.potionAttrib == null if (fruit.quantity() >= 1 && fruit.potionAttrib == null
&& seed.quantity() >= 1){ && seed.quantity() >= 1){
if (Dungeon.isChallenged(Challenges.NO_HEALING)
&& seed instanceof Sungrass.Seed){
return false;
}
return true; return true;
} }

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/AlchemicalCatalyst.java
View File

@ -60,6 +60,7 @@ public class AlchemicalCatalyst extends Potion {
@Override @Override
public void apply(Hero hero) { public void apply(Hero hero) {
Potion p = Reflection.newInstance(Random.chances(potionChances)); 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){ while (Dungeon.isChallenged(Challenges.NO_HEALING) && p instanceof PotionOfHealing){
p = Reflection.newInstance(Random.chances(potionChances)); p = Reflection.newInstance(Random.chances(potionChances));
} }

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
View File

@ -514,8 +514,7 @@ public class Potion extends Item {
} }
while (result instanceof PotionOfHealing 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); result = (Potion) Generator.randomUsingDefaults(Generator.Category.POTION);
} }