From 07cb7537d52623ab7710820ec465bef2939d1c42 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 18 Jan 2016 01:20:05 -0500 Subject: [PATCH] v0.3.4: removed some combat log entries. --- .../shatteredpixeldungeon/actors/Char.java | 13 ++----------- .../messages/actors/actors.properties | 5 +---- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index d35dc351e..4f86c3ba2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -112,10 +112,6 @@ public abstract class Char extends Actor { if (hit( this, enemy, false )) { - if (visibleFight) { - GLog.i( Messages.get(Char.class, "hit", name, enemy.name) ); - } - // FIXME int dr = this instanceof Hero && ((Hero)this).rangedWeapon != null && ((Hero)this).subClass == HeroSubClass.SNIPER ? 0 : Random.IntRange( 0, enemy.dr() ); @@ -167,8 +163,8 @@ public abstract class Char extends Actor { GLog.n( Messages.get(Char.class, "kill", name) ); - } else { - GLog.i( Messages.get(Char.class, "defeat", name, enemy.name) ); + } else if (this == Dungeon.hero) { + GLog.i( Messages.get(Char.class, "defeat", enemy.name) ); } } @@ -179,11 +175,6 @@ public abstract class Char extends Actor { if (visibleFight) { String defense = enemy.defenseVerb(); enemy.sprite.showStatus( CharSprite.NEUTRAL, defense ); - if (this == Dungeon.hero) { - GLog.i( Messages.get(Char.class, "you_missed", enemy.name, defense) ); - } else { - GLog.i( Messages.get(Char.class, "smb_missed", enemy.name, defense, name) ); - } Sample.INSTANCE.play(Assets.SND_MISS); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties index f74ad816b..c04817d5f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties @@ -503,10 +503,7 @@ actors.mobs.yog$larva.desc=Yog-Dzewa is an Old God, a powerful entity from the r -actors.char.hit=%s hit %s. actors.char.kill=%s killed you... -actors.char.defeat=%s defeated %s. -actors.char.you_missed=%s %s your attack. -actors.char.smb_missed=%s %s %s's attack. +actors.char.defeat=You defeated %s. actors.char.out_of_paralysis=The pain snapped %s out of paralysis. actors.char.def_verb=dodged