From 6d038edb2bd9555432e37e8de0f422039df0ad15 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 10 Oct 2020 14:43:31 -0400 Subject: [PATCH] v0.9.0b: fixed Tengu abilities not working from load --- .../shatteredpixeldungeon/actors/mobs/NewTengu.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java index ab2ea13ba..0db758a3b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java @@ -119,10 +119,12 @@ public class NewTengu extends Mob { return Random.NormalIntRange(0, 5); } + boolean loading = false; + //Tengu is immune to debuffs and damage when removed from the level @Override public void add(Buff buff) { - if (Actor.chars().contains(this) || buff instanceof Doom){ + if (Actor.chars().contains(this) || buff instanceof Doom || loading){ super.add(buff); } } @@ -352,7 +354,9 @@ public class NewTengu extends Mob { @Override public void restoreFromBundle(Bundle bundle) { + loading = true; super.restoreFromBundle(bundle); + loading = false; lastAbility = bundle.getInt( LAST_ABILITY ); abilitiesUsed = bundle.getInt( ABILITIES_USED ); arenaJumps = bundle.getInt( ARENA_JUMPS ); @@ -1014,6 +1018,8 @@ public class NewTengu extends Mob { @Override protected void evolve() { + + boolean shocked = false; int cell; for (int i = area.left; i < area.right; i++){ @@ -1026,6 +1032,8 @@ public class NewTengu extends Mob { } if (cur[cell] > 0 && off[cell] == 0){ + + shocked = true; Char ch = Actor.findChar(cell); if (ch != null && !(ch instanceof NewTengu)){ @@ -1039,6 +1047,8 @@ public class NewTengu extends Mob { } } } + + if (shocked) Sample.INSTANCE.play( Assets.Sounds.LIGHTNING ); }