LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.3.4: removed some combat log entries.

Browse Source
This commit is contained in:
Evan Debenham 2016-01-18 01:20:05 -05:00 committed by Evan Debenham
parent 6f3a770a30
commit 07cb7537d5
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
View File

@ -112,10 +112,6 @@ public abstract class Char extends Actor {
if (hit( this, enemy, false )) { if (hit( this, enemy, false )) {
if (visibleFight) {
GLog.i( Messages.get(Char.class, "hit", name, enemy.name) );
}
// FIXME // FIXME
int dr = this instanceof Hero && ((Hero)this).rangedWeapon != null && ((Hero)this).subClass == int dr = this instanceof Hero && ((Hero)this).rangedWeapon != null && ((Hero)this).subClass ==
HeroSubClass.SNIPER ? 0 : Random.IntRange( 0, enemy.dr() ); 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) ); GLog.n( Messages.get(Char.class, "kill", name) );
} else { } else if (this == Dungeon.hero) {
GLog.i( Messages.get(Char.class, "defeat", name, enemy.name) ); GLog.i( Messages.get(Char.class, "defeat", enemy.name) );
} }
} }
@ -179,11 +175,6 @@ public abstract class Char extends Actor {
if (visibleFight) { if (visibleFight) {
String defense = enemy.defenseVerb(); String defense = enemy.defenseVerb();
enemy.sprite.showStatus( CharSprite.NEUTRAL, defense ); 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); Sample.INSTANCE.play(Assets.SND_MISS);
} }

5
src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties
View File

@ -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.kill=%s killed you...
actors.char.defeat=%s defeated %s. actors.char.defeat=You defeated %s.
actors.char.you_missed=%s %s your attack.
actors.char.smb_missed=%s %s %s's attack.
actors.char.out_of_paralysis=The pain snapped %s out of paralysis. actors.char.out_of_paralysis=The pain snapped %s out of paralysis.
actors.char.def_verb=dodged actors.char.def_verb=dodged