From 759ff2fb9dd1dc2dfd7cbb2717708d839e4f19dd Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Thu, 9 Nov 2017 18:25:49 -0500
Subject: [PATCH] v0.6.2b: manifest commit

---
 core/src/main/AndroidManifest.xml             |  4 +--
 .../scenes/ChangesScene.java                  | 33 ++++++++++++++++++-
 .../scenes/GameScene.java                     |  2 +-
 .../scenes/WelcomeScene.java                  |  2 +-
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index 75c724b8f..fe2255c26 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.shatteredpixel.shatteredpixeldungeon"
-	android:versionCode="224"
-	android:versionName="0.6.2a"
+	android:versionCode="226"
+	android:versionName="0.6.2b"
 	android:installLocation="auto">
 
 	<uses-permission android:name="android.permission.VIBRATE"/>
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java
index 4ff377113..3403c6d66 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java
@@ -128,7 +128,38 @@ public class ChangesScene extends PixelScene {
 		//       v0.6.2
  		//**********************
 		
-		ChangeInfo changes = new ChangeInfo("v0.6.2a", true, "");
+		ChangeInfo changes = new ChangeInfo("v0.6.2b", true, "");
+		changes.hardlight(Window.TITLE_COLOR);
+		infos.add(changes);
+		
+		changes.addButton( new ChangeButton(new CloakOfShadows(),
+				"Increased the base charge speed of the Cloak of Shadows by 20%, charge speed at higher levels unchanged."));
+		
+		changes.addButton( new ChangeButton(Icons.get(Icons.PREFS), Messages.get(this, "misc"),
+				"_-_ Increased the brightness of the game's fog of war across all brightness settings.\n\n" +
+				"_-_ Added more detailed information to historical updates in the changes list.\n\n" +
+				"_-_ Wands that fire magical bolts now push on their detonation area, opening doors and trampling grass.\n\n" +
+				"_-_ Improved the visuals of alchemy pots."));
+		
+		changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(this, "bugfixes"),
+				"Fixed (caused by 0.6.2):\n" +
+				"_-_ Various crash fixes\n" +
+				"_-_ Distortion traps not clearing journal entries\n\n" +
+				"Fixed (Existed prior to 0.6.2):\n" +
+				"_-_ Various crash fixes\n" +
+				"_-_ Game failing to save in rare cases\n" +
+				"_-_ Mimics spawning over pits in rare cases\n" +
+				"_-_ Game music not correctly pausing on android 2.2 and 2.3\n" +
+				"_-_ Items being removed from quickslots when containers are bought\n"));
+		
+		changes.addButton( new ChangeButton(Icons.get(Icons.LANGS), Messages.get(this, "language"),
+				"_-_ Fixed various text errors with venom\n" +
+				"\n" +
+				"_-_ Various Translation Updates\n\n" +
+				"_-_ New Language: _Czech_"));
+		
+		
+		changes = new ChangeInfo("v0.6.2a", true, "");
 		changes.hardlight(Window.TITLE_COLOR);
 		infos.add(changes);
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
index 74cace3df..448712bd8 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
@@ -902,7 +902,7 @@ public class GameScene extends PixelScene {
 	}
 	
 	static boolean cancel() {
-		if (Dungeon.hero != null || Dungeon.hero.curAction != null || Dungeon.hero.resting) {
+		if (Dungeon.hero != null && (Dungeon.hero.curAction != null || Dungeon.hero.resting)) {
 			
 			Dungeon.hero.curAction = null;
 			Dungeon.hero.resting = false;
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 8f9df5f18..f89641e5d 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java
@@ -136,7 +136,7 @@ public class WelcomeScene extends PixelScene {
 				message = Messages.get(this, "patch_intro");
 				message += "\n\n" + Messages.get(this, "patch_bugfixes");
 				message += "\n" + Messages.get(this, "patch_translations");
-				//message += "\n" + Messages.get(this, "patch_balance");
+				message += "\n" + Messages.get(this, "patch_balance");
 
 			}
 		} else {