From 66e4cf339d7debad26096fe8531b47e2e3c03791 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 2 Sep 2018 20:51:41 -0400 Subject: [PATCH] v0.7.0: adjusted the ordering of some displayed text --- .../shatteredpixeldungeon/actors/buffs/Burning.java | 2 +- .../shatteredpixeldungeon/actors/buffs/Frost.java | 2 +- .../items/scrolls/ScrollOfTeleportation.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java index 69ae27877..ed353e204 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java @@ -114,6 +114,7 @@ public class Burning extends Buff implements Hero.Doom { if (!burnable.isEmpty()){ Item toBurn = Random.element(burnable).detach(hero.belongings.backpack); + GLog.w( Messages.get(this, "burnsup", Messages.capitalize(toBurn.toString())) ); if (toBurn instanceof MysteryMeat){ ChargrilledMeat steak = new ChargrilledMeat(); if (!steak.collect( hero.belongings.backpack )) { @@ -121,7 +122,6 @@ public class Burning extends Buff implements Hero.Doom { } } Heap.burnFX( hero.pos ); - GLog.w( Messages.get(this, "burnsup", Messages.capitalize(toBurn.toString())) ); } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java index dea0e2960..eb2ceb30c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java @@ -70,6 +70,7 @@ public class Frost extends FlavourBuff { if (!freezable.isEmpty()){ Item toFreeze = Random.element(freezable).detach( hero.belongings.backpack ); + GLog.w( Messages.get(this, "freezes", toFreeze.toString()) ); if (toFreeze instanceof Potion){ ((Potion) toFreeze).shatter(hero.pos); } else if (toFreeze instanceof MysteryMeat){ @@ -78,7 +79,6 @@ public class Frost extends FlavourBuff { Dungeon.level.drop( carpaccio, target.pos ).sprite.drop(); } } - GLog.w( Messages.get(this, "freezes", toFreeze.toString()) ); } } else if (target instanceof Thief) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java index 507ed677b..5b447b666 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java @@ -79,7 +79,7 @@ public class ScrollOfTeleportation extends Scroll { //time isn't spent ((HeroSprite)curUser.sprite).read(); teleportToLocation(curUser, target); - GLog.i( Messages.get(ScrollOfTeleportation.class, "tele") ); + } } @@ -122,14 +122,14 @@ public class ScrollOfTeleportation extends Scroll { GLog.w( Messages.get(ScrollOfTeleportation.class, "no_tele") ); } else { - + + GLog.i( Messages.get(ScrollOfTeleportation.class, "tele") ); + appear( hero, pos ); Dungeon.level.press( pos, hero ); Dungeon.observe(); GameScene.updateFog(); - GLog.i( Messages.get(ScrollOfTeleportation.class, "tele") ); - } } @@ -172,11 +172,11 @@ public class ScrollOfTeleportation extends Scroll { teleportHero( hero ); } else { int pos = Random.element(candidates); + GLog.i( Messages.get(ScrollOfTeleportation.class, "tele") ); appear( hero, pos ); Dungeon.level.press( pos, hero ); Dungeon.observe(); GameScene.updateFog(); - GLog.i( Messages.get(ScrollOfTeleportation.class, "tele") ); } }