diff --git a/assets/icons.png b/assets/icons.png index c4057f0d9..b134ae1f0 100644 Binary files a/assets/icons.png and b/assets/icons.png differ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java index c8bd0fc9c..f5eaa29e1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java @@ -24,6 +24,7 @@ import javax.microedition.khronos.opengles.GL10; import android.opengl.GLES20; +import com.shatteredpixel.shatteredpixeldungeon.ui.ChangesButton; import com.watabou.noosa.BitmapText; import com.watabou.noosa.Camera; import com.watabou.noosa.Game; @@ -83,8 +84,8 @@ public class TitleScene extends PixelScene { title.x = (w - title.width()) / 2; title.y = (h - height) / 2; - placeTorch( title.x + 18, title.y + 20 ); - placeTorch( title.x + title.width - 18, title.y + 20 ); + placeTorch(title.x + 18, title.y + 20); + placeTorch(title.x + title.width - 18, title.y + 20); Image signs = new Image( BannerSprites.get( BannerSprites.Type.PIXEL_DUNGEON_SIGNS ) ) { private float time = 0; @@ -97,7 +98,7 @@ public class TitleScene extends PixelScene { public void draw() { GLES20.glBlendFunc( GL10.GL_SRC_ALPHA, GL10.GL_ONE ); super.draw(); - GLES20.glBlendFunc( GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA ); + GLES20.glBlendFunc(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA); } }; signs.x = title.x; @@ -110,7 +111,7 @@ public class TitleScene extends PixelScene { ShatteredPixelDungeon.switchNoFade( BadgesScene.class ); } }; - add( btnBadges ); + add(btnBadges); DashboardItem btnAbout = new DashboardItem( TXT_ABOUT, 1 ) { @Override @@ -149,20 +150,16 @@ public class TitleScene extends PixelScene { btnHighscores.setPos( w / 2, btnPlay.top() ); } - BitmapText source = new BitmapText( "PD v 1.7.5", font1x ); - source.measure(); - source.hardlight( 0x444444 ); - source.x = w - source.width(); - source.y = h - source.height(); - add( source ); - BitmapText version = new BitmapText( "v " + Game.version + "", font1x ); version.measure(); version.hardlight( 0xCCCCCC ); version.x = w - version.width(); - version.y = h - version.height() - source.height(); - + version.y = h - version.height(); add( version ); + + Button changes = new ChangesButton(); + changes.setPos( w-changes.width(), h - version.height() - changes.height()); + add( changes ); PrefsButton btnPrefs = new PrefsButton(); btnPrefs.setPos( 0, 0 ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/ChangesButton.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ChangesButton.java new file mode 100644 index 000000000..683a944a5 --- /dev/null +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ChangesButton.java @@ -0,0 +1,72 @@ +/* + * Pixel Dungeon + * Copyright (C) 2012-2015 Oleg Dolya + * + * Shattered Pixel Dungeon + * Copyright (C) 2014-2015 Evan Debenham + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see + */ +package com.shatteredpixel.shatteredpixeldungeon.ui; + +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; +import com.shatteredpixel.shatteredpixeldungeon.scenes.WelcomeScene; +import com.watabou.noosa.Image; +import com.watabou.noosa.audio.Sample; +import com.watabou.noosa.ui.Button; + +public class ChangesButton extends Button { + + protected Image image; + + public ChangesButton() { + super(); + + width = image.width; + height = image.height; + } + + @Override + protected void createChildren() { + super.createChildren(); + + image = Icons.NOTES.get(); + add( image ); + } + + @Override + protected void layout() { + super.layout(); + + image.x = x; + image.y = y; + } + + @Override + protected void onTouchDown() { + image.brightness( 1.5f ); + Sample.INSTANCE.play( Assets.SND_CLICK ); + } + + @Override + protected void onTouchUp() { + image.resetColor(); + } + + @Override + protected void onClick() { + ShatteredPixelDungeon.switchNoFade(WelcomeScene.class); + } +} diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java index 5e6c41fb2..a58deb0d9 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -53,6 +53,7 @@ public enum Icons { CHECKED, UNCHECKED, EXIT, + NOTES, CHALLENGE_OFF, CHALLENGE_ON, RESUME; @@ -145,6 +146,9 @@ public enum Icons { case EXIT: icon.frame( icon.texture.uvRect( 108, 0, 124, 16 ) ); break; + case NOTES: + icon.frame( icon.texture.uvRect( 79, 40, 94, 56 ) ); + break; case CHALLENGE_OFF: icon.frame( icon.texture.uvRect( 78, 16, 102, 40 ) ); break;