From 7d3622b3a9ad52761bcf4e6465a2ee7422bee268 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Wed, 25 Apr 2018 15:05:35 -0400
Subject: [PATCH] v0.6.5: bugfixes and misc changes:

- fixed timekeeper's hourglass not usable at 1 charge
- expanded bag space to 20 each from 12
- fixed sungrass not interrupting rest when full hp is reached
- adjusted manifest values to reduce rare crashes
---
 core/src/main/AndroidManifest.xml                         | 4 ++--
 .../items/artifacts/TimekeepersHourglass.java             | 2 +-
 .../shatteredpixeldungeon/items/bags/MagicalHolster.java  | 2 +-
 .../shatteredpixeldungeon/items/bags/PotionBandolier.java | 2 +-
 .../shatteredpixeldungeon/items/bags/ScrollHolder.java    | 2 +-
 .../shatteredpixeldungeon/items/bags/VelvetPouch.java     | 2 +-
 .../shatteredpixeldungeon/plants/Sungrass.java            | 8 +++++++-
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index 54b6707ef..f16f2d22a 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -26,10 +26,10 @@
 		android:theme="@android:style/Theme.Black.NoTitleBar"
 		android:allowBackup="true"
 		android:fullBackupOnly="true"
-		android:backupAgent=".BackupHandler">
+		android:backupAgent="com.shatteredpixel.shatteredpixeldungeon.BackupHandler">
 		<activity
 			android:label="@string/app_name"
-			android:name=".ShatteredPixelDungeon"
+			android:name="com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon"
 			android:alwaysRetainTaskState="true"
 			android:launchMode="singleInstance"
 			android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java
index 003879526..c159231a2 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java
@@ -82,7 +82,7 @@ public class TimekeepersHourglass extends Artifact {
 					activeBuff.detach();
 					GLog.i( Messages.get(this, "deactivate") );
 				}
-			} else if (charge <= 1)         GLog.i( Messages.get(this, "no_charge") );
+			} else if (charge <= 0)         GLog.i( Messages.get(this, "no_charge") );
 			else if (cursed)                GLog.i( Messages.get(this, "cursed") );
 			else GameScene.show(
 						new WndOptions( Messages.get(this, "name"),
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/MagicalHolster.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/MagicalHolster.java
index 2b5baffb3..2976226ec 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/MagicalHolster.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/MagicalHolster.java
@@ -31,7 +31,7 @@ public class MagicalHolster extends Bag {
 	{
 		image = ItemSpriteSheet.HOLSTER;
 		
-		size = 12;
+		size = 20;
 	}
 
 	public static final float HOLSTER_SCALE_FACTOR = 0.85f;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java
index 49871cd02..329d08406 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java
@@ -30,7 +30,7 @@ public class PotionBandolier extends Bag {
 	{
 		image = ItemSpriteSheet.BANDOLIER;
 
-		size = 12;
+		size = 20;
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java
index f4cda6a77..a45e7bb96 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java
@@ -30,7 +30,7 @@ public class ScrollHolder extends Bag {
 	{
 		image = ItemSpriteSheet.HOLDER;
 		
-		size = 12;
+		size = 20;
 	}
 	
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/VelvetPouch.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/VelvetPouch.java
index cd7d00fd1..115675f9e 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/VelvetPouch.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/VelvetPouch.java
@@ -31,7 +31,7 @@ public class VelvetPouch extends Bag {
 	{
 		image = ItemSpriteSheet.POUCH;
 		
-		size = 12;
+		size = 20;
 	}
 	
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java
index f3fd78ad4..9c9a9ad32 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java
@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FlavourBuff;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShaftParticle;
@@ -93,7 +94,12 @@ public class Sungrass extends Plant {
 				partialHeal -= (int)partialHeal;
 				target.sprite.emitter().burst(Speck.factory(Speck.HEALING), 1);
 				
-				if (target.HP > target.HT) target.HP = target.HT;
+				if (target.HP >= target.HT) {
+					target.HP = target.HT;
+					if (target instanceof Hero){
+						((Hero)target).resting = false;
+					}
+				}
 			}
 			
 			if (level <= 0) {