diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index 0aeca743a..5492bfed7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -290,7 +290,7 @@ public class TimekeepersHourglass extends Artifact { type = buffType.POSITIVE; } - float partialTime = 1f; + float partialTime = 0f; ArrayList presses = new ArrayList(); @@ -337,6 +337,11 @@ public class TimekeepersHourglass extends Artifact { for (Mob mob : Dungeon.level.mobs.toArray(new Mob[0])) if (mob.paralysed <= 0) mob.sprite.remove(CharSprite.State.PARALYSED); GameScene.freezeEmitters = false; + + while (partialTime > 0f){ + partialTime -= 2f; + charge --; + } updateQuickslot(); super.detach(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java index 163df91df..c7395ffa4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java @@ -237,7 +237,9 @@ public class WandOfCorruption extends Wand { } else { curUser.earnExp(0, enemy.getClass()); } - enemy.rollToDropLoot(); + if (enemy.alignment == Char.Alignment.ENEMY){ + enemy.rollToDropLoot(); + } } else { Buff.affect(enemy, Doom.class); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLarderRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLarderRoom.java index a7503cb29..8900e3212 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLarderRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLarderRoom.java @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.secret; +import com.shatteredpixel.shatteredpixeldungeon.Challenges; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; import com.shatteredpixel.shatteredpixeldungeon.items.food.ChargrilledMeat; @@ -54,7 +55,9 @@ public class SecretLarderRoom extends SecretRoom { Painter.fill(level, c.x-1, c.y-1, 3, 3, Terrain.WATER); Painter.set(level, c, Terrain.GRASS); - level.plant(new BlandfruitBush.Seed(), level.pointToCell(c)); + if (!Dungeon.isChallenged(Challenges.NO_FOOD)) { + level.plant(new BlandfruitBush.Seed(), level.pointToCell(c)); + } int extraFood = (int)(Hunger.STARVING - Hunger.HUNGRY) * (1 + Dungeon.depth / 5); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java index 263525480..bcb6bf4a7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java @@ -183,7 +183,7 @@ public class WndRanking extends WndTabbed { pos += GAP + GAP; - pos = statSlot( this, Messages.get(this, "str"), Integer.toString( Dungeon.hero.STR ), pos ); + pos = statSlot( this, Messages.get(this, "str"), Integer.toString( Dungeon.hero.STR() ), pos ); pos = statSlot( this, Messages.get(this, "health"), Integer.toString( Dungeon.hero.HT ), pos ); pos += GAP;