From 34a7b82f94ac8368c2953d17291d917f412e42ff Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 21 Jan 2015 22:54:58 -0500 Subject: [PATCH] v0.2.3e: converted resume button to a tag --- assets/icons.png | Bin 3997 -> 4091 bytes .../ui/ResumeIndicator.java | 51 ++++++++++++++++++ .../shatteredpixeldungeon/ui/StatusPane.java | 8 +++ 3 files changed, 59 insertions(+) create mode 100644 src/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java diff --git a/assets/icons.png b/assets/icons.png index 7865e0d716a072071957cd0368cdfe6ec671d01d..3ec50e766ef9c4783fb2e7018e829f0fbcb840ac 100644 GIT binary patch delta 4046 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 ANdN!< delta 3951 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 JPDHLkV1fzti+}(C diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java new file mode 100644 index 000000000..77831e413 --- /dev/null +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java @@ -0,0 +1,51 @@ +package com.shatteredpixel.shatteredpixeldungeon.ui; + +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; +import com.watabou.noosa.Image; + +/** + * Created by Evan on 21/01/2015. + */ +public class ResumeIndicator extends Tag { + + private Image icon; + + public ResumeIndicator() { + super(0xCDD5C0); + + setSize( 24, 22 ); + + visible = false; + + } + + @Override + protected void createChildren() { + super.createChildren(); + icon = Icons.get(Icons.RESUME); + add(icon); + } + + @Override + protected void layout() { + super.layout(); + icon.x = x + (width - icon.width()) / 2; + icon.y = y + (height - icon.height()) / 2; + } + + @Override + protected void onClick() { + Dungeon.hero.resume(); + } + + @Override + public void update() { + if (visible != (Dungeon.hero.lastAction != null)){ + visible = Dungeon.hero.lastAction != null; + if (visible) + flash(); + } + super.update(); + } +} diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java index 241d0d71e..7f8da7852 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java @@ -57,6 +57,7 @@ public class StatusPane extends Component { private BitmapText keys; private DangerIndicator danger; + private ResumeIndicator resume; private LootIndicator loot; private BuffIndicator buffs; private Compass compass; @@ -119,6 +120,9 @@ public class StatusPane extends Component { danger = new DangerIndicator(); add( danger ); + resume = new ResumeIndicator(); + add ( resume ); + loot = new LootIndicator(); add( loot ); @@ -151,6 +155,8 @@ public class StatusPane extends Component { loot.setPos( width - loot.width(), danger.bottom() + 2 ); + resume.setPos( width - resume.width(), (loot.visible ? loot.bottom() : danger.bottom()) + 2 ); + buffs.setPos( 32, 11 ); btnMenu.setPos( width - btnMenu.width(), 1 ); @@ -205,6 +211,8 @@ public class StatusPane extends Component { lastTier = tier; avatar.copy( HeroSprite.avatar( Dungeon.hero.heroClass, tier ) ); } + + resume.setPos( width - resume.width(), (loot.visible ? loot.bottom() : danger.bottom()) + 2 ); } private static class MenuButton extends Button {