From 40b16154dc0c32190cd957ebdfae7398fb4258d8 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 19 Jul 2022 15:06:42 -0400 Subject: [PATCH] v1.3.2: adjusted when qualifications for boss badges are set to true --- .../java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java | 2 +- .../shatteredpixeldungeon/levels/CavesBossLevel.java | 1 + .../shatteredpixeldungeon/levels/CityBossLevel.java | 2 ++ .../shatteredpixeldungeon/levels/HallsBossLevel.java | 2 ++ .../shatteredpixeldungeon/levels/PrisonBossLevel.java | 2 ++ .../shatteredpixeldungeon/levels/SewerBossLevel.java | 3 +++ 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java index 85e140c48..b93507d87 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java @@ -341,7 +341,7 @@ public class Dungeon { level.create(); Statistics.qualifiedForNoKilling = !bossLevel(); - Statistics.qualifiedForBossChallengeBadge = bossLevel(); + Statistics.qualifiedForBossChallengeBadge = false; return level; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java index e255bbf7d..efb783eb3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java @@ -262,6 +262,7 @@ public class CavesBossLevel extends Level { @Override public void seal() { super.seal(); + Statistics.qualifiedForBossChallengeBadge = true; int entrance = entrance(); set( entrance, Terrain.WALL ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java index e9205906e..566e6743c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java @@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Bones; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DwarfKing; @@ -299,6 +300,7 @@ public class CityBossLevel extends Level { @Override public void seal() { super.seal(); + Statistics.qualifiedForBossChallengeBadge = true; //moves intelligent allies with the hero, preferring closer pos to entrance door int doorPos = pointToCell(new Point(arena.left + arena.width()/2, arena.bottom)); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java index 23efe83a4..293cbaae6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java @@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Bones; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; @@ -220,6 +221,7 @@ public class HallsBossLevel extends Level { @Override public void seal() { super.seal(); + Statistics.qualifiedForBossChallengeBadge = true; int entrance = entrance(); set( entrance, Terrain.EMPTY_SP ); GameScene.updateMap( entrance ); 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 95183d7cb..0cb31f5be 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java @@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Bones; import com.shatteredpixel.shatteredpixeldungeon.Challenges; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; @@ -419,6 +420,7 @@ public class PrisonBossLevel extends Level { } seal(); + Statistics.qualifiedForBossChallengeBadge = true; set(pointToCell(tenguCellDoor), Terrain.LOCKED_DOOR); GameScene.updateMap(pointToCell(tenguCellDoor)); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java index 7496c385e..cf47078f1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java @@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Bones; +import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Goo; @@ -168,6 +169,8 @@ public class SewerBossLevel extends SewerLevel { super.seal(); + Statistics.qualifiedForBossChallengeBadge = true; + set( entrance(), Terrain.WATER ); GameScene.updateMap( entrance() ); GameScene.ripple( entrance() );