From a0a0a108f5f093f67b06b433bf8cb6b73787a65a Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 22 Jun 2017 13:21:08 -0400 Subject: [PATCH] v0.6.1: removed ethereal chains being limited on locked floors slightly adjusted prison boss level to compensate --- .../items/artifacts/EtherealChains.java | 10 ---------- .../shatteredpixeldungeon/levels/PrisonBossLevel.java | 2 +- .../messages/items/items.properties | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java index e5f50b336..e68880c08 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java @@ -113,16 +113,6 @@ public class EtherealChains extends Artifact { final Ballistica chain = new Ballistica(curUser.pos, target, Ballistica.STOP_TARGET); - //chains do not go through walls on locked levels - if (curUser.buff(LockedFloor.class) != null){ - for (int i : chain.subPath(1, chain.dist)){ - if (Level.solid[i]){ - GLog.w( Messages.get(EtherealChains.class, "locked") ); - return; - } - } - } - if (Actor.findChar( chain.collisionPos ) != null){ chainEnemy( chain, curUser, Actor.findChar( chain.collisionPos )); } else { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java index 80c035306..beaa5ea5c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java @@ -434,7 +434,7 @@ public class PrisonBossLevel extends Level { private static final int[] MAP_MAZE = { W, W, W, W, W, M, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, e, e, e, W, W, M, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, - e, e, e, D, e, e, e, D, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, W, W, + W, W, e, D, e, e, e, D, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, W, W, W, W, W, W, e, e, e, W, W, W, W, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, W, W, W, W, W, W, W, W, W, W, W, W, W, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, W, W, W, W, W, W, W, e, W, W, W, W, W, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, e, W, W, 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 3aefdbdad..fe8414c68 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 @@ -197,7 +197,6 @@ items.artifacts.etherealchains.does_nothing=That won't do anything. items.artifacts.etherealchains.cant_pull=Your chains cannot pull that target. items.artifacts.etherealchains.cant_reach=Your chains can't reach there. items.artifacts.etherealchains.inside_wall=Your chains can only pull you through walls, not into them. -items.artifacts.etherealchains.locked=The chains cannot reach through walls while the floor is locked. items.artifacts.etherealchains.nothing_to_grab=There is nothing to grab there. items.artifacts.etherealchains.prompt=Choose a location to target. items.artifacts.etherealchains.desc=These large yet lightweight chains glow with spiritual energy. They can be used to pull you towards terrain, or pull enemies toward you. The ethereal nature of the chains even allows them to extend through walls!