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

v0.7.0: adjusted the ordering of some displayed text

Browse Source
This commit is contained in:
Evan Debenham 2018-09-02 20:51:41 -04:00
parent 6c04f88d31
commit 66e4cf339d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java
View File

@ -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())) );
}
}
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java
View File

@ -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) {

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java
View File

@ -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") );
}
}
@ -123,13 +123,13 @@ public class ScrollOfTeleportation extends Scroll {
} 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") );
}
}