From b82c6010c2231cf2fc71b7c3f29cb6cbaa0de721 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 22 Feb 2025 07:57:53 +0400 Subject: [PATCH] refactor: simplified turn logs, removed useless poison info from it --- .../src/mage/cards/b/BaruWurmspeaker.java | 2 +- Mage/src/main/java/mage/game/turn/Turn.java | 36 ++++++++----------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BaruWurmspeaker.java b/Mage.Sets/src/mage/cards/b/BaruWurmspeaker.java index 0be6deacc9a..d87af6d364b 100644 --- a/Mage.Sets/src/mage/cards/b/BaruWurmspeaker.java +++ b/Mage.Sets/src/mage/cards/b/BaruWurmspeaker.java @@ -61,7 +61,7 @@ public final class BaruWurmspeaker extends CardImpl { ).setText("and have trample")); this.addAbility(ability); - // {7}{G}, {T}: Create a 4/4 green Wurm creature token. This ability costs {X} less to activate, whre X is the greatest power among Wurms you control. + // {7}{G}, {T}: Create a 4/4 green Wurm creature token. This ability costs {X} less to activate, where X is the greatest power among Wurms you control. ability = new SimpleActivatedAbility(new CreateTokenEffect(new Wurm44Token()), new ManaCostsImpl<>("{7}{G}")); ability.addCost(new TapSourceCost()); ability.addEffect(new InfoEffect("this ability costs {X} less to activate, " + diff --git a/Mage/src/main/java/mage/game/turn/Turn.java b/Mage/src/main/java/mage/game/turn/Turn.java index f163c2e7e9c..03966273caf 100644 --- a/Mage/src/main/java/mage/game/turn/Turn.java +++ b/Mage/src/main/java/mage/game/turn/Turn.java @@ -3,7 +3,6 @@ package mage.game.turn; import mage.abilities.Ability; import mage.constants.PhaseStep; import mage.constants.TurnPhase; -import mage.counters.CounterType; import mage.game.Game; import mage.game.events.PhaseChangedEvent; import mage.game.permanent.Permanent; @@ -17,6 +16,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; /** * @author BetaSteward_at_googlemail.com @@ -391,26 +391,18 @@ public class Turn implements Serializable { } private void logStartOfTurn(Game game, Player player) { - StringBuilder sb = new StringBuilder("Turn "); - sb.append(game.getState().getTurnNum()).append(' '); - if (game.getState().isExtraTurn()) { - sb.append("(extra) "); - } - sb.append(player.getLogName()); - sb.append(" ("); - int delimiter = game.getPlayers().size() - 1; - for (Player gamePlayer : game.getPlayers().values()) { - sb.append(gamePlayer.getLife()); - int poison = gamePlayer.getCountersCount(CounterType.POISON); - if (poison > 0) { - sb.append("[P:").append(poison).append(']'); - } - if (delimiter > 0) { - sb.append(" - "); - delimiter--; - } - } - sb.append(')'); - game.fireStatusEvent(sb.toString(), true, false); + // example: 0:40: TURN 1 for Human (40 - 40) + + String infoTurn = String.format("TURN %d%s for %s", + game.getState().getTurnNum(), + game.getState().isExtraTurn() ? " (extra)" : "", + player.getLogName() + ); + + String infoLife = game.getPlayers().values().stream() + .map(p -> String.valueOf(p.getLife())) + .collect(Collectors.joining(" - ")); + + game.fireStatusEvent(infoTurn + " " + infoLife, true, false); } }