LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.2.3e: removed resume button from toolbar, added icon for resume button

Browse Source
This commit is contained in:
Evan Debenham 2015-01-21 22:57:47 -05:00
parent 34a7b82f94
commit e7e289e666
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
View File

@ -50,7 +50,8 @@ public enum Icons {
UNCHECKED, UNCHECKED,
EXIT, EXIT,
CHALLENGE_OFF, CHALLENGE_OFF,
CHALLENGE_ON; CHALLENGE_ON,
RESUME;
public Image get() { public Image get() {
return get( this ); return get( this );
@ -143,6 +144,9 @@ public enum Icons {
case CHALLENGE_ON: case CHALLENGE_ON:
icon.frame( icon.texture.uvRect( 102, 16, 126, 40 ) ); icon.frame( icon.texture.uvRect( 102, 16, 126, 40 ) );
break; break;
case RESUME:
icon.frame( icon.texture.uvRect( 13, 53, 24, 64 ) );
break;
} }
return icon; return icon;
} }

10
src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
View File

@ -96,13 +96,15 @@ public class Toolbar extends Component {
GameScene.selectCell( informer ); GameScene.selectCell( informer );
} }
} ); } );
/*
add( btnResume = new Tool( 61, 7, 21, 24 ) { add( btnResume = new Tool( 61, 7, 21, 24 ) {
@Override @Override
protected void onClick() { protected void onClick() {
Dungeon.hero.resume(); Dungeon.hero.resume();
} }
} ); } );
*/
add( btnInventory = new Tool( 82, 7, 23, 24 ) { add( btnInventory = new Tool( 82, 7, 23, 24 ) {
private GoldIndicator gold; private GoldIndicator gold;
@ -129,7 +131,7 @@ public class Toolbar extends Component {
add( btnQuick = new QuickslotTool( 105, 7, 22, 24, 0) ); add( btnQuick = new QuickslotTool( 105, 7, 22, 24, 0) );
add( btnQuick2 = new QuickslotTool( 105, 7, 22, 24, 1)) ; btnQuick2 = new QuickslotTool( 105, 7, 22, 24, 1);
add( pickedUp = new PickedUpItem() ); add( pickedUp = new PickedUpItem() );
} }
@ -139,13 +141,15 @@ public class Toolbar extends Component {
btnWait.setPos( x, y ); btnWait.setPos( x, y );
btnSearch.setPos( btnWait.right(), y ); btnSearch.setPos( btnWait.right(), y );
btnInfo.setPos( btnSearch.right(), y ); btnInfo.setPos( btnSearch.right(), y );
btnResume.setPos( btnInfo.right(), y ); //btnResume.setPos( btnInfo.right(), y );
btnQuick.setPos( width - btnQuick.width(), y ); btnQuick.setPos( width - btnQuick.width(), y );
btnQuick2.setPos( btnQuick.left() - btnQuick2.width(), y ); btnQuick2.setPos( btnQuick.left() - btnQuick2.width(), y );
if (QuickSlots == 2){ if (QuickSlots == 2){
add(btnQuick2);
btnQuick2.visible = btnQuick2.active = true; btnQuick2.visible = btnQuick2.active = true;
btnInventory.setPos( btnQuick2.left() - btnInventory.width(), y ); btnInventory.setPos( btnQuick2.left() - btnInventory.width(), y );
} else { } else {
remove(btnQuick2);
btnQuick2.visible = btnQuick2.active = false; btnQuick2.visible = btnQuick2.active = false;
btnInventory.setPos( btnQuick.left() - btnInventory.width(), y ); btnInventory.setPos( btnQuick.left() - btnInventory.width(), y );
} }