From 0d4226c73d169669f9086ce4eb64ee3b5b8a8bba Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Thu, 15 Dec 2011 20:00:16 +0000 Subject: [PATCH] Addint message to Muster and Ambush rules. --- .../gempukku/lotro/logic/actions/OptionalTriggerAction.java | 4 ++++ .../com/gempukku/lotro/logic/timing/rules/AmbushRule.java | 2 ++ .../com/gempukku/lotro/logic/timing/rules/MusterRule.java | 2 ++ 3 files changed, 8 insertions(+) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/OptionalTriggerAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/OptionalTriggerAction.java index 8c6d85181..98bafd8e6 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/OptionalTriggerAction.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/OptionalTriggerAction.java @@ -33,6 +33,10 @@ public class OptionalTriggerAction extends AbstractCostToEffectAction { return _triggerIdentifier; } + public void setMessage(String message) { + _message = message; + } + @Override public Type getType() { return Type.TRIGGER; diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/AmbushRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/AmbushRule.java index 32423159f..ac7b9eed7 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/AmbushRule.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/AmbushRule.java @@ -7,6 +7,7 @@ import com.gempukku.lotro.game.AbstractActionProxy; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.game.state.actions.DefaultActionsEnvironment; +import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -34,6 +35,7 @@ public class AmbushRule { if (Filters.and(CardType.MINION, Keyword.AMBUSH, Filters.owner(playerId)).accepts(game.getGameState(), game.getModifiersQuerying(), assignedCard)) { final int count = game.getModifiersQuerying().getKeywordCount(game.getGameState(), assignedCard, Keyword.AMBUSH); OptionalTriggerAction action = new OptionalTriggerAction("ambush" + assignedCard.getCardId(), assignedCard); + action.setMessage(playerId + " uses Ambush (" + count + ") from " + GameUtils.getCardLink(assignedCard)); action.setText("Ambush - add " + count); action.appendEffect( new AddTwilightEffect(assignedCard, count)); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/MusterRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/MusterRule.java index 8d9d4690c..8f345c6c9 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/MusterRule.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/MusterRule.java @@ -7,6 +7,7 @@ import com.gempukku.lotro.game.AbstractActionProxy; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.game.state.actions.DefaultActionsEnvironment; +import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.effects.ChooseAndDiscardCardsFromHandEffect; import com.gempukku.lotro.logic.effects.DrawCardsEffect; @@ -34,6 +35,7 @@ public class MusterRule { for (PhysicalCard musterCard : Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), Keyword.MUSTER)) { if (playerId.equals(musterCard.getOwner())) { OptionalTriggerAction action = new OptionalTriggerAction("muster" + musterCard.getCardId(), musterCard); + action.setMessage(playerId + " uses Muster from " + GameUtils.getCardLink(musterCard)); action.setText("Use Muster"); action.appendCost( new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 1));