From 4373073346ee5d6f180321d88b63c4dc4755c0f7 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sun, 23 Oct 2011 14:39:39 +0000 Subject: [PATCH] SImplifying actions. --- .../lotro/cards/set2/dwarven/Card2_014.java | 8 ++----- .../lotro/cards/set2/site/Card2_120.java | 8 ++----- .../lotro/cards/set3/gondor/Card3_044.java | 16 ++++--------- .../lotro/cards/set4/dunland/Card4_027.java | 8 ++----- .../lotro/cards/set4/raider/Card4_225.java | 24 +++++-------------- .../lotro/cards/set6/gondor/Card6_050.java | 16 ++++--------- .../lotro/cards/set6/isengard/Card6_063.java | 8 ++----- .../lotro/cards/set6/isengard/Card6_064.java | 8 ++----- .../lotro/cards/set6/isengard/Card6_073.java | 8 ++----- .../lotro/cards/set6/raider/Card6_078.java | 24 +++++-------------- .../lotro/cards/set6/rohan/Card6_090.java | 16 ++++--------- .../logic/actions/ActivateCardAction.java | 9 ++++++- .../logic/actions/OptionalTriggerAction.java | 9 ++++++- .../logic/actions/RequiredTriggerAction.java | 9 ++++++- ...PlayerAssignsArcheryDamageGameProcess.java | 9 ++----- ...PlayerAssignsArcheryDamageGameProcess.java | 9 ++----- .../PlayoutSkirmishesGameProcess.java | 9 ++----- .../lotro/logic/timing/rules/AmbushRule.java | 8 ++----- .../timing/rules/CharacterDeathRule.java | 8 ++----- .../timing/rules/ResolveSkirmishRule.java | 16 ++++--------- .../logic/timing/rules/SanctuaryRule.java | 8 ++----- 21 files changed, 76 insertions(+), 162 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java index 64ec4579b..2ced66338 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java @@ -36,12 +36,8 @@ public class Card2_014 extends AbstractPermanent { Collection dwarfCompanions = Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.DWARF), Filters.type(CardType.COMPANION)); List actions = new LinkedList(); for (final PhysicalCard dwarfCompanion : dwarfCompanions) { - OptionalTriggerAction action = new OptionalTriggerAction(self) { - @Override - public String getText(LotroGame game) { - return "Heal " + GameUtils.getCardLink(dwarfCompanion); - } - }; + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setText("Heal " + GameUtils.getCardLink(dwarfCompanion)); action.appendEffect( new HealCharactersEffect(playerId, dwarfCompanion)); actions.add(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java index d06949808..eb625c4eb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/site/Card2_120.java @@ -39,12 +39,8 @@ public class Card2_120 extends AbstractSite { Collection hobbitCompanions = Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.HOBBIT), Filters.type(CardType.COMPANION)); for (final PhysicalCard hobbitCompanion : hobbitCompanions) { - OptionalTriggerAction action = new OptionalTriggerAction(self) { - @Override - public String getText(LotroGame game) { - return "Heal " + GameUtils.getCardLink(hobbitCompanion); - } - }; + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setText("Heal " + GameUtils.getCardLink(hobbitCompanion)); action.appendEffect( new HealCharactersEffect(playerId, hobbitCompanion)); actions.add(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_044.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_044.java index c8e9bc2ad..b504e4e3e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_044.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_044.java @@ -38,12 +38,8 @@ public class Card3_044 extends AbstractPermanent { if (PlayConditions.canUseFPCardDuringPhase(game.getGameState(), Phase.FELLOWSHIP, self)) { if (Filters.filter(game.getGameState().getHand(playerId), game.getGameState(), game.getModifiersQuerying(), Filters.culture(Culture.GONDOR)).size() > 0) { - final ActivateCardAction action = new ActivateCardAction(self) { - @Override - public String getText(LotroGame game) { - return "Stack a GONDOR card from hand here"; - } - }; + final ActivateCardAction action = new ActivateCardAction(self); + action.setText("Stack a GONDOR card from hand here"); action.appendEffect( new ChooseCardsFromHandEffect(playerId, 1, 1, Filters.culture(Culture.GONDOR)) { @Override @@ -60,12 +56,8 @@ public class Card3_044 extends AbstractPermanent { List stackedCards = game.getGameState().getStackedCards(self); if (stackedCards.size() > 0) { - final ActivateCardAction action = new ActivateCardAction(self) { - @Override - public String getText(LotroGame game) { - return "Add (1) to take card stacked here into hand"; - } - }; + final ActivateCardAction action = new ActivateCardAction(self); + action.setText("Add (1) to take card stacked here into hand"); action.appendCost( new AddTwilightEffect(self, 1)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_027.java index 092bd8443..c8baf8a3c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_027.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_027.java @@ -43,12 +43,8 @@ public class Card4_027 extends AbstractPermanent { List actions = new LinkedList(); for (final PhysicalCard physicalCard : winningDunlandMan) { - OptionalTriggerAction action = new OptionalTriggerAction(self) { - @Override - public String getText(LotroGame game) { - return "Make " + GameUtils.getCardLink(physicalCard) + " strength +2 and Fierce"; - } - }; + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setText("Make " + GameUtils.getCardLink(physicalCard) + " strength +2 and Fierce"); action.appendEffect( new AddUntilStartOfPhaseModifierEffect( new StrengthModifier(self, Filters.sameCard(physicalCard), 2), Phase.REGROUP)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_225.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_225.java index 30b43c14f..2f9ee7b94 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_225.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_225.java @@ -46,12 +46,8 @@ public class Card4_225 extends AbstractMinion { List actions = new LinkedList(); if (game.getGameState().getBurdens() >= 2) { - final ActivateCardAction action = new ActivateCardAction(self) { - @Override - public String getText(LotroGame game) { - return "Make Easterling strength +2"; - } - }; + final ActivateCardAction action = new ActivateCardAction(self); + action.setText("Make Easterling strength +2"); action.appendCost( new RemoveTwilightEffect(2)); action.appendEffect( @@ -66,12 +62,8 @@ public class Card4_225 extends AbstractMinion { actions.add(action); } if (game.getGameState().getBurdens() >= 4) { - final ActivateCardAction action = new ActivateCardAction(self) { - @Override - public String getText(LotroGame game) { - return "Make Easterling strength +3"; - } - }; + final ActivateCardAction action = new ActivateCardAction(self); + action.setText("Make Easterling strength +3"); action.appendCost( new RemoveTwilightEffect(2)); action.appendEffect( @@ -86,12 +78,8 @@ public class Card4_225 extends AbstractMinion { actions.add(action); } if (game.getGameState().getBurdens() >= 6) { - final ActivateCardAction action = new ActivateCardAction(self) { - @Override - public String getText(LotroGame game) { - return "Make Easterling strength +4"; - } - }; + final ActivateCardAction action = new ActivateCardAction(self); + action.setText("Make Easterling strength +4"); action.appendCost( new RemoveTwilightEffect(2)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gondor/Card6_050.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gondor/Card6_050.java index 8977bfad9..81f1d4201 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gondor/Card6_050.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gondor/Card6_050.java @@ -42,12 +42,8 @@ public class Card6_050 extends AbstractCompanion { List actions = new LinkedList(); if (PlayConditions.canUseFPCardDuringPhase(game.getGameState(), Phase.SKIRMISH, self) && PlayConditions.canRemoveTokens(game, Token.ELVEN, 1, Filters.any)) { - final ActivateCardAction action = new ActivateCardAction(self) { - @Override - public String getText(LotroGame game) { - return "Remove ELVEN token..."; - } - }; + final ActivateCardAction action = new ActivateCardAction(self); + action.setText("Remove ELVEN token..."); action.appendCost( new ChooseAndRemoveTokensFromCardEffect(self, playerId, Token.ELVEN, 1, Filters.any)); action.appendEffect( @@ -63,12 +59,8 @@ public class Card6_050 extends AbstractCompanion { } if (PlayConditions.canUseFPCardDuringPhase(game.getGameState(), Phase.SKIRMISH, self) && PlayConditions.canRemoveTokens(game, Token.DWARVEN, 1, Filters.any)) { - final ActivateCardAction action = new ActivateCardAction(self) { - @Override - public String getText(LotroGame game) { - return "Remove DWARVEN token..."; - } - }; + final ActivateCardAction action = new ActivateCardAction(self); + action.setText("Remove DWARVEN token..."); action.appendCost( new ChooseAndRemoveTokensFromCardEffect(self, playerId, Token.DWARVEN, 1, Filters.any)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_063.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_063.java index c362462db..9a81ca1a6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_063.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_063.java @@ -45,12 +45,8 @@ public class Card6_063 extends AbstractPermanent { List actions = new LinkedList(); final Collection discardedOrcs = Filters.filter(discardEffect.getAffectedCardsMinusPrevented(game), game.getGameState(), game.getModifiersQuerying(), Culture.ISENGARD, Race.ORC); for (final PhysicalCard discardedOrc : discardedOrcs) { - OptionalTriggerAction action = new OptionalTriggerAction(self) { - @Override - public String getText(LotroGame game) { - return "Stack " + GameUtils.getCardLink(discardedOrc); - } - }; + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setText("Stack " + GameUtils.getCardLink(discardedOrc)); action.appendEffect( new StackCardFromPlayEffect(discardedOrc, self)); actions.add(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_064.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_064.java index cfe42fa20..c769619b2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_064.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_064.java @@ -45,12 +45,8 @@ public class Card6_064 extends AbstractPermanent { List actions = new LinkedList(); final Collection discardedOrcs = Filters.filter(discardEffect.getAffectedCardsMinusPrevented(game), game.getGameState(), game.getModifiersQuerying(), Culture.ISENGARD, Race.ORC); for (final PhysicalCard discardedOrc : discardedOrcs) { - OptionalTriggerAction action = new OptionalTriggerAction(self) { - @Override - public String getText(LotroGame game) { - return "Stack " + GameUtils.getCardLink(discardedOrc); - } - }; + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setText("Stack " + GameUtils.getCardLink(discardedOrc)); action.appendEffect( new StackCardFromPlayEffect(discardedOrc, self)); actions.add(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_073.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_073.java index 784a32ad6..3713ac83c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_073.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_073.java @@ -46,12 +46,8 @@ public class Card6_073 extends AbstractPermanent { List actions = new LinkedList(); final Collection discardedOrcs = Filters.filter(discardEffect.getAffectedCardsMinusPrevented(game), game.getGameState(), game.getModifiersQuerying(), Culture.ISENGARD, Race.ORC); for (final PhysicalCard discardedOrc : discardedOrcs) { - OptionalTriggerAction action = new OptionalTriggerAction(self) { - @Override - public String getText(LotroGame game) { - return "Stack " + GameUtils.getCardLink(discardedOrc); - } - }; + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setText("Stack " + GameUtils.getCardLink(discardedOrc)); action.appendEffect( new StackCardFromPlayEffect(discardedOrc, self)); actions.add(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/raider/Card6_078.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/raider/Card6_078.java index 4e6467710..d461d6320 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/raider/Card6_078.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/raider/Card6_078.java @@ -42,12 +42,8 @@ public class Card6_078 extends AbstractMinion { && PlayConditions.canSelfExert(self, game)) { List actions = new LinkedList(); if (game.getGameState().getBurdens() >= 2) { - ActivateCardAction action = new ActivateCardAction(self) { - @Override - public String getText(LotroGame game) { - return "Make an Easterling Str +1"; - } - }; + ActivateCardAction action = new ActivateCardAction(self); + action.setText("Make an Easterling Str +1"); action.appendCost( new ExertCharactersEffect(self, self)); action.appendEffect( @@ -55,12 +51,8 @@ public class Card6_078 extends AbstractMinion { actions.add(action); } if (game.getGameState().getBurdens() >= 4) { - ActivateCardAction action = new ActivateCardAction(self) { - @Override - public String getText(LotroGame game) { - return "Make an Easterling Str +2"; - } - }; + ActivateCardAction action = new ActivateCardAction(self); + action.setText("Make an Easterling Str +2"); action.appendCost( new ExertCharactersEffect(self, self)); action.appendEffect( @@ -68,12 +60,8 @@ public class Card6_078 extends AbstractMinion { actions.add(action); } if (game.getGameState().getBurdens() >= 6) { - ActivateCardAction action = new ActivateCardAction(self) { - @Override - public String getText(LotroGame game) { - return "Make an Easterling Str +3"; - } - }; + ActivateCardAction action = new ActivateCardAction(self); + action.setText("Make an Easterling Str +3"); action.appendCost( new ExertCharactersEffect(self, self)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/rohan/Card6_090.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/rohan/Card6_090.java index f5e92f178..ea63cefe1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/rohan/Card6_090.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/rohan/Card6_090.java @@ -42,12 +42,8 @@ public class Card6_090 extends AbstractAttachableFPPossession { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (PlayConditions.winsSkirmish(game, effectResult, self.getAttachedTo())) { - OptionalTriggerAction action = new OptionalTriggerAction(self) { - @Override - public String getText(LotroGame game) { - return "Exert a minion"; - } - }; + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setText("Exert a minion"); action.appendEffect( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.MINION)); return Collections.singletonList(action); @@ -59,12 +55,8 @@ public class Card6_090 extends AbstractAttachableFPPossession { public List getOptionalInPlayAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (PlayConditions.winsSkirmish(game, effectResult, self.getAttachedTo()) && PlayConditions.canSelfDiscard(self, game)) { - ActivateCardAction action = new ActivateCardAction(self) { - @Override - public String getText(LotroGame game) { - return "Discard this to liberate a site"; - } - }; + ActivateCardAction action = new ActivateCardAction(self); + action.setText("Discard this to liberate a site"); action.appendCost( new DiscardCardsFromPlayEffect(self, self)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/ActivateCardAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/ActivateCardAction.java index b062ccd2f..5842d4881 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/ActivateCardAction.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/ActivateCardAction.java @@ -15,8 +15,11 @@ public class ActivateCardAction extends AbstractCostToEffectAction { private boolean _sentMessage; private boolean _activated; + private String _text; + public ActivateCardAction(PhysicalCard physicalCard) { _physicalCard = physicalCard; + _text = "Use " + _physicalCard.getBlueprint().getName(); } @Override @@ -29,9 +32,13 @@ public class ActivateCardAction extends AbstractCostToEffectAction { return _physicalCard; } + public void setText(String text) { + _text = text; + } + @Override public String getText(LotroGame game) { - return "Use " + _physicalCard.getBlueprint().getName(); + return _text; } @Override 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 9eceb3d42..22edb4891 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 @@ -11,10 +11,13 @@ public class OptionalTriggerAction extends AbstractCostToEffectAction { private PhysicalCard _actionAttachedToCard; private boolean _sentMessage; + private String _text; public OptionalTriggerAction(PhysicalCard physicalCard) { _physicalCard = physicalCard; _actionAttachedToCard = physicalCard; + + _text = "Optional trigger from " + GameUtils.getCardLink(_physicalCard); } public void setActionAttachedToCard(PhysicalCard actionAttachedToCard) { @@ -31,9 +34,13 @@ public class OptionalTriggerAction extends AbstractCostToEffectAction { return _actionAttachedToCard; } + public void setText(String text) { + _text = text; + } + @Override public String getText(LotroGame game) { - return null; + return _text; } @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/RequiredTriggerAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/RequiredTriggerAction.java index 39c7d65ab..e92daa9d8 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/RequiredTriggerAction.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/RequiredTriggerAction.java @@ -11,8 +11,11 @@ public class RequiredTriggerAction extends AbstractCostToEffectAction { private boolean _sentMessage; + private String _text; + public RequiredTriggerAction(PhysicalCard physicalCard) { _physicalCard = physicalCard; + _text = "Required trigger from " + GameUtils.getCardLink(_physicalCard); } @Override @@ -25,9 +28,13 @@ public class RequiredTriggerAction extends AbstractCostToEffectAction { return _physicalCard; } + public void setText(String text) { + _text = text; + } + @Override public String getText(LotroGame game) { - return null; + return _text; } @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerAssignsArcheryDamageGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerAssignsArcheryDamageGameProcess.java index 37890ec04..06d9c1bca 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerAssignsArcheryDamageGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/FellowshipPlayerAssignsArcheryDamageGameProcess.java @@ -6,7 +6,7 @@ import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.actions.RequiredTriggerAction; +import com.gempukku.lotro.logic.actions.SystemQueueAction; import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; import com.gempukku.lotro.logic.timing.processes.GameProcess; @@ -51,12 +51,7 @@ public class FellowshipPlayerAssignsArcheryDamageGameProcess implements GameProc ) ); - RequiredTriggerAction action = new RequiredTriggerAction(null) { - @Override - public String getText(LotroGame game) { - return "Archery fire"; - } - }; + SystemQueueAction action = new SystemQueueAction(); for (int i = 0; i < _woundsToAssign; i++) { final int woundsLeft = _woundsToAssign - i; ChooseAndWoundCharactersEffect woundCharacter = new ChooseAndWoundCharactersEffect(action, _game.getGameState().getCurrentPlayerId(), 1, 1, filter); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ShadowPlayerAssignsArcheryDamageGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ShadowPlayerAssignsArcheryDamageGameProcess.java index 5d4676844..8bd607556 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ShadowPlayerAssignsArcheryDamageGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/archery/ShadowPlayerAssignsArcheryDamageGameProcess.java @@ -4,7 +4,7 @@ import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.actions.RequiredTriggerAction; +import com.gempukku.lotro.logic.actions.SystemQueueAction; import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; import com.gempukku.lotro.logic.timing.processes.GameProcess; @@ -28,12 +28,7 @@ public class ShadowPlayerAssignsArcheryDamageGameProcess implements GameProcess if (_woundsToAssign > 0) { Filter filter = Filters.and(Filters.type(CardType.MINION), Filters.owner(_playerId)); - RequiredTriggerAction action = new RequiredTriggerAction(null) { - @Override - public String getText(LotroGame game) { - return "Archery fire"; - } - }; + SystemQueueAction action = new SystemQueueAction(); for (int i = 0; i < _woundsToAssign; i++) { final int woundsLeft = _woundsToAssign - i; ChooseAndWoundCharactersEffect woundCharacter = new ChooseAndWoundCharactersEffect(action, _playerId, 1, 1, filter); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java index 1e4a02f44..084c5326a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java @@ -6,7 +6,7 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.Assignment; import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.actions.RequiredTriggerAction; +import com.gempukku.lotro.logic.actions.SystemQueueAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.timing.processes.GameProcess; import com.gempukku.lotro.logic.timing.processes.turn.SkirmishGameProcess; @@ -39,12 +39,7 @@ public class PlayoutSkirmishesGameProcess implements GameProcess { for (Assignment assignment : assignments) fps.add(assignment.getFellowshipCharacter()); - RequiredTriggerAction chooseNextSkirmishAction = new RequiredTriggerAction(null) { - @Override - public String getText(LotroGame game) { - return "Choosing next skirmish to play out"; - } - }; + SystemQueueAction chooseNextSkirmishAction = new SystemQueueAction(); chooseNextSkirmishAction.appendEffect( new ChooseActiveCardEffect(null, gameState.getCurrentPlayerId(), "Choose next skirmish to resolve", Filters.in(fps)) { @Override 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 4173ea9da..45962d223 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 @@ -34,12 +34,8 @@ public class AmbushRule { for (PhysicalCard minion : minions) { if (game.getModifiersQuerying().hasKeyword(game.getGameState(), minion, Keyword.AMBUSH)) { final int count = game.getModifiersQuerying().getKeywordCount(game.getGameState(), minion, Keyword.AMBUSH); - OptionalTriggerAction action = new OptionalTriggerAction(minion) { - @Override - public String getText(LotroGame game) { - return "Ambush - add " + count; - } - }; + OptionalTriggerAction action = new OptionalTriggerAction(minion); + action.setText("Ambush - add " + count); action.appendEffect( new AddTwilightEffect(minion, count)); actions.add(action); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java index 5570f0a2d..73d0203ec 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java @@ -40,12 +40,8 @@ public class CharacterDeathRule { deadCharacters.add(character); if (deadCharacters.size() > 0) { - RequiredTriggerAction action = new RequiredTriggerAction(null) { - @Override - public String getText(LotroGame game) { - return "Character(s) death"; - } - }; + RequiredTriggerAction action = new RequiredTriggerAction(null); + action.setText("Character(s) death"); action.appendEffect( new KillEffect(deadCharacters)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/ResolveSkirmishRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/ResolveSkirmishRule.java index b7658771f..b18d380e6 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/ResolveSkirmishRule.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/ResolveSkirmishRule.java @@ -45,12 +45,8 @@ public class ResolveSkirmishRule { List losers = skirmishResult.getLosers(); - RequiredTriggerAction action = new RequiredTriggerAction(null) { - @Override - public String getText(LotroGame game) { - return "Resolving skirmish"; - } - }; + RequiredTriggerAction action = new RequiredTriggerAction(null); + action.setText("Resolving skirmish"); for (int i = 0; i < dmg; i++) { action.appendEffect( new WoundCharactersEffect(winners, Filters.in(losers))); @@ -61,12 +57,8 @@ public class ResolveSkirmishRule { OverwhelmSkirmishResult skirmishResult = (OverwhelmSkirmishResult) effectResult; List losers = new LinkedList(skirmishResult.getLosers()); - RequiredTriggerAction action = new RequiredTriggerAction(null) { - @Override - public String getText(LotroGame game) { - return "Resolving skirmish"; - } - }; + RequiredTriggerAction action = new RequiredTriggerAction(null); + action.setText("Resolving skirmish"); action.appendEffect(new KillEffect(losers)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java index bb981e304..77fc4e347 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java @@ -28,12 +28,8 @@ public class SanctuaryRule { public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult) { if (effectResult.getType() == EffectResult.Type.START_OF_TURN && game.getModifiersQuerying().hasKeyword(game.getGameState(), game.getGameState().getCurrentSite(), Keyword.SANCTUARY)) { - RequiredTriggerAction action = new RequiredTriggerAction(null) { - @Override - public String getText(LotroGame game) { - return "Sanctuary healing"; - } - }; + RequiredTriggerAction action = new RequiredTriggerAction(game.getGameState().getCurrentSite()); + action.setText("Sanctuary healing"); for (int i = 0; i < 5; i++) { final int remainingHeals = 5 - i; ChooseAndHealCharactersEffect healEffect = new ChooseAndHealCharactersEffect(action, game.getGameState().getCurrentPlayerId(), 0, 1, Filters.type(CardType.COMPANION));