From 66db278940b8660e0e5e6989cc61c69b60dc2872 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 20 Jan 2015 09:40:01 -0500 Subject: [PATCH] v0.2.3e: added support for 2x quickslot in rankings page --- .../windows/WndRanking.java | 60 ++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java index 38ab8fa1f..4e764f678 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java @@ -247,7 +247,21 @@ public class WndRanking extends WndTabbed { addItem( stuff.misc2); } - //TODO: add proper visual support for mutli-quickslots + pos = 0; + for (int i = 0; i < 2; i++){ + if (Dungeon.quickslot.getItem(i) != null){ + QuickSlotButton slot = new QuickSlotButton(Dungeon.quickslot.getItem(i)); + + slot.setPos( pos, 116 ); + + } else { + ColorBlock bg = new ColorBlock( 28, 28, 0xFF4A4D44); + bg.x = pos; + bg.y = 116; + add(bg); + } + pos += 29; + } if (Dungeon.quickslot.getItem(0) != null){ addItem( Dungeon.quickslot.getItem(0) ); } @@ -356,4 +370,48 @@ public class WndRanking extends WndTabbed { Game.scene().add( new WndItem( null, item ) ); } } + + private class QuickSlotButton extends ItemSlot{ + + public static final int HEIGHT = 28; + + private Item item; + private ColorBlock bg; + + QuickSlotButton(Item item){ + super(item); + this.item = item; + } + + @Override + protected void createChildren() { + bg = new ColorBlock( HEIGHT, HEIGHT, 0xFF4A4D44 ); + add( bg ); + + super.createChildren(); + } + + @Override + protected void layout() { + bg.x = x; + bg.y = y; + + super.layout(); + } + + @Override + protected void onTouchDown() { + bg.brightness( 1.5f ); + Sample.INSTANCE.play( Assets.SND_CLICK, 0.7f, 0.7f, 1.2f ); + }; + + protected void onTouchUp() { + bg.brightness( 1.0f ); + }; + + @Override + protected void onClick() { + Game.scene().add(new WndItem(null, item)); + } + } }