From bdf011240e1a18ba6dd612049d67ed7ad46b9c2a Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 21 Feb 2016 21:03:11 -0500 Subject: [PATCH] v0.3.4b: improvements to welcome and changes scene --- .../messages/scenes/scenes.properties | 8 ++++++-- .../scenes/ChangesScene.java | 5 +---- .../scenes/WelcomeScene.java | 17 ++++++++++++----- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes.properties index d6fba1051..4a8e24928 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes.properties @@ -53,8 +53,12 @@ scenes.titlescene.badges=Badges scenes.titlescene.about=About scenes.welcomescene.welcome_msg=Shattered Pixel Dungeon is a roguelike RPG, with randomly generated enemies, levels, items, and traps!\n\nEach run is a new challenging experience, but be careful, death is permanent!\n\nHappy Dungeoneering! -scenes.welcomescene.update_msg=Shattered Pixel Dungeon has been updated!\n\nThis update features support for multiple languages! Translations have been made possible by the community!\n\nThere are also some balance changes, mainly aimed at easing up on the difficulty of the sewers a little bit. -scenes.welcomescene.patch_msg=Shattered Pixel Dungeon has been patched!\n\nThis patch is primarily bugfixes.\n\nI am also currently developing an option for players to have the classic font back if they prefer. +scenes.welcomescene.update_intro=Shattered Pixel Dungeon has been updated! +scenes.welcomescene.update_msg=This update features support for multiple languages! Translations have been made possible by the community!\n\nThere are also some balance changes, mainly aimed at easing up on the difficulty of the sewers a little bit. +scenes.welcomescene.patch_intro=Shattered Pixel Dungeon has been patched! +scenes.welcomescene.patch_bugfixes=This patch contains bugfixes. +scenes.welcomescene.patch_translations=This patch contains translation updates. +scenes.welcomescene.patch_msg=Pixellated font returns! The new font is now optional for most languages. You can choose your font in the settings menu. scenes.welcomescene.what_msg=It seems that your current saves are from a future version of Shattered Pixel Dungeon!\n\nTread with caution! Your saves may contain things which don't exist in this version, this could cause some very weird errors to occur. scenes.welcomescene.continue=Continue scenes.welcomescene.changelist=Changelist diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java index 97f31377e..737ac0048 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java @@ -41,18 +41,15 @@ public class ChangesScene extends PixelScene { "- New font is now optional\n" + "- Fixed crash issues with Italian language\n" + "- Translation Updates\n" + + "- Bugfixes\n" + "\n" + "_v0.3.4a:_\n" + - "- Various bugfixes\n" + - "- Fixed text issues on Turkish devices\n" + "- Huntress can equip her boomerang again\n" + - "- Translation Updates\n" + "- Added Italian (currently incomplete)\n" + "\n" + "_v0.3.4:_\n" + "- Shattered now supports multiple languages\n" + "- New font\n" + - "- Bugfixes\n" + "\n" + "Balance Changes:\n" + "- Hunger now builds ~10% slower\n" + diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java index d374b9e9b..e4f7b8e4c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java @@ -27,7 +27,7 @@ public class WelcomeScene extends PixelScene { final int previousVersion = ShatteredPixelDungeon.version(); - if (ShatteredPixelDungeon.versionCode == previousVersion) { + if (ShatteredPixelDungeon.versionCode != previousVersion) { ShatteredPixelDungeon.switchNoFade(TitleScene.class); return; } @@ -100,17 +100,24 @@ public class WelcomeScene extends PixelScene { } RenderedTextMultiline text = PixelScene.renderMultiline(6); + String message; if (previousVersion == 0) { - text.text(Messages.get(this, "welcome_msg"), w - 20); + message = Messages.get(this, "welcome_msg"); } else if (previousVersion <= ShatteredPixelDungeon.versionCode) { if (previousVersion < LATEST_UPDATE){ - text.text(Messages.get(this, "update_msg"), w - 20); + message = Messages.get(this, "update_intro"); + message += "\n\n" + Messages.get(this, "update_msg"); } else { - text.text(Messages.get(this, "patch_msg"), w - 20); + //TODO: change the messages here in accordance with the type of patch. + message = Messages.get(this, "patch_intro"); + message += "\n\n" + Messages.get(this, "patch_msg"); + message += "\n\n" + Messages.get(this, "patch_bugfixes"); + message += "\n" + Messages.get(this, "patch_translations"); } } else { - text.text(Messages.get(this, "what_msg"), w - 20); + message = Messages.get(this, "what_msg"); } + text.text(message, w-20); float textSpace = h - title.y - (title.height() - 10) - okay.height() - 2; text.setPos(10, title.y+(title.height() - 10) + ((textSpace - text.height()) / 2)); add(text);