external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed damage log.

Browse Source
This commit is contained in:
Sloth
2013-06-09 12:01:51 +00:00
parent aa1458167e
commit 6c142c2550
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/forge/GameLogFormatter.java
View File

@@ -137,11 +137,11 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
@Override @Override
public GameLogEntry visit(GameEventCardDamaged event) { public GameLogEntry visit(GameEventCardDamaged event) {
String additionalLog = ""; String additionalLog = "";
if( event.type == DamageType.Deathtouch ) additionalLog = " (Deathtouch)"; if( event.type == DamageType.Deathtouch ) additionalLog = "(Deathtouch)";
if( event.type == DamageType.M1M1Counters ) additionalLog = " (As -1/-1 Counters)"; if( event.type == DamageType.M1M1Counters ) additionalLog = "(As -1/-1 Counters)";
if( event.type == DamageType.LoyaltyLoss ) additionalLog = " (Removing " + Lang.nounWithAmount(event.amount, "loyalty counter") + ")"; if( event.type == DamageType.LoyaltyLoss ) additionalLog = "(Removing " + Lang.nounWithAmount(event.amount, "loyalty counter") + ")";
String message = String.format("%s deals %d damage%s to %s.", event.source, event.amount, event.damaged, additionalLog); String message = String.format("%s deals %d damage %s to %s.", event.source, event.amount, additionalLog, event.damaged);
return new GameLogEntry(GameLogEntryType.DAMAGE, message); return new GameLogEntry(GameLogEntryType.DAMAGE, message);
} }
@@ -187,11 +187,11 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
continue; continue;
} }
if ( sb.length() > 0 ) sb.append("\n"); if ( sb.length() > 0 ) sb.append("\n");
sb.append(ev.player).append(" assigned ").append(Lang.joinHomogenous(attackers)); sb.append(ev.player + " assigned " + Lang.joinHomogenous(attackers));
sb.append(" to attack ").append(kv.getKey().toString()).append("."); sb.append(" to attack " + kv.getKey() + ".");
} }
if ( sb.length() == 0 ) if ( sb.length() == 0 )
sb.append(ev.player).append(" didn't attack this turn."); sb.append(ev.player + " didn't attack this turn.");
return new GameLogEntry(GameLogEntryType.COMBAT, sb.toString()); return new GameLogEntry(GameLogEntryType.COMBAT, sb.toString());
} }
@@ -221,9 +221,9 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
blockers = att.getValue(); blockers = att.getValue();
if ( blockers.isEmpty() ) { if ( blockers.isEmpty() ) {
sb.append(controllerName).append(" didn't block "); sb.append(controllerName + " didn't block ");
} else { } else {
sb.append(controllerName).append(" assigned ").append(Lang.joinHomogenous(blockers)).append(" to block "); sb.append(controllerName + " assigned " + Lang.joinHomogenous(blockers) + " to block ");
} }
sb.append(att.getKey()).append("."); sb.append(att.getKey()).append(".");