diff --git a/core/src/main/assets/interfaces/banners.png b/core/src/main/assets/interfaces/banners.png index eb36e53e9..b73cb3ee3 100644 Binary files a/core/src/main/assets/interfaces/banners.png and b/core/src/main/assets/interfaces/banners.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java index 8f10903d0..0a081609e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BannerSprites.java @@ -33,7 +33,6 @@ public class BannerSprites { TITLE_GLOW_LAND, BOSS_SLAIN, GAME_OVER, - SELECT_YOUR_HERO } public static Image get( Type type ) { @@ -52,13 +51,10 @@ public class BannerSprites { icon.frame( icon.texture.uvRect( 240, 100, 480, 157 ) ); break; case BOSS_SLAIN: - icon.frame( icon.texture.uvRect( 0, 157, 128, 192 ) ); + icon.frame( icon.texture.uvRect( 0, 157, 127, 225 ) ); break; case GAME_OVER: - icon.frame( icon.texture.uvRect( 0, 192, 128, 227 ) ); - break; - case SELECT_YOUR_HERO: - icon.frame( icon.texture.uvRect( 0, 227, 128, 248 ) ); + icon.frame( icon.texture.uvRect( 128, 157, 256, 192 ) ); break; } return icon; 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 a38868956..288fb49b4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -997,7 +997,7 @@ public class GameScene extends PixelScene { float offset = Camera.main.centerOffset.y; banner.x = align( uiCamera, (uiCamera.width - banner.width) / 2 ); - banner.y = align( uiCamera, (uiCamera.height - banner.height) / 2 - banner.height/2 - 16 - offset ); + banner.y = align( uiCamera, (uiCamera.height - banner.height) / 2 - 32 - offset ); addToFront( banner ); } @@ -1388,7 +1388,7 @@ public class GameScene extends PixelScene { @Override public void update() { - alpha(gameOver.am); + alpha((float)Math.pow(gameOver.am, 2)); super.update(); } }; @@ -1399,7 +1399,7 @@ public class GameScene extends PixelScene { restart.setSize(Math.max(80, restart.reqWidth()), 20); restart.setPos( align(uiCamera, (restart.camera.width - restart.width()) / 2), - align(uiCamera, (restart.camera.height - restart.height()) / 2 + restart.height()/2 + 16 - offset) + align(uiCamera, (restart.camera.height - restart.height()) / 2 + 8 - offset) ); scene.add(restart); @@ -1411,7 +1411,7 @@ public class GameScene extends PixelScene { @Override public void update() { - alpha(gameOver.am); + alpha((float)Math.pow(gameOver.am, 2)); super.update(); } };