From ec0657fcd6e171882e90ceed6909e89cf6869daa Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 30 Jul 2019 21:25:45 -0400 Subject: [PATCH] v0.7.4b: restructured icon files, added LibGDX and updated hero icons --- core/src/main/assets/icons.png | Bin 2766 -> 2861 bytes .../scenes/AlchemyScene.java | 2 +- .../scenes/RankingsScene.java | 15 +- .../scenes/StartScene.java | 6 +- .../shatteredpixeldungeon/ui/ExitButton.java | 10 +- .../shatteredpixeldungeon/ui/Icons.java | 236 +++++++++--------- .../shatteredpixeldungeon/ui/QuickRecipe.java | 4 +- .../ui/ResumeIndicator.java | 2 +- 8 files changed, 149 insertions(+), 126 deletions(-) diff --git a/core/src/main/assets/icons.png b/core/src/main/assets/icons.png index 49375b94762938bf387e6ade21cb6bad26d56dfc..eca3d78f798469be31d3a9feb6b35418fc0f81b5 100644 GIT binary patch literal 2861 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 L;c>$pWx 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 X@m1cYl7xw0uY%`>&Fd@NSV#W{M@6o| diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AlchemyScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AlchemyScene.java index 23bd961c8..dae4df7a3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AlchemyScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AlchemyScene.java @@ -166,7 +166,7 @@ public class AlchemyScene extends PixelScene { protected void createChildren() { super.createChildren(); - arrow = Icons.get(Icons.RESUME); + arrow = Icons.get(Icons.ARROW); add(arrow); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java index 7ad2cfbbf..dd24a160e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java @@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.scenes; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Rankings; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; import com.shatteredpixel.shatteredpixeldungeon.effects.Flare; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; @@ -227,6 +228,10 @@ public class RankingsScene extends PixelScene { } classIcon.copy( Icons.get( rec.heroClass ) ); + if (rec.heroClass == HeroClass.ROGUE){ + //cloak of shadows needs to be brightened a bit + classIcon.brightness(2f); + } } @Override @@ -270,15 +275,17 @@ public class RankingsScene extends PixelScene { flare.point( shield.center() ); } - classIcon.x = x + width - classIcon.width; - classIcon.y = shield.y; + classIcon.x = x + width - 16 + (16 - classIcon.width())/2f; + classIcon.y = shield.y + (16 - classIcon.height())/2f; + align(classIcon); level.x = classIcon.x + (classIcon.width - level.width()) / 2f; level.y = classIcon.y + (classIcon.height - level.height()) / 2f + 1; align(level); - steps.x = x + width - steps.width - classIcon.width; - steps.y = shield.y; + steps.x = x + width - 32 + (16 - steps.width())/2f; + steps.y = shield.y + (16 - steps.height())/2f; + align(steps); depth.x = steps.x + (steps.width - depth.width()) / 2f; depth.y = steps.y + (steps.height - depth.height()) / 2f + 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java index 77ff722eb..6f3ba848e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java @@ -225,15 +225,17 @@ public class StartScene extends PixelScene { name.y = y + (height - name.baseLine())/2f; align(name); - classIcon.x = x + width - classIcon.width() - 8; + classIcon.x = x + width - 24 + (16 - classIcon.width())/2f; classIcon.y = y + (height - classIcon.height())/2f; + align(classIcon); level.x = classIcon.x + (classIcon.width() - level.width()) / 2f; level.y = classIcon.y + (classIcon.height() - level.height()) / 2f + 1; align(level); - steps.x = classIcon.x - steps.width(); + steps.x = x + width - 40 + (16 - steps.width())/2f; steps.y = y + (height - steps.height())/2f; + align(steps); depth.x = steps.x + (steps.width() - depth.width()) / 2f; depth.y = steps.y + (steps.height() - depth.height()) / 2f + 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java index bacfcab4a..91337f749 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java @@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.ui; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.TitleScene; import com.watabou.noosa.Game; import com.watabou.noosa.Image; @@ -36,8 +37,8 @@ public class ExitButton extends Button { public ExitButton() { super(); - width = image.width+4; - height = image.height+4; + width = 20; + height = 20; } @Override @@ -52,8 +53,9 @@ public class ExitButton extends Button { protected void layout() { super.layout(); - image.x = x+2; - image.y = y+2; + image.x = x + (width - image.width)/2f; + image.y = y + (height - image.height)/2f; + PixelScene.align(image); } @Override 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 25bf6b1b8..315f5f0b9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -26,44 +26,52 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass; import com.watabou.noosa.Image; public enum Icons { - + + //button icons + CHECKED, + UNCHECKED, + INFO, + CHALLENGE_OFF, + CHALLENGE_ON, + PREFS, + LANGS, + EXIT, + CLOSE, + ARROW, + + //ingame UI icons SKULL, BUSY, COMPASS, - INFO, - PREFS, - WARNING, - TARGET, - MASTERY, - WATA, - WARRIOR, - MAGE, - ROGUE, - HUNTRESS, - CLOSE, - DEPTH, SLEEP, ALERT, LOST, + TARGET, BACKPACK, SEED_POUCH, SCROLL_HOLDER, POTION_BANDOLIER, WAND_HOLSTER, - CHECKED, - UNCHECKED, - EXIT, - NOTES, - LANGS, - CHALLENGE_OFF, - CHALLENGE_ON, - RESUME, + + //hero & rankings icons + DEPTH, + WARRIOR, + MAGE, + ROGUE, + HUNTRESS, + + //main menu icons ENTER, GOLD, RANKINGS, BADGES, CHANGES, - SHPX; + SHPX, + + //misc icons + LIBGDX, + WATA, + WARNING; public Image get() { return get( this ); @@ -72,113 +80,117 @@ public enum Icons { public static Image get( Icons type ) { Image icon = new Image( Assets.ICONS ); switch (type) { - case SKULL: - icon.frame( icon.texture.uvRect( 0, 0, 8, 8 ) ); - break; - case BUSY: - icon.frame( icon.texture.uvRect( 8, 0, 16, 8 ) ); - break; - case COMPASS: - icon.frame( icon.texture.uvRect( 0, 8, 7, 13 ) ); - break; - case INFO: - icon.frame( icon.texture.uvRect( 16, 0, 30, 14 ) ); - break; - case PREFS: - icon.frame( icon.texture.uvRect( 30, 0, 46, 16 ) ); - break; - case WARNING: - icon.frame( icon.texture.uvRect( 46, 0, 58, 12 ) ); - break; - case TARGET: - icon.frame( icon.texture.uvRect( 0, 13, 16, 29 ) ); - break; - case MASTERY: - icon.frame( icon.texture.uvRect( 16, 14, 30, 28 ) ); - break; - case WATA: - icon.frame( icon.texture.uvRect( 30, 16, 45, 26 ) ); - break; - case WARRIOR: - icon.frame( icon.texture.uvRect( 0, 29, 16, 45 ) ); - break; - case MAGE: - icon.frame( icon.texture.uvRect( 16, 29, 32, 45 ) ); - break; - case ROGUE: - icon.frame( icon.texture.uvRect( 32, 29, 48, 45 ) ); - break; - case HUNTRESS: - icon.frame( icon.texture.uvRect( 48, 29, 64, 45 ) ); - break; - case CLOSE: - icon.frame( icon.texture.uvRect( 0, 45, 13, 58 ) ); - break; - case DEPTH: - icon.frame( icon.texture.uvRect( 38, 46, 54, 62 ) ); - break; - case SLEEP: - icon.frame( icon.texture.uvRect( 13, 45, 22, 53 ) ); - break; - case ALERT: - icon.frame( icon.texture.uvRect( 22, 45, 30, 53 ) ); - break; - case LOST: - icon.frame( icon.texture.uvRect( 30, 45, 38, 53 ) ); - break; - case BACKPACK: - icon.frame( icon.texture.uvRect( 58, 0, 68, 10 ) ); - break; - case SCROLL_HOLDER: - icon.frame( icon.texture.uvRect( 68, 0, 78, 10 ) ); - break; - case SEED_POUCH: - icon.frame( icon.texture.uvRect( 78, 0, 88, 10 ) ); - break; - case WAND_HOLSTER: - icon.frame( icon.texture.uvRect( 88, 0, 98, 10 ) ); - break; - case POTION_BANDOLIER: - icon.frame( icon.texture.uvRect( 98, 0, 108, 10 ) ); - break; case CHECKED: - icon.frame( icon.texture.uvRect( 54, 12, 66, 24 ) ); + icon.frame( icon.texture.uvRect( 0, 0, 12, 12 ) ); break; case UNCHECKED: - icon.frame( icon.texture.uvRect( 66, 12, 78, 24 ) ); + icon.frame( icon.texture.uvRect( 16, 0, 28, 12 ) ); break; - case EXIT: - icon.frame( icon.texture.uvRect( 108, 0, 124, 16 ) ); - break; - case LANGS: - icon.frame( icon.texture.uvRect( 109, 16, 121, 25 ) ); - break; - case CHALLENGE_OFF: - icon.frame( icon.texture.uvRect( 78, 12, 92, 24 ) ); + case INFO: + icon.frame( icon.texture.uvRect( 32, 0, 46, 14 ) ); break; case CHALLENGE_ON: - icon.frame( icon.texture.uvRect( 92, 12, 108, 24 ) ); + icon.frame( icon.texture.uvRect( 48, 0, 62, 12 ) ); break; - case RESUME: - icon.frame( icon.texture.uvRect( 13, 53, 24, 64 ) ); + case CHALLENGE_OFF: + icon.frame( icon.texture.uvRect( 64, 0, 78, 12 ) ); break; + case PREFS: + icon.frame( icon.texture.uvRect( 80, 0, 92, 12 ) ); + break; + case LANGS: + icon.frame( icon.texture.uvRect( 96, 0, 108, 9 ) ); + break; + case EXIT: + icon.frame( icon.texture.uvRect( 112, 0, 125, 9 ) ); + break; + case CLOSE: + icon.frame( icon.texture.uvRect( 0, 16, 11, 27 ) ); + break; + case ARROW: + icon.frame( icon.texture.uvRect( 16, 16, 27, 27 ) ); + break; + + case SKULL: + icon.frame( icon.texture.uvRect( 0, 32, 8, 40 ) ); + break; + case BUSY: + icon.frame( icon.texture.uvRect( 8, 32, 16, 40 ) ); + break; + case COMPASS: + icon.frame( icon.texture.uvRect( 0, 40, 7, 45 ) ); + break; + case SLEEP: + icon.frame( icon.texture.uvRect( 16, 32, 25, 40 ) ); + break; + case ALERT: + icon.frame( icon.texture.uvRect( 16, 40, 24, 48 ) ); + break; + case LOST: + icon.frame( icon.texture.uvRect( 24, 40, 32, 48 ) ); + break; + case TARGET: + icon.frame( icon.texture.uvRect( 32, 32, 48, 48 ) ); + break; + case BACKPACK: + icon.frame( icon.texture.uvRect( 48, 32, 58, 42 ) ); + break; + case SCROLL_HOLDER: + icon.frame( icon.texture.uvRect( 58, 32, 68, 42 ) ); + break; + case SEED_POUCH: + icon.frame( icon.texture.uvRect( 68, 32, 78, 42 ) ); + break; + case WAND_HOLSTER: + icon.frame( icon.texture.uvRect( 78, 32, 88, 42 ) ); + break; + case POTION_BANDOLIER: + icon.frame( icon.texture.uvRect( 88, 32, 98, 42 ) ); + break; + + case DEPTH: + icon.frame( icon.texture.uvRect( 0, 48, 13, 64 ) ); + break; + case WARRIOR: + icon.frame( icon.texture.uvRect( 16, 48, 25, 63 ) ); + break; + case MAGE: + icon.frame( icon.texture.uvRect( 32, 48, 47, 62 ) ); + break; + case ROGUE: + icon.frame( icon.texture.uvRect( 48, 48, 57, 63 ) ); + break; + case HUNTRESS: + icon.frame( icon.texture.uvRect( 64, 48, 80, 64 ) ); + break; + case ENTER: - icon.frame( icon.texture.uvRect( 66, 26, 83, 43 ) ); - break; - case GOLD: - icon.frame( icon.texture.uvRect( 83, 26, 100, 42 ) ); + icon.frame( icon.texture.uvRect( 0, 64, 17, 81 ) ); break; case RANKINGS: - icon.frame( icon.texture.uvRect( 100, 26, 117, 43 ) ); + icon.frame( icon.texture.uvRect( 17, 64, 34, 81 ) ); break; case BADGES: - icon.frame( icon.texture.uvRect( 66, 46, 83, 63 ) ); + icon.frame( icon.texture.uvRect( 34, 64, 51, 81 ) ); break; case CHANGES: - icon.frame( icon.texture.uvRect( 83, 47, 100, 62 ) ); + icon.frame( icon.texture.uvRect( 51, 64, 68, 79 ) ); break; case SHPX: - icon.frame( icon.texture.uvRect( 100, 46, 116, 62 ) ); + icon.frame( icon.texture.uvRect( 68, 64, 84, 80 ) ); + break; + case GOLD: + icon.frame( icon.texture.uvRect( 85, 64, 102, 80 ) ); + break; + + case LIBGDX: + icon.frame( icon.texture.uvRect( 0, 81, 16, 94 ) ); + break; + case WATA: + icon.frame( icon.texture.uvRect( 17, 81, 34, 93 ) ); + break; + case WARNING: + icon.frame( icon.texture.uvRect( 34, 81, 48, 95 ) ); break; } return icon; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java index 23f673594..a7e1b35bf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java @@ -122,10 +122,10 @@ public class QuickRecipe extends Component { } if (cost > 0) { - arrow = new arrow(Icons.get(Icons.RESUME), cost); + arrow = new arrow(Icons.get(Icons.ARROW), cost); arrow.hardlightText(0x00CCFF); } else { - arrow = new arrow(Icons.get(Icons.RESUME)); + arrow = new arrow(Icons.get(Icons.ARROW)); } if (hasInputs) { arrow.icon.tint(1, 1, 0, 1); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java index f70aed2f1..5a68a055e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java @@ -42,7 +42,7 @@ public class ResumeIndicator extends Tag { protected void createChildren() { super.createChildren(); - icon = Icons.get( Icons.RESUME ); + icon = Icons.get( Icons.ARROW); add( icon ); }