From ff878e23375172f8f35c1177318bf4aba055affa Mon Sep 17 00:00:00 2001 From: marcins78 Date: Wed, 7 Nov 2012 11:01:17 +0000 Subject: [PATCH] - Another change to Muster. Now to USE Muster, you have to click the card shadow showing above the panel used to drive game flow (where you press "Pass" and accept your choices). --- .../gempukku/lotro/logic/actions/OptionalTriggerAction.java | 4 ++++ .../com/gempukku/lotro/logic/timing/rules/MusterRule.java | 4 +++- .../gemp-lotr-web/src/main/webapp/includes/changeLog.html | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) 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 98bafd8e6..26eae675a 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 @@ -29,6 +29,10 @@ public class OptionalTriggerAction extends AbstractCostToEffectAction { _triggerIdentifier = String.valueOf(physicalCard.getCardId()); } + public void setTriggerIdentifier(String triggerIdentifier) { + _triggerIdentifier = triggerIdentifier; + } + public String getTriggerIdentifier() { return _triggerIdentifier; } 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 35acb0c2a..4bb0d1053 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 @@ -37,7 +37,9 @@ public class MusterRule { && game.getGameState().getHand(playerId).size() > 0) { PhysicalCard firstMuster = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.owner(playerId), Keyword.MUSTER); if (firstMuster != null) { - final OptionalTriggerAction action = new OptionalTriggerAction("muster", firstMuster); + final OptionalTriggerAction action = new OptionalTriggerAction(firstMuster); + action.setTriggerIdentifier("muster"); + action.setVirtualCardAction(true); action.setText("Use Muster"); ChooseAndDiscardCardsFromHandEffect effect = new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, new ConstantEvaluator(0), new Evaluator() { diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index 084bd12c6..5b406fd0c 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -1,6 +1,8 @@
 7 Nov. 2012
 - "King's Board" now correctly allows to exert the named characters for the effect, if you do not control Eomer.
+- Another change to Muster. Now to USE Muster, you have to click the card shadow showing above the panel used to drive
+game flow (where you press "Pass" and accept your choices).
 
 24 Oct. 2012
 - Added replay speed buttons.