From 0b57fefa62e5a137a08c3bb41464044e1025f0fe Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 22 May 2020 22:33:50 -0400 Subject: [PATCH] v0.8.1: overhauled the game's about scene --- core/src/main/assets/interfaces/icons.png | Bin 2861 -> 12232 bytes .../scenes/AboutScene.java | 395 ++++++++++++++---- .../scenes/TitleScene.java | 2 +- .../shatteredpixeldungeon/ui/Icons.java | 33 +- .../ui/RenderedTextBlock.java | 2 +- 5 files changed, 337 insertions(+), 95 deletions(-) diff --git a/core/src/main/assets/interfaces/icons.png b/core/src/main/assets/interfaces/icons.png index eca3d78f798469be31d3a9feb6b35418fc0f81b5..4c9fcddc593f2508c676ea8f64b6b3a2369528b3 100644 GIT binary patch literal 12232 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 L; body.height()){ + avatar.y = topY; + body.setPos( avatar.x + avatar.width() + 1, topY + (avatar.height() - body.height())/2f); + topY += avatar.height() + 1; + } else { + avatar.y = topY + (body.height() - avatar.height())/2f; + PixelScene.align(avatar); + body.setPos( avatar.x + avatar.width() + 1, topY); + topY += body.height() + 2; + } + + } else { + topY += 1; + body.maxWidth((int)width()); + body.setPos( x, topY); + topY += body.height()+2; + } + + } + + if (link != null){ + if (large) topY += 1; + link.maxWidth((int)width()); + link.setPos( x + (width() - link.width())/2f, topY); + topY += link.height() + 2; + + linkButton.x = link.left()-1; + linkButton.y = link.top()-1; + linkButton.width = link.width()+2; + linkButton.height = link.height()+2; + + linkUnderline.size(link.width(), PixelScene.align(0.49f)); + linkUnderline.x = link.left(); + linkUnderline.y = link.bottom()+1; + + } + + topY -= 2; + + height = Math.max(height, topY - top()); + } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java index 54f78ae83..091ebf832 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java @@ -174,7 +174,7 @@ public class TitleScene extends PixelScene { TitleButton btnAbout = new TitleButton(Messages.get(this, "about")){ @Override protected void onClick() { - ShatteredPixelDungeon.switchNoFade( AboutScene.class ); + ShatteredPixelDungeon.switchScene( AboutScene.class ); } }; btnAbout.icon(Icons.get(Icons.SHPX)); 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 4e404bda4..0b7f93e59 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.ui; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.watabou.noosa.Image; public enum Icons { @@ -71,7 +72,14 @@ public enum Icons { //misc icons LIBGDX, WATA, - WARNING; + WARNING, + + //32x32 icons for credits + CUBE_CODE, + PURIGRO, + ARCNOR, + ALEKS, + CHARLIE; public Image get() { return get( this ); @@ -192,6 +200,29 @@ public enum Icons { case WARNING: icon.frame( icon.texture.uvRect( 34, 81, 48, 95 ) ); break; + + //32*32 icons are scaled down to match game's size + case ALEKS: + icon.frame( icon.texture.uvRect( 0, 96, 32, 128 ) ); + icon.scale.set(PixelScene.align(0.49f)); + break; + case CHARLIE: + icon.frame( icon.texture.uvRect( 32, 96, 64, 128 ) ); + icon.scale.set(PixelScene.align(0.49f)); + break; + case ARCNOR: + icon.frame( icon.texture.uvRect( 64, 96, 96, 128 ) ); + icon.scale.set(PixelScene.align(0.49f)); + break; + case PURIGRO: + icon.frame( icon.texture.uvRect( 96, 96, 128, 128 ) ); + icon.scale.set(PixelScene.align(0.49f)); + break; + case CUBE_CODE: + icon.frame( icon.texture.uvRect( 101, 39, 128, 69 ) ); + icon.scale.set(PixelScene.align(0.49f)); + break; + } return icon; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RenderedTextBlock.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RenderedTextBlock.java index dfa524f41..1b7ead2ab 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RenderedTextBlock.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RenderedTextBlock.java @@ -211,7 +211,7 @@ public class RenderedTextBlock extends Component { } else { if (word.height() > height) height = word.height(); - if ((x - this.x) + word.width() > maxWidth){ + if ((x - this.x) + word.width() > maxWidth && !curLine.isEmpty()){ y += height+2f; x = this.x; nLines++;