From dca6a6e65f485f95045ce32944297ecffb6667e2 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 16 May 2017 15:51:41 -0400 Subject: [PATCH] v0.6.0: no herbalism challenge now removes plants directly --- .../shatteredpixel/shatteredpixeldungeon/levels/Level.java | 4 ++++ .../levels/rooms/special/SpecialRoom.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index 36a3b9830..6dc136340 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -709,6 +709,10 @@ public abstract class Level implements Bundlable { } public Plant plant( Plant.Seed seed, int pos ) { + + if (Dungeon.isChallenged(Challenges.NO_HERBALISM)){ + return null; + } Plant plant = plants.get( pos ); if (plant != null) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java index d17de9448..8c4ce1857 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java @@ -79,7 +79,7 @@ public class SpecialRoom extends Room { runSpecials.remove( CryptRoom.class ); } if (Dungeon.isChallenged( Challenges.NO_HERBALISM )){ - //sorry warden, no lucky sungrass or blandfruit seeds for you! + //Would be a bit mean to spawn these with no plants in them runSpecials.remove( FoliageRoom.class ); }