konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.3.2: fixed teleportation and movement inconsistencies with some characters

Browse Source
This commit is contained in:
Evan Debenham
2015-11-03 19:02:28 -05:00
parent 0c29e09d7a
commit 6ec890da5a
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java
+12 -1
View File
@@ -29,6 +29,10 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.RotHeart;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.RotLasher;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Shopkeeper;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker;
import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation;
@@ -232,11 +236,18 @@ public class LloydsBeacon extends Artifact {
}
} while (pos == -1);
if (pos == -1 || Dungeon.bossLevel()) {
GLog.w(ScrollOfTeleportation.TXT_NO_TELEPORT);
} else {
//FIXME: sloppy, fix when adding mob properties
} else if (ch instanceof RotLasher || ch instanceof RotHeart
|| ch instanceof Shopkeeper || ch instanceof Wandmaker) {
GLog.w("The teleportation magic fails.");
} else {
ch.pos = pos;
ch.sprite.place(ch.pos);