From 7d6d9e9f0eae6aa8e4e96d4dcead8e7fa67f8294 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 6 Jan 2023 16:01:55 -0500 Subject: [PATCH] v2.0.0: adjusted most landmarks to work based on visited, not heroFOV --- .../shatteredpixeldungeon/actors/blobs/Alchemy.java | 2 +- .../shatteredpixeldungeon/actors/blobs/Foliage.java | 6 +++--- .../shatteredpixeldungeon/actors/blobs/SacrificialFire.java | 2 +- .../shatteredpixeldungeon/actors/mobs/DemonSpawner.java | 2 +- .../shatteredpixeldungeon/actors/mobs/Statue.java | 2 +- .../shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java | 2 +- .../shatteredpixeldungeon/actors/mobs/npcs/Imp.java | 2 +- .../shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java | 2 +- .../shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Alchemy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Alchemy.java index e719b6aee..f9c9bff87 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Alchemy.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Alchemy.java @@ -53,7 +53,7 @@ public class Alchemy extends Blob { } volume += off[cell]; - if (off[cell] > 0 && Dungeon.level.heroFOV[cell]){ + if (off[cell] > 0 && Dungeon.level.visited[cell]){ Notes.add( Notes.Landmark.ALCHEMY ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Foliage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Foliage.java index a78f67476..0f86260a5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Foliage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Foliage.java @@ -39,7 +39,7 @@ public class Foliage extends Blob { int[] map = Dungeon.level.map; - boolean visible = false; + boolean seen = false; int cell; for (int i = area.left; i < area.right; i++) { @@ -55,7 +55,7 @@ public class Foliage extends Blob { GameScene.updateMap(cell); } - visible = visible || Dungeon.level.heroFOV[cell]; + seen = seen || Dungeon.level.visited[cell]; } else { off[cell] = 0; @@ -71,7 +71,7 @@ public class Foliage extends Blob { } } - if (visible) { + if (seen) { Notes.add( Notes.Landmark.GARDEN ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/SacrificialFire.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/SacrificialFire.java index ec89cda8c..4180bb4c6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/SacrificialFire.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/SacrificialFire.java @@ -85,7 +85,7 @@ public class SacrificialFire extends Blob { } } - if (off[cell] > 0 && Dungeon.level.heroFOV[cell]) { + if (off[cell] > 0 && Dungeon.level.visited[cell]) { Notes.add( Notes.Landmark.SACRIFICIAL_FIRE); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java index dfc499c07..a8b57dcd4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java @@ -91,7 +91,7 @@ public class DemonSpawner extends Mob { spawnRecorded = true; } - if (Dungeon.level.heroFOV[pos]){ + if (Dungeon.level.visited[pos]){ Notes.add( Notes.Landmark.DEMON_SPAWNER ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java index 22c3a910f..a2f78ca45 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java @@ -80,7 +80,7 @@ public class Statue extends Mob { @Override protected boolean act() { - if (levelGenStatue && Dungeon.level.heroFOV[pos]) { + if (levelGenStatue && Dungeon.level.visited[pos]) { Notes.add( Notes.Landmark.STATUE ); } return super.act(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java index 2843e5c3b..26034c009 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java @@ -67,7 +67,7 @@ public class Blacksmith extends NPC { die(null); return true; } - if (Dungeon.level.heroFOV[pos] && !Quest.reforged){ + if (Dungeon.level.visited[pos] && !Quest.reforged){ Notes.add( Notes.Landmark.TROLL ); } return super.act(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java index 2c2b6de8a..460d29c98 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Imp.java @@ -61,7 +61,7 @@ public class Imp extends NPC { die(null); return true; } - if (!Quest.given && Dungeon.level.heroFOV[pos]) { + if (!Quest.given && Dungeon.level.visited[pos]) { if (!seenBefore) { yell( Messages.get(this, "hey", Dungeon.hero.name() ) ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java index 4277720ab..d19af74b5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java @@ -52,7 +52,7 @@ public class Shopkeeper extends NPC { @Override protected boolean act() { - if (Dungeon.level.heroFOV[pos]){ + if (Dungeon.level.visited[pos]){ Notes.add(Notes.Landmark.SHOP); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java index 49a77fdd0..81737e75e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java @@ -66,7 +66,7 @@ public class Wandmaker extends NPC { die(null); return true; } - if (Dungeon.level.heroFOV[pos] && Quest.wand1 != null){ + if (Dungeon.level.visited[pos] && Quest.wand1 != null){ Notes.add( Notes.Landmark.WANDMAKER ); } return super.act();