From 158fd1c7300d5fbf0d6fa689f74c05fcdf214fab Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 7 May 2021 16:33:42 -0400 Subject: [PATCH] v0.9.3: fixed CharAwareness unnecessarily checking depth --- .../java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java | 1 - .../items/artifacts/TalismanOfForesight.java | 1 - .../com/shatteredpixel/shatteredpixeldungeon/levels/Level.java | 2 -- 3 files changed, 4 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java index 186c67084..b89743826 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java @@ -753,7 +753,6 @@ public class Dungeon { } for (TalismanOfForesight.CharAwareness c : hero.buffs(TalismanOfForesight.CharAwareness.class)){ - if (Dungeon.depth != c.depth) continue; Char ch = (Char) Actor.findById(c.charID); if (ch == null) continue; BArray.or( level.visited, level.heroFOV, ch.pos - 1 - level.width(), 3, level.visited ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java index ce32f5e35..19c68adfa 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java @@ -349,7 +349,6 @@ public class TalismanOfForesight extends Artifact { public static class CharAwareness extends FlavourBuff { public int charID; - public int depth = Dungeon.depth; private static final String CHAR_ID = "char_id"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index 1330e494d..a5673e90c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -1167,10 +1167,8 @@ public abstract class Level implements Bundlable { } for (TalismanOfForesight.CharAwareness a : c.buffs(TalismanOfForesight.CharAwareness.class)){ - if (Dungeon.depth != a.depth) continue; Char ch = (Char) Actor.findById(a.charID); if (ch == null) { - a.detach(); continue; } int p = ch.pos;