From 59ffaa1b8c626e8f880339179ab97210f2b4fcca Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 16 Mar 2021 17:17:35 -0400 Subject: [PATCH] v0.9.2b: toned down the intensity of white flash effects --- .../shatteredpixeldungeon/actors/mobs/Elemental.java | 2 +- .../shatteredpixeldungeon/actors/mobs/YogFist.java | 4 ++-- .../items/artifacts/TimekeepersHourglass.java | 4 ++-- .../shatteredpixeldungeon/items/bombs/Flashbang.java | 6 +++--- .../items/scrolls/ScrollOfRetribution.java | 2 +- .../items/scrolls/exotic/ScrollOfPsionicBlast.java | 2 +- .../shatteredpixeldungeon/levels/NewPrisonBossLevel.java | 6 +++--- .../shatteredpixeldungeon/levels/OldPrisonBossLevel.java | 6 +++--- .../shatteredpixeldungeon/levels/traps/FlashingTrap.java | 2 +- .../shatteredpixeldungeon/scenes/GameScene.java | 7 ++++++- 10 files changed, 23 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java index c1bbfeceb..d433a3208 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java @@ -291,7 +291,7 @@ public abstract class Elemental extends Mob { protected void rangedProc( Char enemy ) { Buff.affect( enemy, Blindness.class, Blindness.DURATION/2f ); if (enemy == Dungeon.hero) { - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java index 64fc28be7..ed1ffbc92 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java @@ -481,11 +481,11 @@ public abstract class YogFist extends Mob { || PathFinder.getStep(i, Dungeon.level.exit, Dungeon.level.passable) == -1); ScrollOfTeleportation.appear(this, i); state = WANDERING; - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); GLog.w( Messages.get( this, "teleport" )); } else if (!isAlive()){ Buff.prolong( Dungeon.hero, Blindness.class, Blindness.DURATION*3f ); - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index 773945f00..32379fc86 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -97,7 +97,7 @@ public class TimekeepersHourglass extends Artifact { protected void onSelect(int index) { if (index == 0) { GLog.i( Messages.get(TimekeepersHourglass.class, "onstasis") ); - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); Sample.INSTANCE.play(Assets.Sounds.TELEPORT); activeBuff = new timeStasis(); @@ -105,7 +105,7 @@ public class TimekeepersHourglass extends Artifact { activeBuff.attachTo(Dungeon.hero); } else if (index == 1) { GLog.i( Messages.get(TimekeepersHourglass.class, "onfreeze") ); - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); Sample.INSTANCE.play(Assets.Sounds.TELEPORT); activeBuff = new timeFreeze(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Flashbang.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Flashbang.java index 8a9570cb2..61331f4ff 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Flashbang.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Flashbang.java @@ -48,9 +48,9 @@ public class Flashbang extends Bomb { if (power > 0){ Buff.prolong(ch, Blindness.class, power); Buff.prolong(ch, Cripple.class, power); - } - if (ch == Dungeon.hero){ - GameScene.flash(0xFFFFFF); + if (ch == Dungeon.hero){ + GameScene.flash(0x80FFFFFF); + } } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java index 07ce4eb3e..e08b1d326 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java @@ -40,7 +40,7 @@ public class ScrollOfRetribution extends Scroll { @Override public void doRead() { - GameScene.flash( 0xFFFFFF ); + GameScene.flash( 0x80FFFFFF ); //scales from 0x to 1x power, maxing at ~10% HP float hpPercent = (curUser.HT - curUser.HP)/(float)(curUser.HT); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPsionicBlast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPsionicBlast.java index b4c419b6b..0fe5a33fc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPsionicBlast.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPsionicBlast.java @@ -42,7 +42,7 @@ public class ScrollOfPsionicBlast extends ExoticScroll { @Override public void doRead() { - GameScene.flash( 0xFFFFFF ); + GameScene.flash( 0x80FFFFFF ); Sample.INSTANCE.play( Assets.Sounds.BLAST ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java index aca6d54a4..9b4c6163f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java @@ -414,7 +414,7 @@ public class NewPrisonBossLevel extends Level { tengu.sprite.kill(); if (d != null) tengu.add(d); - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.FIGHT_PAUSE; @@ -435,7 +435,7 @@ public class NewPrisonBossLevel extends Level { GameScene.add(tengu); tengu.notice(); - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.FIGHT_ARENA; @@ -485,7 +485,7 @@ public class NewPrisonBossLevel extends Level { } } - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.WON; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldPrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldPrisonBossLevel.java index c50f8732d..fda568eae 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldPrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldPrisonBossLevel.java @@ -360,7 +360,7 @@ public class OldPrisonBossLevel extends Level { cleanWalls(); GameScene.resetMap(); - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.MAZE; @@ -391,7 +391,7 @@ public class OldPrisonBossLevel extends Level { GameScene.add(tengu); tengu.notice(); - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.FIGHT_ARENA; @@ -445,7 +445,7 @@ public class OldPrisonBossLevel extends Level { for (Item item : storedItems) drop(item, randomTenguArenaCell()); - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); Sample.INSTANCE.play(Assets.Sounds.BLAST); state = State.WON; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java index 34a6ddee7..6ef0e33e7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java @@ -71,7 +71,7 @@ public class FlashingTrap extends Trap { } if (Dungeon.level.heroFOV[pos]) { - GameScene.flash(0xFFFFFF); + GameScene.flash(0x80FFFFFF); Sample.INSTANCE.play( Assets.Sounds.BLAST ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index bbc8f444e..19fa415ff 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -998,7 +998,12 @@ public class GameScene extends PixelScene { } public static void flash( int color, boolean lightmode ) { - scene.fadeIn( 0xFF000000 | color, lightmode ); + //greater than 0 to account for negative values (which have the first bit set to 1) + if (color > 0 && color < 0x01000000) { + scene.fadeIn(0xFF000000 | color, lightmode); + } else { + scene.fadeIn(color, lightmode); + } } public static void gameOver() {