From af4e4e4f8017d27f24ce4f662501cf99408f8089 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 2 Sep 2024 14:18:22 -0400
Subject: [PATCH] v2.5.0: story text hiding can now also be cancelled via
 keybind

---
 .../scenes/InterlevelScene.java               | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

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 81cc74102..e2f46fee9 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
@@ -294,10 +294,28 @@ public class InterlevelScene extends PixelScene {
 					KeyEvent.addKeyListener(new Signal.Listener<KeyEvent>() {
 						@Override
 						public boolean onSignal(KeyEvent keyEvent) {
-							if (btnContinue.active){
-								phase = Phase.FADE_OUT;
-								timeLeft = fadeTime;
-								btnContinue.enable(false);
+							if (!keyEvent.pressed && btnContinue.active){
+								if (btnHideStory.active && !btnHideStory.icon().visible){
+									btnHideStory.setRect(btnContinue.right()+2, btnContinue.top(), 20, 21);
+									align(btnHideStory);
+									btnHideStory.icon().visible = true;
+									btnHideStory.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);
+											btnHideStory.icon().alpha(uiAlpha);
+											loadingText.alpha(uiAlpha);
+											im.am = uiAlpha;
+										}
+									});
+								} else {
+									phase = Phase.FADE_OUT;
+									timeLeft = fadeTime;
+									btnContinue.enable(false);
+								}
 								return true;
 							}
 							return false;
@@ -496,8 +514,14 @@ public class InterlevelScene extends PixelScene {
 				btnHideStory.icon().alpha(btnContinue.alpha());
 
 				if (btnContinue.alpha() == 1){
-					btnHideStory.enable(true);
 					textFadingIn = false;
+
+					if (btnContinue.active) {
+						btnHideStory.enable(true);
+					} else {
+						//move to fade out automatically
+					}
+
 				}
 			}