From 7beeec84f5b3a696fb89285123834443575af0b7 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Tue, 19 Jul 2022 14:48:10 -0400
Subject: [PATCH] v1.3.2: improved the amulet scene's visuals

---
 .../scenes/AmuletScene.java                   | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AmuletScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AmuletScene.java
index a9587af59..87eedc391 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AmuletScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AmuletScene.java
@@ -22,6 +22,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.scenes;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.Chrome;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.GamesInProgress;
 import com.shatteredpixel.shatteredpixeldungeon.effects.BadgeBanner;
@@ -29,9 +30,15 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.Flare;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
 import com.shatteredpixel.shatteredpixeldungeon.items.Amulet;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
+import com.shatteredpixel.shatteredpixeldungeon.ui.Archs;
+import com.shatteredpixel.shatteredpixeldungeon.ui.Icons;
 import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
 import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock;
+import com.shatteredpixel.shatteredpixeldungeon.ui.StyledButton;
 import com.watabou.noosa.Camera;
+import com.watabou.noosa.ColorBlock;
 import com.watabou.noosa.Game;
 import com.watabou.noosa.Image;
 import com.watabou.noosa.tweeners.Delayer;
@@ -40,7 +47,7 @@ import com.watabou.utils.Random;
 public class AmuletScene extends PixelScene {
 	
 	private static final int WIDTH			= 120;
-	private static final int BTN_HEIGHT		= 18;
+	private static final int BTN_HEIGHT		= 20;
 	private static final float SMALL_GAP	= 2;
 	private static final float LARGE_GAP	= 8;
 	
@@ -52,8 +59,8 @@ public class AmuletScene extends PixelScene {
 		inGameScene = true;
 	}
 
-	RedButton btnExit = null;
-	RedButton btnStay = null;
+	StyledButton btnExit = null;
+	StyledButton btnStay = null;
 	
 	@Override
 	public void create() {
@@ -62,14 +69,14 @@ public class AmuletScene extends PixelScene {
 		RenderedTextBlock text = null;
 		if (!noText) {
 			text = renderTextBlock( Messages.get(this, "text"), 8 );
-			text.maxWidth(WIDTH);
+			text.maxWidth( PixelScene.landscape() ? 2*WIDTH-4 : WIDTH);
 			add( text );
 		}
 		
 		amulet = new Image( Assets.Sprites.AMULET );
 		add( amulet );
 
-		btnExit = new RedButton( Messages.get(this, "exit") ) {
+		btnExit = new StyledButton(Chrome.Type.GREY_BUTTON_TR, Messages.get(this, "exit") ) {
 			@Override
 			protected void onClick() {
 				Dungeon.win( Amulet.class );
@@ -94,10 +101,11 @@ public class AmuletScene extends PixelScene {
 				});
 			}
 		};
+		btnExit.icon(new ItemSprite(ItemSpriteSheet.AMULET));
 		btnExit.setSize( WIDTH, BTN_HEIGHT );
 		add( btnExit );
 		
-		btnStay = new RedButton( Messages.get(this, "stay") ) {
+		btnStay = new StyledButton(Chrome.Type.GREY_BUTTON_TR, Messages.get(this, "stay") ) {
 			@Override
 			protected void onClick() {
 				onBackPressed();
@@ -105,6 +113,7 @@ public class AmuletScene extends PixelScene {
 				btnStay.enable(false);
 			}
 		};
+		btnStay.icon(Icons.CLOSE.get());
 		btnStay.setSize( WIDTH, BTN_HEIGHT );
 		add( btnStay );