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

v0.3.1: fixed bugs with teleportation, cleaned up Lloyd's beacon sfx

Browse Source
This commit is contained in:
Evan Debenham 2015-08-17 16:46:40 -04:00
parent 7ec008a03e
commit 4cbdf6e034
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java
View File

@ -204,7 +204,6 @@ public class LloydsBeacon extends Artifact {
if (Actor.findChar(target) == curUser){ if (Actor.findChar(target) == curUser){
ScrollOfTeleportation.teleportHero(curUser); ScrollOfTeleportation.teleportHero(curUser);
Sample.INSTANCE.play(Assets.SND_TELEPORT);
curUser.spendAndNext(1f); curUser.spendAndNext(1f);
} else { } else {
final Ballistica bolt = new Ballistica( curUser.pos, target, Ballistica.MAGIC_BOLT ); final Ballistica bolt = new Ballistica( curUser.pos, target, Ballistica.MAGIC_BOLT );
@ -212,7 +211,6 @@ public class LloydsBeacon extends Artifact {
if (ch == curUser){ if (ch == curUser){
ScrollOfTeleportation.teleportHero(curUser); ScrollOfTeleportation.teleportHero(curUser);
Sample.INSTANCE.play(Assets.SND_TELEPORT);
curUser.spendAndNext( 1f ); curUser.spendAndNext( 1f );
} else { } else {
Sample.INSTANCE.play( Assets.SND_ZAP ); Sample.INSTANCE.play( Assets.SND_ZAP );
@ -233,7 +231,7 @@ public class LloydsBeacon extends Artifact {
} }
} while (pos == -1); } while (pos == -1);
if (pos == -1) { if (pos == -1 || Dungeon.bossLevel()) {
GLog.w(ScrollOfTeleportation.TXT_NO_TELEPORT); GLog.w(ScrollOfTeleportation.TXT_NO_TELEPORT);

2
src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java
View File

@ -66,7 +66,7 @@ public class ScrollOfTeleportation extends Scroll {
} }
} while (pos == -1); } while (pos == -1);
if (pos == -1) { if (pos == -1 || Dungeon.bossLevel()) {
GLog.w( TXT_NO_TELEPORT ); GLog.w( TXT_NO_TELEPORT );

2
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java
View File

@ -164,7 +164,7 @@ public class CursedWand {
break; break;
} }
} while (pos == -1); } while (pos == -1);
if (pos == -1) { if (pos == -1 || Dungeon.bossLevel()) {
GLog.w(ScrollOfTeleportation.TXT_NO_TELEPORT); GLog.w(ScrollOfTeleportation.TXT_NO_TELEPORT);
} else { } else {
ch.pos = pos; ch.pos = pos;

2
src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java
View File

@ -64,7 +64,7 @@ public class TeleportationTrap extends Trap {
} }
} while (pos == -1); } while (pos == -1);
if (pos == -1) { if (pos == -1 || Dungeon.bossLevel()) {
GLog.w(ScrollOfTeleportation.TXT_NO_TELEPORT); GLog.w(ScrollOfTeleportation.TXT_NO_TELEPORT);

2
src/com/shatteredpixel/shatteredpixeldungeon/plants/Fadeleaf.java
View File

@ -62,7 +62,7 @@ public class Fadeleaf extends Plant {
} }
} while (newPos == -1); } while (newPos == -1);
if (newPos != -1) { if (newPos != -1 && !Dungeon.bossLevel()) {
ch.pos = newPos; ch.pos = newPos;
ch.sprite.place( ch.pos ); ch.sprite.place( ch.pos );