From 1f1d9fed78443af3c09134e2aba94a3d9b25b084 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 21 Aug 2024 17:03:21 -0400 Subject: [PATCH] v2.5.0: added a 'hide story text' button to interlevelscene --- core/src/main/assets/interfaces/icons.png | Bin 16538 -> 16577 bytes .../scenes/HeroSelectScene.java | 2 +- .../scenes/InterlevelScene.java | 77 +++++++++++++++++- .../shatteredpixeldungeon/ui/Icons.java | 4 + 4 files changed, 79 insertions(+), 4 deletions(-) diff --git a/core/src/main/assets/interfaces/icons.png b/core/src/main/assets/interfaces/icons.png index bf91b95950413b6a6ffcc1c58cdaf02ee4a03212..bc9a3fceea18bfd9b1a40f0a35f80f8902f42c21 100644 GIT binary patch literal 16577 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 PbV7lrtDnm{r-UW|c;s1r literal 16538 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 NlIDp*ehg(dICj~F=$PJDs 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"P;7+nvx{nk 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 Ju2zIa{y%YP8rJ{- 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 9b7b54952..38d616576 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java @@ -280,7 +280,7 @@ public class HeroSelectScene extends PixelScene { startBtn.setPos((leftArea - startBtn.width())/2f, title.top() + uiHeight - startBtn.height()); align(startBtn); - btnFade = new IconButton(Icons.COMPASS.get()){ + btnFade = new IconButton(Icons.CHEVRON.get()){ @Override protected void onClick() { enable(false); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java index c409c3b1a..03afa9305 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java @@ -41,6 +41,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.features.LevelTransition; import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.special.SpecialRoom; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.ui.GameLog; +import com.shatteredpixel.shatteredpixeldungeon.ui.IconButton; import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock; import com.shatteredpixel.shatteredpixeldungeon.ui.StyledButton; @@ -49,6 +50,7 @@ import com.watabou.gltextures.TextureCache; import com.watabou.noosa.Camera; import com.watabou.noosa.Game; import com.watabou.noosa.Image; +import com.watabou.noosa.tweeners.Tweener; import com.watabou.utils.BArray; import com.watabou.utils.DeviceCompat; import com.watabou.utils.GameMath; @@ -92,6 +94,7 @@ public class InterlevelScene extends PixelScene { private RenderedTextBlock storyMessage; private ShadowBox storyBG; private StyledButton btnContinue; + private IconButton btnHideStory; private static Thread thread; private static Exception error = null; @@ -242,7 +245,7 @@ public class InterlevelScene extends PixelScene { if (lastRegion == 6) aa = 1; else if (phase == Phase.FADE_IN) aa = Math.max( 0, 2*(timeLeft - (fadeTime - 0.333f))); else if (phase == Phase.FADE_OUT) aa = Math.max( 0, 2*(0.333f - timeLeft)); - else aa = 0; + //else aa = 0; } }; im.angle = 90; @@ -289,9 +292,69 @@ public class InterlevelScene extends PixelScene { btnContinue.setPos((Camera.main.width - btnContinue.width())/2f, storyMessage.bottom()+10); add(btnContinue); + btnHideStory = new IconButton(Icons.CHEVRON.get()){ + @Override + protected void onClick() { + if (icon.visible) { + enable(false); + //button is effectively screen-sized, but invisible + parent.add(new Tweener(parent, 0.5f) { + @Override + protected void updateValues(float progress) { + float uiAlpha = 1 - progress; + btnContinue.alpha(uiAlpha); + storyBG.alpha(uiAlpha * 0.75f); + storyMessage.alpha(uiAlpha); + icon.alpha(uiAlpha); + loadingText.alpha(uiAlpha); + im.am = uiAlpha; + } + + @Override + protected void onComplete() { + super.onComplete(); + setRect(0, 0, Camera.main.width, Camera.main.height); + enable(true); + icon.visible = false; + } + }); + } else { + setRect(btnContinue.right()+2, btnContinue.top(), 20, 21); + align(this); + icon.visible = true; + parent.add(new Tweener(parent, 0.5f) { + @Override + protected void updateValues(float progress) { + float uiAlpha = progress; + btnContinue.alpha(uiAlpha); + storyBG.alpha(uiAlpha*0.75f); + storyMessage.alpha(uiAlpha); + icon.alpha(uiAlpha); + loadingText.alpha(uiAlpha); + im.am = uiAlpha; + } + }); + } + } + + @Override + protected void onPointerDown() { + if (icon.visible) { + super.onPointerDown(); + } + } + }; + btnHideStory.icon().originToCenter(); + btnHideStory.icon().angle = 180f; + btnHideStory.setRect(btnContinue.right()+2, btnContinue.top(), 20, 21); + align(btnHideStory); + btnHideStory.enable(false); + add(btnHideStory); + btnContinue.alpha(0); storyBG.alpha(0); storyMessage.alpha(0); + btnHideStory.icon().alpha(0); } } @@ -350,6 +413,7 @@ public class InterlevelScene extends PixelScene { } private int dots = 0; + private boolean textFadingIn = true; @Override public void update() { @@ -394,9 +458,10 @@ public class InterlevelScene extends PixelScene { loadingText.alpha( Math.min(1, timeLeft+0.333f) ); if (btnContinue != null){ - btnContinue.alpha(timeLeft/fadeTime); + btnContinue.alpha((timeLeft/fadeTime)); storyMessage.alpha(btnContinue.alpha()); storyBG.alpha(btnContinue.alpha()*0.75f); + btnHideStory.icon().alpha(btnContinue.alpha()); } if ((timeLeft -= Game.elapsed) <= 0) { @@ -408,10 +473,16 @@ public class InterlevelScene extends PixelScene { case STATIC: - if (btnContinue != null) { + if (btnContinue != null && textFadingIn) { btnContinue.alpha(Math.min(1, btnContinue.alpha() + Game.elapsed)); storyMessage.alpha(btnContinue.alpha()); storyBG.alpha(btnContinue.alpha()*0.75f); + btnHideStory.icon().alpha(btnContinue.alpha()); + + if (btnContinue.alpha() == 1){ + btnHideStory.enable(true); + textFadingIn = false; + } } if (error != null) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java index f6b58a932..ccef29e8a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -61,6 +61,7 @@ public enum Icons { LEFTARROW, RIGHTARROW, CALENDAR, + CHEVRON, //misc larger icons, mainly used for buttons, tabs, and journal, spacing for 16x16 TARGET, @@ -220,6 +221,9 @@ public enum Icons { case CALENDAR: icon.frame( icon.texture.uvRectBySize( 224, 16, 15, 12 ) ); break; + case CHEVRON: + icon.frame( icon.texture.uvRectBySize( 240, 16, 13, 10 ) ); + break; case TARGET: icon.frame( icon.texture.uvRectBySize( 0, 32, 16, 16 ) );