diff --git a/core/src/main/assets/messages/windows/windows.properties b/core/src/main/assets/messages/windows/windows.properties index faebbaa39..c1eef2237 100644 --- a/core/src/main/assets/messages/windows/windows.properties +++ b/core/src/main/assets/messages/windows/windows.properties @@ -215,7 +215,7 @@ windows.wndscorebreakdown.treasure_desc_old=Based on gold collected. windows.wndscorebreakdown.explore_title=Exploration windows.wndscorebreakdown.explore_desc=Based on floors with all items found, all secrets found, and all puzzles solved. windows.wndscorebreakdown.bosses_title=Bosses -windows.wndscorebreakdown.bosses_desc=Based on bosses defeated, reduced by taking avoidable hits during boss fights. +windows.wndscorebreakdown.bosses_desc=Based on bosses defeated, reduced by standing in avoidable attacks during boss fights. windows.wndscorebreakdown.quests_title=Quests windows.wndscorebreakdown.quests_desc=Based on quests completed. windows.wndscorebreakdown.win_multiplier=Win Multiplier diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java index 78adebc17..b359aa846 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java @@ -107,7 +107,6 @@ public class Goo extends Mob { if (Dungeon.level.water[pos] && HP < HT) { HP += healInc; - Statistics.bossScores[0] -= 10; Statistics.qualifiedForBossChallengeBadge = false; LockedFloor lock = Dungeon.hero.buff(LockedFloor.class); @@ -297,8 +296,7 @@ public class Goo extends Mob { if (Statistics.qualifiedForBossChallengeBadge){ Badges.validateBossChallengeCompleted(); } - Statistics.bossScores[0] += 1050; //Goo has a 50 point gimme - Statistics.bossScores[0] = Math.min(1000, Statistics.bossScores[0]); + Statistics.bossScores[0] += 1000; yell( Messages.get(this, "defeated") ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java index c21a89f74..89186ab8a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogDzewa.java @@ -224,15 +224,16 @@ public class YogDzewa extends Mob { Invisibility.dispel(this); for (Char ch : affected) { + if (ch == Dungeon.hero) { + Statistics.bossScores[4] -= 500; + } + if (hit( this, ch, true )) { if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)) { ch.damage(Random.NormalIntRange(30, 50), new Eye.DeathGaze()); } else { ch.damage(Random.NormalIntRange(20, 30), new Eye.DeathGaze()); } - if (ch == Dungeon.hero) { - Statistics.bossScores[4] -= 500; - } if (Dungeon.level.heroFOV[pos]) { ch.sprite.flash(); CellEmitter.center(pos).burst(PurpleParticle.BURST, Random.IntRange(1, 2));