v1.4.0: further initial tutorial improvements

build.gradle

@@ -14,8 +14,8 @@ allprojects {
         appName = 'Shattered Pixel Dungeon'
         appPackageName = 'com.shatteredpixel.shatteredpixeldungeon'
 
-        appVersionCode = 651
+        appVersionCode = 652
-        appVersionName = '1.4.0-ALPHA-1'
+        appVersionName = '1.4.0-ALPHA-2'
 
         appJavaCompatibility = JavaVersion.VERSION_1_8
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/journal/Guidebook.java

@@ -42,12 +42,12 @@ public class Guidebook extends Item {
 	public final boolean doPickUp(Hero hero, int pos) {
 		GameScene.pickUpJournal(this, pos);
 		//we do this here so it appears before the tutorial text
+		GameLog.wipe();
 		GLog.i( Messages.capitalize(Messages.get(Hero.class, "you_now_have", name())) );
 		GLog.p(Messages.get(GameScene.class, "tutorial_guidebook"));
 		GameScene.flashForDocument(Document.ADVENTURERS_GUIDE, Document.GUIDE_INTRO);
 		Sample.INSTANCE.play( Assets.Sounds.ITEM );
 		hero.spendAndNext( TIME_TO_PICK_UP );
-		GameLog.wipe();
 		return true;
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Document.java

@@ -249,7 +249,7 @@ public enum Document {
 		ALCHEMY_GUIDE.pagesStates.put("Brews_Elixirs",          debug ? READ : NOT_FOUND);
 		ALCHEMY_GUIDE.pagesStates.put("Spells",                 debug ? READ : NOT_FOUND);
 
-		INTROS.pagesStates.put("Dungeon",                       debug ? READ : NOT_FOUND);
+		INTROS.pagesStates.put("Dungeon",                       READ);
 		INTROS.pagesStates.put("Sewers",                        debug ? READ : NOT_FOUND);
 		INTROS.pagesStates.put("Prison",                        debug ? READ : NOT_FOUND);
 		INTROS.pagesStates.put("Caves",                         debug ? READ : NOT_FOUND);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java

@@ -147,10 +147,20 @@ public class WelcomeScene extends PixelScene {
 			protected void onClick() {
 				super.onClick();
 				if (previousVersion == 0 || SPDSettings.intro()){
+
+					//TODO for testers
+					if (previousVersion > 0){
+						updateVersion(previousVersion);
+					}
+
 					SPDSettings.version(ShatteredPixelDungeon.versionCode);
 					GamesInProgress.selectedClass = null;
-					GamesInProgress.curSlot = 1;
+					GamesInProgress.curSlot = GamesInProgress.firstEmpty();
+					if (GamesInProgress.curSlot == -1){
+						ShatteredPixelDungeon.switchScene(StartScene.class);
+					} else {
 						ShatteredPixelDungeon.switchScene(HeroSelectScene.class);
+					}
 				} else {
 					updateVersion(previousVersion);
 					ShatteredPixelDungeon.switchScene(TitleScene.class);
@@ -202,7 +212,6 @@ public class WelcomeScene extends PixelScene {
 		} else {
 			message = Messages.get(this, "what_msg");
 		}
-		Document.INTROS.readPage(0);
 
 		message = "Greetings Alpha Testers!\n\nAll of the gameplay changes for v1.4.0 are in place, but there's still a bit of UI/UX work and lore to finish up.\n\nKeep in mind that this is an early release, so bugs are to be expected. Please let me know if you encounter any!";
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v1_X_Changes.java

@@ -91,6 +91,31 @@ public class v1_X_Changes {
 		changes.hardlight(Window.TITLE_COLOR);
 		changeInfos.add(changes);
 
+		changes = new ChangeInfo("", false, null);
+		changes.hardlight(Window.TITLE_COLOR);
+		changeInfos.add(changes);
+
+		changes = new ChangeInfo("ALPHA-2", false, null);
+		changes.hardlight(Window.TITLE_COLOR);
+		changeInfos.add(changes);
+
+		changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.MASTERY), "Expanded Tutorial",
+				"The game now starts with a very short guided tutorial that explains game movement, highlights the interface, and encourages reading the game log / guidebook.\n\n" +
+				"Alpha/Beta players will get the tutorial on their first play session, in order to test it and give feedback."));
+
+		changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.GUIDE_PAGE), "Lore Additions",
+				"Most of the code for per-region lore has been implemented, but the lore pages themselves have not been put in the game yet, so these new lore documents are not yet findable."));
+
+		changes.addButton(new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"),
+				"Fixed (caused by ALPHA):\n" +
+				"_-_ Crash bugs in boss floors\n" +
+				"_-_ Ring of Arcana missing from the item catalog\n" +
+				"_-_ Distortion traps only summoning piranhas\n" +
+				"_-_ Dungeon introduction text not being set as found\n" +
+				"_-_ Various minor textual errors\n\n" +
+				"Fixed (existed prior to ALPHA):\n" +
+				"_-_ Giant necromancers summoning skeletons into doorways"));
+
 		changes = new ChangeInfo(Messages.get(ChangesScene.class, "new"), false, null);
 		changes.hardlight(Window.TITLE_COLOR);
 		changeInfos.add(changes);