From 2c0cd939f096cc93bd7bdf0367229c26f653f519 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sun, 27 Dec 2015 22:08:03 -0500
Subject: [PATCH] v0.3.4: externalized strings belonging to blobs

---
 .../actors/blobs/ConfusionGas.java               |  3 ++-
 .../shatteredpixeldungeon/actors/blobs/Fire.java |  3 ++-
 .../actors/blobs/Foliage.java                    |  3 ++-
 .../actors/blobs/GooWarn.java                    |  3 ++-
 .../actors/blobs/ParalyticGas.java               |  3 ++-
 .../actors/blobs/StenchGas.java                  |  3 ++-
 .../actors/blobs/ToxicGas.java                   |  5 +++--
 .../actors/blobs/VenomGas.java                   |  3 ++-
 .../actors/blobs/WaterOfAwareness.java           |  5 ++---
 .../actors/blobs/WaterOfHealth.java              |  5 ++---
 .../actors/blobs/WaterOfTransmutation.java       |  5 ++---
 .../shatteredpixeldungeon/actors/blobs/Web.java  |  3 ++-
 .../messages/messages.properties                 | 16 ++++++++++++++++
 13 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java
index 84694bf9c..884d61d89 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java
@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Vertigo;
 import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 
 public class ConfusionGas extends Blob {
 
@@ -51,6 +52,6 @@ public class ConfusionGas extends Blob {
 
 	@Override
 	public String tileDesc() {
-		return "A cloud of confusion gas is swirling here.";
+		return Messages.get(this, "desc");
 	}
 }
\ No newline at end of file
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java
index f847a1949..a8e6eee90 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java
@@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle;
 import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 
@@ -118,6 +119,6 @@ public class Fire extends Blob {
 	
 	@Override
 	public String tileDesc() {
-		return "A fire is raging here.";
+		return Messages.get(this, "desc");
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Foliage.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Foliage.java
index 9ae3a7ef0..4300f25de 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Foliage.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Foliage.java
@@ -29,6 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShaftParticle;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 
 public class Foliage extends Blob {
@@ -84,6 +85,6 @@ public class Foliage extends Blob {
 	
 	@Override
 	public String tileDesc() {
-		return "Shafts of light pierce the gloom of the underground garden.";
+		return Messages.get(this, "desc");
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/GooWarn.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/GooWarn.java
index 3954ae17a..75738d9f2 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/GooWarn.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/GooWarn.java
@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.blobs;
 
 
 import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.GooSprite;
 
 public class GooWarn extends Blob {
@@ -67,7 +68,7 @@ public class GooWarn extends Blob {
 
 	@Override
 	public String tileDesc() {
-		return "Specs of dark energy are swarming here!";
+		return Messages.get(this, "desc");
 	}
 }
 
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ParalyticGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ParalyticGas.java
index ae043c084..45c6e7f7f 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ParalyticGas.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ParalyticGas.java
@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis;
 import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 
 public class ParalyticGas extends Blob {
 	
@@ -51,6 +52,6 @@ public class ParalyticGas extends Blob {
 	
 	@Override
 	public String tileDesc() {
-		return "A cloud of paralytic gas is swirling here.";
+		return Messages.get(this, "desc");
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/StenchGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/StenchGas.java
index f3854377f..e50bad6f1 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/StenchGas.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/StenchGas.java
@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis;
 import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 
 public class StenchGas extends Blob {
 
@@ -51,6 +52,6 @@ public class StenchGas extends Blob {
 
 	@Override
 	public String tileDesc() {
-		return "A cloud of fetid stench is swirling here.";
+		return Messages.get(this, "desc");
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java
index 0afb0e849..cdc285d0e 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ToxicGas.java
@@ -28,6 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
 import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
 import com.watabou.utils.Random;
@@ -63,7 +64,7 @@ public class ToxicGas extends Blob implements Hero.Doom {
 	
 	@Override
 	public String tileDesc() {
-		return "A greenish cloud of toxic gas is swirling here.";
+		return Messages.get(this, "desc");
 	}
 	
 	@Override
@@ -72,6 +73,6 @@ public class ToxicGas extends Blob implements Hero.Doom {
 		Badges.validateDeathFromGas();
 		
 		Dungeon.fail( ResultDescriptions.GAS );
-		GLog.n( "You died from a toxic gas.." );
+		GLog.n( Messages.get(this, "ondeath") );
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/VenomGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/VenomGas.java
index b2cf1daeb..99e128994 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/VenomGas.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/VenomGas.java
@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Venom;
 import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.watabou.utils.Bundle;
 
 public class VenomGas extends Blob {
@@ -77,6 +78,6 @@ public class VenomGas extends Blob {
 
 	@Override
 	public String tileDesc() {
-		return "A cloud of foul acidic venom is swirling here.";
+		return Messages.get(this, "desc");
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java
index 94130dd6c..b73174b2b 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java
@@ -20,6 +20,7 @@
  */
 package com.shatteredpixel.shatteredpixeldungeon.actors.blobs;
 
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.watabou.noosa.audio.Sample;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Badges;
@@ -103,8 +104,6 @@ public class WaterOfAwareness extends WellWater {
 	
 	@Override
 	public String tileDesc() {
-		return
-			"Power of knowledge radiates from the water of this well. " +
-			"Take a sip from it to reveal all secrets of equipped items.";
+		return Messages.get(this, "desc");
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java
index 3859bd33f..c748afa6e 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java
@@ -20,6 +20,7 @@
  */
 package com.shatteredpixel.shatteredpixeldungeon.actors.blobs;
 
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.watabou.noosa.audio.Sample;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@@ -80,8 +81,6 @@ public class WaterOfHealth extends WellWater {
 	
 	@Override
 	public String tileDesc() {
-		return
-			"Power of health radiates from the water of this well. " +
-			"Take a sip from it to heal your wounds and satisfy hunger.";
+		return Messages.get(this, "desc");
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java
index 4e81ec7fe..e26c384e1 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java
@@ -37,6 +37,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicalInfusion;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.*;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
 
 public class WaterOfTransmutation extends WellWater {
@@ -234,8 +235,6 @@ public class WaterOfTransmutation extends WellWater {
 	
 	@Override
 	public String tileDesc() {
-		return
-			"Power of change radiates from the water of this well. " +
-			"Throw an item into the well to turn it into something else.";
+		return Messages.get(this, "desc");
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Web.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Web.java
index 6fffd87e3..805034a4f 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Web.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Web.java
@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots;
 import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.WebParticle;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 
 public class Web extends Blob {
 	
@@ -66,6 +67,6 @@ public class Web extends Blob {
 	
 	@Override
 	public String tileDesc() {
-		return "Everything is covered with a thick web here.";
+		return Messages.get(this, "desc");
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties
index 6d115530d..ffdf5353e 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties
@@ -1,3 +1,19 @@
+actors.blobs.confusiongas.desc=A cloud of confusion gas is swirling here.
+actors.blobs.fire.desc=A fire is raging here.
+actors.blobs.foliage.desc=Shafts of light pierce the gloom of the underground garden.
+actors.blobs.goowarn.desc=Specs of dark energy are swarming here!
+actors.blobs.paralyticgas.desc=A cloud of paralytic gas is swirling here.
+actors.blobs.stenchgas.desc=A cloud of fetid stench is swirling here.
+actors.blobs.toxicgas.desc=A greenish cloud of toxic gas is swirling here.
+actors.blobs.toxicgas.ondeath=You died from a toxic gas...
+actors.blobs.venomgas.desc=A cloud of foul acidic venom is swirling here.
+actors.blobs.waterofawareness.desc=Power of knowledge radiates from the water of this well. Take a sip from it to reveal all secrets of equipped items.
+actors.blobs.waterofhealth.desc=Power of health radiates from the water of this well. Take a sip from it to heal your wounds and satisfy hunger.
+actors.blobs.wateroftransmutation.desc=Power of change radiates from the water of this well. Throw an item into the well to turn it into something else.
+actors.blobs.web.desc=Everything is covered with a thick web here.
+
+
+
 actors.hero.hero.leave=One does not simply leave Pixel Dungeon.
 actors.hero.hero.level_up=level up!
 actors.hero.hero.new_level=Welcome to level %d! Now you are healthier and more focused. It's easier for you to hit enemies and dodge their attacks.