From 5ebe318872153d06eb3f70247bca9198e889c9cc Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Mon, 1 Feb 2016 03:29:29 -0500
Subject: [PATCH] v0.3.4: fixed some text errors

---
 .../actors/mobs/npcs/Shopkeeper.java                |  4 ++--
 .../items/artifacts/EtherealChains.java             | 13 ++++++-------
 .../messages/scenes/scenes.properties               |  3 ++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java
index c239970e4..295003684 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java
@@ -22,11 +22,11 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
-import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle;
 import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ShopkeeperSprite;
 import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
@@ -80,7 +80,7 @@ public class Shopkeeper extends NPC {
 	}
 	
 	public static WndBag sell() {
-		return GameScene.selectItem( itemSelector, WndBag.Mode.FOR_SALE, "Select an item to sell" );
+		return GameScene.selectItem( itemSelector, WndBag.Mode.FOR_SALE, Messages.get(Shopkeeper.class, "sell"));
 	}
 	
 	private static WndBag.Listener itemSelector = new WndBag.Listener() {
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java
index fa0fe5b7c..e6b16a882 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java
@@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor;
-import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Chains;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing;
@@ -111,10 +110,10 @@ public class EtherealChains extends Artifact {
 						final Char affected = Actor.findChar( chain.collisionPos );
 						int chargeUse = Level.distance(affected.pos, newMobPos);
 						if (chargeUse > charge) {
-							GLog.w( Messages.get(this, "no_charge") );
+							GLog.w( Messages.get(EtherealChains.class, "no_charge") );
 							return;
 						} else if (affected.properties().contains(Char.Property.IMMOVABLE)) {
-							GLog.w( Messages.get(this, "cant_pull") );
+							GLog.w( Messages.get(EtherealChains.class, "cant_pull") );
 							return;
 						} else {
 							charge -= chargeUse;
@@ -145,12 +144,12 @@ public class EtherealChains extends Artifact {
 						if (!Level.solid[i] && Actor.findChar(i) == null) newPos = i;
 						}
 					if (newPos == -1) {
-						GLog.w( Messages.get(this, "does_nothing") );
+						GLog.w( Messages.get(EtherealChains.class, "does_nothing") );
 					} else {
 						final int newHeroPos = newPos;
 						int chargeUse = Level.distance(curUser.pos, newHeroPos);
 						if (chargeUse > charge){
-							GLog.w( Messages.get(this, "no_charge") );
+							GLog.w( Messages.get(EtherealChains.class, "no_charge") );
 							return;
 						} else {
 							charge -= chargeUse;
@@ -172,7 +171,7 @@ public class EtherealChains extends Artifact {
 					}
 
 				} else {
-					GLog.i( Messages.get(this, "nothing_to_grab") );
+					GLog.i( Messages.get(EtherealChains.class, "nothing_to_grab") );
 				}
 
 			}
@@ -181,7 +180,7 @@ public class EtherealChains extends Artifact {
 
 		@Override
 		public String prompt() {
-			return Messages.get(this, "prompt");
+			return Messages.get(EtherealChains.class, "prompt");
 		}
 	};
 
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes.properties
index 8ee762a9f..155be5e97 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes.properties
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/scenes/scenes.properties
@@ -41,7 +41,8 @@ scenes.startscene.yes=Yes, start new game
 scenes.startscene.no=No, return to main menu
 scenes.startscene.unlock=To unlock the Huntress,\nslay the boss on floor 15.
 scenes.startscene.need_to_win=To unlock Challenges, win the game with any character class.
-scenes.surfacesscene.exit=Game Over
+
+scenes.surfacescene.exit=Game Over
 
 scenes.titlescene.play=Play
 scenes.titlescene.rankings=Rankings