From 8aae9906ae29d0e96fd706a8028b70344d832e45 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 21 Jan 2018 20:50:22 -0500 Subject: [PATCH] v0.6.3: fixed various text errors relating to venom --- .../shatteredpixeldungeon/actors/buffs/Venom.java | 9 +++++++-- .../messages/actors/actors.properties | 7 ++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Venom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Venom.java index 51e91dc0c..44cc49aec 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Venom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Venom.java @@ -70,10 +70,15 @@ public class Venom extends Buff implements Hero.Doom { public String toString() { return Messages.get(this, "name"); } + + @Override + public String heroMessage() { + return Messages.get(this, "heromsg"); + } @Override public String desc() { - return Messages.get(this, "desc", dispTurns(left), damage); + return Messages.get(this, "desc", dispTurns(left), (int)damage); } @Override @@ -102,7 +107,7 @@ public class Venom extends Buff implements Hero.Doom { Badges.validateDeathFromPoison(); Dungeon.fail( getClass() ); - GLog.n(Messages.get(Poison.class, "ondeath")); + GLog.n(Messages.get(this, "ondeath")); } } diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties index daf8a4ba0..bb18f4391 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties @@ -218,9 +218,10 @@ actors.buffs.toxicimbue.name=Imbued with Toxicity actors.buffs.toxicimbue.desc=You are imbued with poisonous energy!\n\nAs you move around toxic gas will constantly billow forth from you, damaging your enemies. You are immune to toxic gas and poison for the duration of the effect.\n\nTurns of toxic imbue remaining: %s. actors.buffs.venom.name=Venomed -actors.blobs.venomgas.ondeath=You died from venom... -actors.blobs.venomgas.rankings_desc=Succumbed to Venom -actors.buffs.venom.desc=Venom is a extremely caustic and dangerous poison.\n\nUnlike poison, whose damage lowers over time, venom does increasing damage the longer it stays on a target.\n\nTurns of venom remaining: %1$s.\nCurrent venom damage: %2$d. +actors.buffs.venom.heromsg=You are envenomed! +actors.buffs.venom.ondeath=You died from venom... +actors.buffs.venom.rankings_desc=Succumbed to Venom +actors.buffs.venom.desc=Venom is an extremely caustic and dangerous poison.\n\nUnlike poison, whose damage lowers over time, venom does increasing damage the longer it stays on a target.\n\nTurns of venom remaining: %1$s.\nCurrent venom damage: %2$d. actors.buffs.vertigo.name=Vertigo actors.buffs.vertigo.desc=Walking in a straight line can be difficult when the whole world is spinning.\n\nWhile under the effects of vertigo, characters who attempt to move will go in a random direction, instead of the one they intended to go in.\n\nTurns of vertigo remaining: %s.