From 4b3ac86d0a06e4601128004567114507042eabb8 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Fri, 25 Nov 2011 11:53:22 +0000 Subject: [PATCH] Improved texts for threats, burdens and twilight to display the numbers the system added/removed and was trying to add/remove. --- .../com/gempukku/lotro/cards/effects/AddBurdenEffect.java | 2 +- .../gempukku/lotro/cards/effects/RemoveBurdenEffect.java | 2 +- .../gempukku/lotro/cards/effects/RemoveTwilightEffect.java | 3 ++- .../src/main/java/com/gempukku/lotro/logic/GameUtils.java | 7 +++++++ .../com/gempukku/lotro/logic/effects/AddThreatsEffect.java | 2 +- .../gempukku/lotro/logic/effects/RemoveThreatsEffect.java | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddBurdenEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddBurdenEffect.java index 1523e726b..5c20faacd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddBurdenEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/AddBurdenEffect.java @@ -55,7 +55,7 @@ public class AddBurdenEffect extends AbstractEffect implements Preventable { protected FullEffectResult playEffectReturningResult(LotroGame game) { if (_prevented < _count) { int toAdd = _count - _prevented; - game.getGameState().sendMessage(GameUtils.getCardLink(_source) + " adds " + toAdd + " burden" + ((toAdd > 1) ? "s" : "")); + game.getGameState().sendMessage(GameUtils.getCardLink(_source) + " adds " + GameUtils.formatNumber(toAdd, _count) + " burden" + ((toAdd > 1) ? "s" : "")); game.getGameState().addBurdens(toAdd); for (int i = 0; i < toAdd; i++) game.getActionsEnvironment().emitEffectResult(new AddBurdenResult(_source)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurdenEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurdenEffect.java index 5fe5480af..f9fd0ab63 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurdenEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveBurdenEffect.java @@ -47,7 +47,7 @@ public class RemoveBurdenEffect extends AbstractEffect { if (game.getModifiersQuerying().canRemoveBurden(game.getGameState(), _source)) { int toRemove = Math.min(_count, game.getGameState().getBurdens()); if (toRemove > 0) { - game.getGameState().sendMessage(_performingPlayerId + " removed " + toRemove + " burden" + ((toRemove > 1) ? "s" : "") + " with " + GameUtils.getCardLink(_source)); + game.getGameState().sendMessage(_performingPlayerId + " removed " + GameUtils.formatNumber(toRemove, _count) + " burden" + ((toRemove > 1) ? "s" : "") + " with " + GameUtils.getCardLink(_source)); game.getGameState().removeBurdens(toRemove); for (int i = 0; i < toRemove; i++) game.getActionsEnvironment().emitEffectResult(new RemoveBurdenResult(_performingPlayerId, _source)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveTwilightEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveTwilightEffect.java index 7b769b20c..0a3af1097 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveTwilightEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/RemoveTwilightEffect.java @@ -1,6 +1,7 @@ package com.gempukku.lotro.cards.effects; import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.timing.AbstractEffect; import com.gempukku.lotro.logic.timing.Effect; @@ -29,7 +30,7 @@ public class RemoveTwilightEffect extends AbstractEffect { @Override protected FullEffectResult playEffectReturningResult(LotroGame game) { int toRemove = Math.min(game.getGameState().getTwilightPool(), _twilight); - game.getGameState().sendMessage(toRemove + " twilight gets removed from twilight pool"); + game.getGameState().sendMessage(GameUtils.formatNumber(toRemove, _twilight) + " twilight gets removed from twilight pool"); game.getGameState().removeTwilight(toRemove); return new FullEffectResult(toRemove == _twilight, toRemove == _twilight); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/GameUtils.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/GameUtils.java index b2c0b19f9..24d1e390b 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/GameUtils.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/GameUtils.java @@ -84,4 +84,11 @@ public class GameUtils { cultures.add(physicalCard.getBlueprint().getCulture()); return cultures.size(); } + + public static String formatNumber(int effective, int requested) { + if (effective != requested) + return effective + "(" + requested + ")"; + else + return String.valueOf(effective); + } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AddThreatsEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AddThreatsEffect.java index 4bff1ee5d..d1de09120 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AddThreatsEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AddThreatsEffect.java @@ -57,7 +57,7 @@ public class AddThreatsEffect extends AbstractEffect { int count = evaluateCount(game); int toAdd = Math.min(count, getThreatsPossibleToAdd(game)); if (toAdd > 0) { - game.getGameState().sendMessage(GameUtils.getCardLink(_source) + " adds " + toAdd + " threat" + ((toAdd > 1) ? "s" : "")); + game.getGameState().sendMessage(GameUtils.getCardLink(_source) + " adds " + GameUtils.formatNumber(toAdd, count) + " threat" + ((toAdd > 1) ? "s" : "")); game.getGameState().addThreats(game.getGameState().getCurrentPlayerId(), toAdd); for (int i = 0; i < toAdd; i++) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/RemoveThreatsEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/RemoveThreatsEffect.java index b010daec3..b12d466b6 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/RemoveThreatsEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/RemoveThreatsEffect.java @@ -36,7 +36,7 @@ public class RemoveThreatsEffect extends AbstractEffect { if (toRemove > 0) { if (_source != null) - game.getGameState().sendMessage(GameUtils.getCardLink(_source) + " removed " + toRemove + " threat" + ((toRemove > 1) ? "s" : "")); + game.getGameState().sendMessage(GameUtils.getCardLink(_source) + " removed " + GameUtils.formatNumber(toRemove, _count) + " threat" + ((toRemove > 1) ? "s" : "")); game.getGameState().removeThreats(game.getGameState().getCurrentPlayerId(), toRemove); }