diff --git a/build.gradle b/build.gradle index 6ad990482..df7c02b65 100644 --- a/build.gradle +++ b/build.gradle @@ -14,8 +14,8 @@ allprojects { appName = 'Shattered Pixel Dungeon' appPackageName = 'com.shatteredpixel.shatteredpixeldungeon' - appVersionCode = 656 - appVersionName = '1.4.0-BETA-2' + appVersionCode = 657 + appVersionName = '1.4.0-BETA-3' appJavaCompatibility = JavaVersion.VERSION_1_8 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java index 1136e36a6..eb821df87 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java @@ -87,17 +87,6 @@ public class WelcomeScene extends PixelScene { if (ShatteredPixelDungeon.versionCode == previousVersion && !SPDSettings.intro()) { ShatteredPixelDungeon.switchNoFade(TitleScene.class); return; - } else { - //TODO temporary so alpha/beta players can test the tutorial - if (previousVersion <= 653 && GamesInProgress.firstEmpty() != -1){ - SPDSettings.intro(true); - } else if (GamesInProgress.firstEmpty() == -1){ - SPDSettings.intro(false); - } - if (SPDSettings.intro()){ - Journal.loadGlobal(); - Document.ADVENTURERS_GUIDE.deletePage(Document.GUIDE_INTRO); - } } Music.INSTANCE.playTracks( @@ -222,8 +211,8 @@ public class WelcomeScene extends PixelScene { } message = "Greetings Beta Testers!\n\n" + - "This beta includes all of the content for v1.4.0, minus a few UI tweaks that I'm hopeing to make over the next week. There's a lot of new text in particular this time, so please help out the translation project if you're able to!\n\n" + - "You'll probably get a chance to try the new tutorial as well. Please let me know if you encounter any issues!"; + "The beta for v1.4.0 is now wrapping up! Everything seems to be working well, and I've just added the last few UI tweaks I wanted to for this update.\n\n" + + "Expect v1.4.0 to release very early next week."; text.text(message, Math.min(w-20, 300)); float textSpace = okay.top() - topRegion - 4; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v1_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v1_X_Changes.java index 89c9d0dc7..c73edb2f7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v1_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v1_X_Changes.java @@ -92,10 +92,25 @@ public class v1_X_Changes { changes.hardlight(Window.TITLE_COLOR); changeInfos.add(changes); - changes = new ChangeInfo("", false, null); + changes = new ChangeInfo("BETA-3", false, null); changes.hardlight(Window.TITLE_COLOR); changeInfos.add(changes); + changes.addButton(new ChangeButton(Icons.get(Icons.DISPLAY_LAND), "Landscape Hero Select", + "Desktop and mobile landscape users will now see a new hero select screen that better makes use of screen real-estate.\n\n" + + "I might make a few further adjustments to this before release.")); + + changes.addButton(new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + "Fixed (caused by BETA)\n" + + "_-_ Various minor typos\n" + + "_-_ Further issues with acidic scorpio sprites\n" + + "_-_ Occasional unusual behaviour when items were on stairs\n" + + "_-_ Rare cases where items would be unidentified in rankings\n" + + "_-_ Sniper's flurry failing to auto aim in some cases\n\n" + + "Fixed (Existed prior to BETA)\n" + + "_-_ Cursed rings of force still heavily buffing melee attacks\n" + + "_-_ Exploits where the gladiator could build combo on ally characters")); + changes = new ChangeInfo("BETA-2", false, null); changes.hardlight(Window.TITLE_COLOR); changeInfos.add(changes); @@ -114,19 +129,19 @@ public class v1_X_Changes { "_-_ Various errors with new tutorial functionality\n" + "_-_ Transmutation creating duplicate artifacts\n" + "_-_ Incorrect interactions between active traps and hourglass stasis\n" + - "_-_ Sniper's flurry ability not targeting correctly in some cases\n" + + "_-_ Sniper's flurry ability not targeting correctly in some cases\n\n" + "Fixed (Existed prior to BETA)\n" + - "_-_ Rare consistency errors in potion of might description")); + "_-_ Rare consistency errors in potion of might buff description")); changes = new ChangeInfo(Messages.get(ChangesScene.class, "new"), false, null); changes.hardlight(Window.TITLE_COLOR); changeInfos.add(changes); - changes.addButton( new ChangeButton(Icons.get(Icons.SHPX), "To-Do", + /*changes.addButton( new ChangeButton(Icons.get(Icons.SHPX), "To-Do", "The following still needs to be implemented for v1.4 to release:\n\n" + "_-_ Improvements to various game interfaces for desktop users\n" + "_-_ any critical balance tweaks following the beta changes\n" + - "_-_ other small tweaks and bugfixes following the beta changes")); + "_-_ other small tweaks and bugfixes following the beta changes"));*/ changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.GUIDE_PAGE), "Lore Additions", "_30 pages of lore text have been added to the game, scattered around the regions of the dungeon!_\n\n" +