diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java index cfd3302f0..33809a0d2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java @@ -37,7 +37,7 @@ public class MagicalSleep extends Buff { if (!target.isImmune(Sleep.class) && super.attachTo( target )) { if (target instanceof Hero) - if (target.HP == target.buff(Regeneration.class).regencap()) { + if (target.HP == target.HT) { GLog.i(Messages.get(this, "toohealthy")); detach(); return true; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java index 99e04dfea..b45bf1267 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java @@ -250,6 +250,8 @@ public class Heap implements Bundlable { if (((Bomb) item).explodesDestructively()) { //stop processing the burning, it will be replaced by the explosion. return; + } else { + burnt = true; } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java index ce904a34e..290c25a7f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java @@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.King; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; -import com.shatteredpixel.shatteredpixeldungeon.items.Gold; import com.shatteredpixel.shatteredpixeldungeon.items.Heap; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; @@ -166,7 +165,7 @@ public class CityBossLevel extends Level { @Override protected void createItems() { - Item item = new Gold(10); + Item item = Bones.get(); if (item != null) { int pos; do { diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index f92099fda..8dfb03478 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -591,7 +591,7 @@ items.potions.brews.wickedbrew.desc=This brew combines the properties of a toxic ###elixirs items.potions.elixirs.elixirofaquaticrejuvenation.name=elixir of aquatic rejuvenation -items.potions.elixirs.elixirofaquaticrejuvenation.desc=This elixir contains the remains of goo enhanced with a healing potion. While it will not provide immediate healing, it will slowly restore your health while you are standing in water. +items.potions.elixirs.elixirofaquaticrejuvenation.desc=This elixir contains the remains of Goo enhanced with a healing potion. While it will not provide immediate healing, it will slowly restore your health while you are standing in water. items.potions.elixirs.elixirofaquaticrejuvenation$aquahealing.name=Aquatic Healing items.potions.elixirs.elixirofaquaticrejuvenation$aquahealing.desc=You have temporarily gained restorative properties similar to that of Goo.\n\nWhile standing in water, you will recover a single point of health per turn.\n\nturns left: %d. @@ -795,7 +795,7 @@ items.scrolls.scrollofidentify.desc=This scroll permanently reveals all of the s items.scrolls.scrolloflullaby.name=scroll of lullaby items.scrolls.scrolloflullaby.sooth=The scroll utters a soothing melody. You feel very sleepy. -items.scrolls.scrolloflullaby.desc=Reading this scroll emits a soothing melody will lull all who hear it into a deep magical sleep. +items.scrolls.scrolloflullaby.desc=Reading this scroll emits a soothing melody which will lull all who hear it into a deep magical sleep. items.scrolls.scrollofmagicmapping.name=scroll of magic mapping items.scrolls.scrollofmagicmapping.layout=You are now aware of the level layout.