From 389cad9b45f8db682cc6f526a31baf8660ed7a63 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 13 Jun 2020 14:47:12 -0400 Subject: [PATCH] v0.8.1: replaced the border on hero splash arts with a fade --- core/src/main/assets/sounds/debuff.mp3 | Bin 0 -> 7368 bytes .../scenes/HeroSelectScene.java | 24 ++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 core/src/main/assets/sounds/debuff.mp3 diff --git a/core/src/main/assets/sounds/debuff.mp3 b/core/src/main/assets/sounds/debuff.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..582705368fe58ee2427fb8f8b83a03a8526e1f72 GIT binary patch literal 7368 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 literal 0 HcmV?d00001 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java index 88229ec79..699e812d7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java @@ -45,11 +45,11 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndChallenges; import com.shatteredpixel.shatteredpixeldungeon.windows.WndMessage; import com.shatteredpixel.shatteredpixeldungeon.windows.WndStartGame; import com.shatteredpixel.shatteredpixeldungeon.windows.WndTabbed; +import com.watabou.gltextures.TextureCache; import com.watabou.input.PointerEvent; import com.watabou.noosa.Camera; import com.watabou.noosa.Game; import com.watabou.noosa.Image; -import com.watabou.noosa.NinePatch; import com.watabou.noosa.PointerArea; import com.watabou.utils.DeviceCompat; import com.watabou.utils.GameMath; @@ -59,7 +59,6 @@ import java.util.ArrayList; public class HeroSelectScene extends PixelScene { private Image background; - private NinePatch border; private RenderedTextBlock prompt; //fading UI elements @@ -93,15 +92,21 @@ public class HeroSelectScene extends PixelScene { background.y = (Camera.main.height - background.height())/2f; background.visible = false; PixelScene.align(background); - - border = Chrome.get(Chrome.Type.WINDOW_SILVER); - border.size(background.width()+border.marginHor()-4, background.height()+border.marginVer()-4); - border.x = background.x - border.marginLeft()+2; - border.y = background.y - border.marginTop()+2; - border.visible = false; - add(border); add(background); + if (background.x > 0){ + Image fadeLeft = new Image(TextureCache.createGradient(0xFF000000, 0x00000000)); + fadeLeft.x = background.x-2; + fadeLeft.scale.set(4, background.height()); + add(fadeLeft); + + Image fadeRight = new Image(fadeLeft); + fadeRight.x = background.x + background.width() + 2; + fadeRight.y = background.y + background.height(); + fadeRight.angle = 180; + add(fadeRight); + } + prompt = PixelScene.renderTextBlock(Messages.get(WndStartGame.class, "title"), 12); prompt.hardlight(Window.TITLE_COLOR); prompt.setPos( (Camera.main.width - prompt.width())/2f, (Camera.main.height - HeroBtn.HEIGHT - prompt.height() - 4)); @@ -220,7 +225,6 @@ public class HeroSelectScene extends PixelScene { background.texture( cl.splashArt() ); background.visible = true; background.hardlight(1.5f,1.5f,1.5f); - border.visible = true; prompt.visible = false; startBtn.visible = true;