From 8317035492edaaaa680d9001bff393c701f92918 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Thu, 14 Feb 2013 15:45:28 +0000 Subject: [PATCH] Code lift and review of old cards. --- .../lotro/cards/set1/dwarven/Card1_004.java | 4 ++-- .../lotro/cards/set1/dwarven/Card1_005.java | 4 ++-- .../lotro/cards/set1/elven/Card1_029.java | 4 +++- .../lotro/cards/set1/elven/Card1_038.java | 5 +++-- .../lotro/cards/set1/elven/Card1_047.java | 3 +-- .../lotro/cards/set1/elven/Card1_050.java | 2 +- .../lotro/cards/set1/elven/Card1_052.java | 2 +- .../lotro/cards/set1/elven/Card1_062.java | 2 +- .../lotro/cards/set1/elven/Card1_066.java | 2 +- .../lotro/cards/set1/gandalf/Card1_078.java | 15 ++++++--------- .../lotro/cards/set1/gondor/Card1_090.java | 2 +- .../lotro/cards/set1/gondor/Card1_093.java | 2 +- .../lotro/cards/set14/elven/Card14_004.java | 2 +- .../lotro/cards/set15/dwarven/Card15_006.java | 2 +- .../lotro/cards/set15/dwarven/Card15_007.java | 2 +- .../lotro/cards/set15/dwarven/Card15_008.java | 6 +++--- .../lotro/cards/set15/dwarven/Card15_009.java | 2 +- .../lotro/cards/set15/elven/Card15_019.java | 2 +- .../lotro/cards/set15/elven/Card15_020.java | 2 +- .../lotro/cards/set15/elven/Card15_021.java | 2 +- .../lotro/cards/set15/gollum/Card15_043.java | 2 +- .../lotro/cards/set15/gollum/Card15_048.java | 2 +- .../lotro/cards/set15/gollum/Card15_049.java | 4 ++-- .../lotro/cards/set15/gondor/Card15_061.java | 2 +- .../lotro/cards/set15/gondor/Card15_068.java | 2 +- .../lotro/cards/set15/orc/Card15_111.java | 2 +- .../lotro/cards/set15/rohan/Card15_121.java | 4 ++-- .../lotro/cards/set15/rohan/Card15_123.java | 2 +- .../lotro/cards/set15/shire/Card15_149.java | 2 +- .../lotro/cards/set15/shire/Card15_151.java | 2 +- .../lotro/cards/set15/uruk_hai/Card15_179.java | 4 ++-- .../lotro/cards/set17/men/Card17_045.java | 2 +- .../lotro/cards/set17/rohan/Card17_103.java | 2 +- .../lotro/cards/set17/shire/Card17_111.java | 2 +- .../lotro/cards/set17/uruk_hai/Card17_114.java | 8 ++++---- .../lotro/cards/set17/uruk_hai/Card17_121.java | 2 +- .../lotro/cards/set17/uruk_hai/Card17_138.java | 2 +- .../lotro/cards/set18/dwarven/Card18_002.java | 2 +- .../lotro/cards/set18/gandalf/Card18_019.java | 2 +- .../lotro/cards/set18/gondor/Card18_042.java | 4 ++-- .../lotro/cards/set18/gondor/Card18_045.java | 2 +- .../lotro/cards/set18/gondor/Card18_051.java | 2 +- .../lotro/cards/set18/gondor/Card18_059.java | 2 +- .../lotro/cards/set18/orc/Card18_079.java | 4 ++-- .../lotro/cards/set18/rohan/Card18_094.java | 4 ++-- .../lotro/cards/set18/rohan/Card18_096.java | 2 +- .../lotro/cards/set18/rohan/Card18_100.java | 2 +- .../lotro/cards/set18/rohan/Card18_102.java | 2 +- .../lotro/cards/set18/uruk_hai/Card18_117.java | 4 ++-- .../lotro/cards/set18/uruk_hai/Card18_130.java | 4 ++-- .../gempukku/lotro/cards/set19/Card19_001.java | 2 +- .../lotro/cards/set19/elven/Card19_007.java | 2 +- .../lotro/cards/set19/gollum/Card19_011.java | 2 +- .../lotro/cards/set19/wraith/Card19_040.java | 2 +- 54 files changed, 78 insertions(+), 79 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java index a155f0c8b..726f544c6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java @@ -39,10 +39,10 @@ public class Card1_004 extends AbstractOldEvent { protected void forEachCardExertedCallback(PhysicalCard dwarf) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, dwarf, 3), Phase.SKIRMISH)); + new StrengthModifier(self, dwarf, 3))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, dwarf, Keyword.DAMAGE), Phase.SKIRMISH)); + new KeywordModifier(self, dwarf, Keyword.DAMAGE))); } } ); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java index 9bfa8207f..2929df41d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java @@ -37,10 +37,10 @@ public class Card1_005 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard dwarf) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, dwarf, 2), Phase.SKIRMISH)); + new StrengthModifier(self, dwarf, 2))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, dwarf, Keyword.DAMAGE), Phase.SKIRMISH)); + new KeywordModifier(self, dwarf, Keyword.DAMAGE))); } } ); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java index 4b59ba2d5..d8d390590 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java @@ -51,7 +51,9 @@ public class Card1_029 extends AbstractOldEvent { new ChooseActiveCardEffect(self, playerId, "Choose an Elf", Race.ELF) { @Override protected void cardSelected(LotroGame game, final PhysicalCard elf) { - action.appendEffect(new AddUntilEndOfPhaseModifierEffect(new StrengthModifier(self, Filters.sameCard(elf), 1), Phase.SKIRMISH)); + action.appendEffect( + new AddUntilEndOfPhaseModifierEffect( + new StrengthModifier(self, Filters.sameCard(elf), 1))); action.appendEffect( new AddUntilEndOfPhaseActionProxyEffect( new AbstractActionProxy() { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java index 3ea19437e..18e0c02e5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java @@ -36,8 +36,9 @@ public class Card1_038 extends AbstractOldEvent { @Override public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { PlayEventAction action = new PlayEventAction(self); - action.appendEffect(new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY)); + action.appendEffect( + new AddUntilEndOfPhaseModifierEffect( + new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1))); return action; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java index 7688af82f..8009fba98 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java @@ -72,8 +72,7 @@ public class Card1_047 extends AbstractAttachableFPPossession { new ChoiceEffect(action, playerId, possibleCosts)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), 1), - Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), 1))); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java index bfe179756..e6838cb7a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java @@ -40,7 +40,7 @@ public class Card1_050 extends AbstractCompanion { action.appendCost(new SelfExertEffect(action, self)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new DoesNotAddToArcheryTotalModifier(self, self), Phase.ARCHERY)); + new DoesNotAddToArcheryTotalModifier(self, self))); action.appendEffect( new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java index 1633c679a..36975838d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java @@ -38,7 +38,7 @@ public class Card1_052 extends AbstractOldEvent { PlayEventAction action = new PlayEventAction(self); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.SHADOW, -1), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.SHADOW, -1))); return action; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java index 3cdf66706..94c7e5691 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java @@ -45,7 +45,7 @@ public class Card1_062 extends AbstractAttachable { action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1))); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java index e8d03da6c..df403ffe5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java @@ -44,7 +44,7 @@ public class Card1_066 extends AbstractAttachable { action.appendCost(new SelfDiscardEffect(self)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), 2))); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_078.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_078.java index 0ec8f25d9..931395f6a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_078.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_078.java @@ -2,7 +2,8 @@ package com.gempukku.lotro.cards.set1.gandalf; import com.gempukku.lotro.cards.AbstractOldEvent; import com.gempukku.lotro.cards.actions.PlayEventAction; -import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; +import com.gempukku.lotro.cards.effects.SnapshotAndApplyStrengthModifierUntilEndOfCurrentPhaseEffect; +import com.gempukku.lotro.cards.modifiers.evaluator.ConditionEvaluator; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Phase; @@ -10,7 +11,7 @@ import com.gempukku.lotro.common.Side; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.modifiers.SpotBurdensCondition; /** * Set: The Fellowship of the Ring @@ -29,13 +30,9 @@ public class Card1_078 extends AbstractOldEvent { @Override public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { PlayEventAction action = new PlayEventAction(self); - int bonus = (game.getGameState().getBurdens() <= 4) ? 4 : 2; - final PhysicalCard gandalf = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.gandalf); - if (gandalf != null) { - action.appendEffect( - new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(gandalf), bonus), Phase.SKIRMISH)); - } + action.appendEffect( + new SnapshotAndApplyStrengthModifierUntilEndOfCurrentPhaseEffect( + self, new ConditionEvaluator(4, 2, new SpotBurdensCondition(5)), Filters.gandalf)); return action; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java index 6fa512c92..369563b09 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java @@ -51,7 +51,7 @@ public class Card1_090 extends AbstractAttachableFPPossession { action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new DoesNotAddToArcheryTotalModifier(self, Filters.sameCard(self.getAttachedTo())), Phase.ARCHERY)); + new DoesNotAddToArcheryTotalModifier(self, Filters.sameCard(self.getAttachedTo())))); action.appendEffect( new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_093.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_093.java index 71f54e357..8b60966a3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_093.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_093.java @@ -46,7 +46,7 @@ public class Card1_093 extends AbstractOldEvent { filter = Filters.aragorn; action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, filter, 3), Phase.SKIRMISH)); + new StrengthModifier(self, filter, 3))); } } ); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set14/elven/Card14_004.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set14/elven/Card14_004.java index c877fa8fd..3b0e658df 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set14/elven/Card14_004.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set14/elven/Card14_004.java @@ -39,7 +39,7 @@ public class Card14_004 extends AbstractCompanion { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, Filters.and(Filters.owner(self.getOwner()), CardType.COMPANION), Keyword.ARCHER), Phase.ARCHERY)); + new KeywordModifier(self, Filters.and(Filters.owner(self.getOwner()), CardType.COMPANION), Keyword.ARCHER))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_006.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_006.java index f1e75960f..803e968af 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_006.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_006.java @@ -61,7 +61,7 @@ public class Card15_006 extends AbstractCompanion { new ChooseAndRemoveCultureTokensFromCardEffect(self, playerId, Token.DWARVEN, 1, Filters.any)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, 2), Phase.SKIRMISH)); + new StrengthModifier(self, self, 2))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_007.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_007.java index 71404d96f..61ebfd54c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_007.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_007.java @@ -51,7 +51,7 @@ public class Card15_007 extends AbstractAttachableFPPossession { new ChooseAndRemoveCultureTokensFromCardEffect(self, playerId, Token.DWARVEN, 1, Filters.any)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self.getAttachedTo(), 1), Phase.SKIRMISH)); + new StrengthModifier(self, self.getAttachedTo(), 1))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_008.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_008.java index 74f68ec7e..ac5816f67 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_008.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_008.java @@ -36,14 +36,14 @@ public class Card15_008 extends AbstractEvent { if (count > 0) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, count), Phase.SKIRMISH)); + new StrengthModifier(self, card, count))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, card, Keyword.DAMAGE, count), Phase.SKIRMISH)); + new KeywordModifier(self, card, Keyword.DAMAGE, count))); } else { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, 2), Phase.SKIRMISH)); + new StrengthModifier(self, card, 2))); } } }); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_009.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_009.java index 256e058c2..5e5639ee8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_009.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_009.java @@ -58,7 +58,7 @@ public class Card15_009 extends AbstractAttachableFPPossession { new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 1, Culture.DWARVEN)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, self.getAttachedTo(), Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, self.getAttachedTo(), Keyword.DAMAGE, 1))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_019.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_019.java index a1120b384..a17c7c5c7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_019.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_019.java @@ -46,7 +46,7 @@ public class Card15_019 extends AbstractCompanion { new AddUntilEndOfPhaseModifierEffect( new ArcheryTotalModifier(self, Side.FREE_PEOPLE, null, new CardPhaseLimitEvaluator(game, self, Phase.ARCHERY, 3, - new CountActiveEvaluator(CardType.MINION, Keyword.HUNTER))), Phase.ARCHERY)); + new CountActiveEvaluator(CardType.MINION, Keyword.HUNTER))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_020.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_020.java index 79fab1f47..04728bf50 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_020.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_020.java @@ -36,7 +36,7 @@ public class Card15_020 extends AbstractEvent { PlayEventAction action = new PlayEventAction(self); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.SHADOW, -3), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.SHADOW, -3))); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_021.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_021.java index e95766b28..cd94b330f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_021.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_021.java @@ -45,7 +45,7 @@ public class Card15_021 extends AbstractEvent { }); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.FREE_PEOPLE, count), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.FREE_PEOPLE, count))); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_043.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_043.java index aa8c69439..5e72d24c1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_043.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_043.java @@ -42,7 +42,7 @@ public class Card15_043 extends AbstractMinion { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, rbStr), Phase.SKIRMISH)); + new StrengthModifier(self, self, rbStr))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_048.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_048.java index fb89a15ae..462a354a2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_048.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_048.java @@ -45,7 +45,7 @@ public class Card15_048 extends AbstractEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new OverwhelmedByMultiplierModifier(self, card, 3), Phase.SKIRMISH)); + new OverwhelmedByMultiplierModifier(self, card, 3))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_049.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_049.java index c21406978..432a4da4c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_049.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_049.java @@ -60,10 +60,10 @@ public class Card15_049 extends AbstractCompanion { new ChooseAndExertCharactersEffect(action, playerId, 2, 2, 1, Race.HOBBIT, Keyword.RING_BOUND)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, 1), Phase.SKIRMISH)); + new StrengthModifier(self, self, 1))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new OverwhelmedByMultiplierModifier(self, self, 3), Phase.SKIRMISH)); + new OverwhelmedByMultiplierModifier(self, self, 3))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_061.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_061.java index 5d8f085c4..000e44f1b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_061.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_061.java @@ -78,7 +78,7 @@ public class Card15_061 extends AbstractCompanion { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new MinionSiteNumberModifier(self, card, null, 2), Phase.SKIRMISH)); + new MinionSiteNumberModifier(self, card, null, 2))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_068.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_068.java index de9b142f8..ee573fa1f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_068.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_068.java @@ -79,7 +79,7 @@ public class Card15_068 extends AbstractAttachableFPPossession { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new MinionSiteNumberModifier(self, card, null, 2), Phase.SKIRMISH)); + new MinionSiteNumberModifier(self, card, null, 2))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_111.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_111.java index ca5c03a42..5457831af 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_111.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_111.java @@ -53,7 +53,7 @@ public class Card15_111 extends AbstractMinion { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, twilightCost), Phase.SKIRMISH)); + new StrengthModifier(self, self, twilightCost))); } } }); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_121.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_121.java index 1c1e31b8d..5ebd7c38a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_121.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_121.java @@ -33,11 +33,11 @@ public class Card15_121 extends AbstractEvent { boolean isHunter = game.getModifiersQuerying().hasKeyword(game.getGameState(), card, Keyword.HUNTER); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, isHunter ? 3 : 2), Phase.SKIRMISH)); + new StrengthModifier(self, card, isHunter ? 3 : 2))); if (isHunter) action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, card, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, card, Keyword.DAMAGE, 1))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_123.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_123.java index 04ec1f090..0e1c1c669 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_123.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_123.java @@ -52,7 +52,7 @@ public class Card15_123 extends AbstractCompanion { new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 1, Culture.ROHAN)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, 2), Phase.SKIRMISH)); + new StrengthModifier(self, self, 2))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_149.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_149.java index 418ad2e4a..0fd0fa625 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_149.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_149.java @@ -47,7 +47,7 @@ public class Card15_149 extends AbstractCompanion { new AddThreatsEffect(playerId, self, 1)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, 2), Phase.SKIRMISH)); + new StrengthModifier(self, self, 2))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_151.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_151.java index 3ef4a2167..8a144a294 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_151.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_151.java @@ -48,7 +48,7 @@ public class Card15_151 extends AbstractCompanion { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.ringBearer)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, 2), Phase.SKIRMISH)); + new StrengthModifier(self, self, 2))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/uruk_hai/Card15_179.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/uruk_hai/Card15_179.java index 1d7ae015c..9a72b07c2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/uruk_hai/Card15_179.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/uruk_hai/Card15_179.java @@ -32,11 +32,11 @@ public class Card15_179 extends AbstractEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, 2), Phase.SKIRMISH)); + new StrengthModifier(self, card, 2))); if (game.getModifiersQuerying().hasKeyword(game.getGameState(), card, Keyword.HUNTER)) action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, card, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, card, Keyword.DAMAGE, 1))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_045.java index d399476c7..c5ec5ea5f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_045.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_045.java @@ -43,7 +43,7 @@ public class Card17_045 extends AbstractEvent { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new StrengthModifier(self, minion, null, - Filters.filter(game.getGameState().getStackedCards(possession), game.getGameState(), game.getModifiersQuerying(), CardType.MINION).size()), Phase.SKIRMISH)); + Filters.filter(game.getGameState().getStackedCards(possession), game.getGameState(), game.getModifiersQuerying(), CardType.MINION).size()))); SubCostToEffectAction subAction = new SubCostToEffectAction(action); subAction.appendCost( new DiscardCardsFromPlayEffect(self, possession)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/rohan/Card17_103.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/rohan/Card17_103.java index 7eeaf5562..1bf4d033e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/rohan/Card17_103.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/rohan/Card17_103.java @@ -52,7 +52,7 @@ public class Card17_103 extends AbstractEvent { protected void cardSelected(LotroGame game, final PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.frodo, 5), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.frodo, 5))); action.appendEffect( new AddUntilEndOfPhaseActionProxyEffect( new AbstractActionProxy() { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/shire/Card17_111.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/shire/Card17_111.java index eea2dfd72..605372d6e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/shire/Card17_111.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/shire/Card17_111.java @@ -50,7 +50,7 @@ public class Card17_111 extends AbstractPermanent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new OverwhelmedByMultiplierModifier(self, card, 3), Phase.SKIRMISH)); + new OverwhelmedByMultiplierModifier(self, card, 3))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_114.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_114.java index e841164a3..3ae02bbe3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_114.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_114.java @@ -45,7 +45,7 @@ public class Card17_114 extends AbstractEvent { List possibleEffects = new LinkedList(); possibleEffects.add( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, urukHai, 2), Phase.SKIRMISH) { + new StrengthModifier(self, urukHai, 2)) { @Override public String getText(LotroGame game) { return "Make that Uruk-hai strength +2"; @@ -54,7 +54,7 @@ public class Card17_114 extends AbstractEvent { if (PlayConditions.canSpot(game, Filters.siteControlled(playerId))) possibleEffects.add( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, urukHai, 3), Phase.SKIRMISH) { + new StrengthModifier(self, urukHai, 3)) { @Override public String getText(LotroGame game) { return "Make that Uruk-hai strength +3"; @@ -68,10 +68,10 @@ public class Card17_114 extends AbstractEvent { new LiberateASiteEffect(self)); subAction.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, urukHai, 2), Phase.SKIRMISH)); + new StrengthModifier(self, urukHai, 2))); subAction.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, urukHai, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, urukHai, Keyword.DAMAGE, 1))); action.appendEffect( new OptionalEffect(action, playerId, diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_121.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_121.java index 4e9522959..138f230cd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_121.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_121.java @@ -43,7 +43,7 @@ public class Card17_121 extends AbstractMinion { if (count > 0) action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.SHADOW, null, count), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.SHADOW, null, count))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_138.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_138.java index 49b803339..44bcb7c5d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_138.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_138.java @@ -59,7 +59,7 @@ public class Card17_138 extends AbstractPermanent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, card, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, card, Keyword.DAMAGE, 1))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/dwarven/Card18_002.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/dwarven/Card18_002.java index 03429fead..287d3a5b1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/dwarven/Card18_002.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/dwarven/Card18_002.java @@ -61,7 +61,7 @@ public class Card18_002 extends AbstractPermanent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, card, Keyword.HUNTER, 1), Phase.SKIRMISH)); + new KeywordModifier(self, card, Keyword.HUNTER, 1))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gandalf/Card18_019.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gandalf/Card18_019.java index f766c0dcc..b34deb992 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gandalf/Card18_019.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gandalf/Card18_019.java @@ -39,7 +39,7 @@ public class Card18_019 extends AbstractEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new CancelStrengthBonusTargetModifier(self, card, CardType.POSSESSION), Phase.SKIRMISH)); + new CancelStrengthBonusTargetModifier(self, card, CardType.POSSESSION))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_042.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_042.java index cdf3bde17..1065bca65 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_042.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_042.java @@ -61,10 +61,10 @@ public class Card18_042 extends AbstractCompanion { protected void forEachCardExertedCallback(PhysicalCard character) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, character, 1), Phase.SKIRMISH)); + new StrengthModifier(self, character, 1))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, character, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, character, Keyword.DAMAGE, 1))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_045.java index 589b12b50..66e40383b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_045.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_045.java @@ -44,7 +44,7 @@ public class Card18_045 extends AbstractAttachableFPPossession { new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 2, Culture.GONDOR)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_051.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_051.java index 70af7d9ff..6b6944802 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_051.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_051.java @@ -41,7 +41,7 @@ public class Card18_051 extends AbstractEvent { protected void forEachCardExertedCallback(PhysicalCard character) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, character, 3), Phase.SKIRMISH)); + new StrengthModifier(self, character, 3))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_059.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_059.java index a0359474c..65af86363 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_059.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_059.java @@ -45,7 +45,7 @@ public class Card18_059 extends AbstractCompanion { protected void forEachCardExertedCallback(PhysicalCard character) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, character, 3), Phase.SKIRMISH)); + new StrengthModifier(self, character, 3))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/orc/Card18_079.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/orc/Card18_079.java index 51c852f4a..f4750dc1d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/orc/Card18_079.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/orc/Card18_079.java @@ -36,13 +36,13 @@ public class Card18_079 extends AbstractEvent { PlayEventAction action = new PlayEventAction(self); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.SHADOW, 2), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.SHADOW, 2))); final int count = Filters.countActive(game.getGameState(), game.getModifiersQuerying(), CardType.FOLLOWER); if (count > 0) action.appendEffect( new OptionalEffect(action, playerId, new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.SHADOW, count * 2), Phase.ARCHERY) { + new ArcheryTotalModifier(self, Side.SHADOW, count * 2)) { @Override public String getText(LotroGame game) { return "Add additional " + (count * 2) + " to the minion archery total"; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_094.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_094.java index ad49b856d..664796ccd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_094.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_094.java @@ -59,10 +59,10 @@ public class Card18_094 extends AbstractPermanent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, 1), Phase.SKIRMISH)); + new StrengthModifier(self, card, 1))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, card, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, card, Keyword.DAMAGE, 1))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_096.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_096.java index a9399e397..17167404a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_096.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_096.java @@ -56,7 +56,7 @@ public class Card18_096 extends AbstractAttachableFPPossession { new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.FOLLOWER)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self.getAttachedTo(), null, new CardMatchesEvaluator(4, 5, Filters.name("Erkenbrand"))), Phase.SKIRMISH)); + new StrengthModifier(self, self.getAttachedTo(), null, new CardMatchesEvaluator(4, 5, Filters.name("Erkenbrand"))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_100.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_100.java index d87d90d8c..ddcb3d456 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_100.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_100.java @@ -46,7 +46,7 @@ public class Card18_100 extends AbstractAttachableFPPossession { new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.FOLLOWER)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self.getAttachedTo(), 4), Phase.SKIRMISH)); + new StrengthModifier(self, self.getAttachedTo(), 4))); if (PlayConditions.canSpot(game, Filters.name("Gamling"), Filters.hasAttached(self))) { action.appendEffect( new OptionalEffect(action, playerId, diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_102.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_102.java index d21c00ac5..d2f0b77e1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_102.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_102.java @@ -48,7 +48,7 @@ public class Card18_102 extends AbstractPermanent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, 2), Phase.SKIRMISH)); + new StrengthModifier(self, card, 2))); } }); action.appendCost( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_117.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_117.java index bca069ec6..55c26b0be 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_117.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_117.java @@ -32,10 +32,10 @@ public class Card18_117 extends AbstractEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, 2), Phase.SKIRMISH)); + new StrengthModifier(self, card, 2))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, card, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, card, Keyword.DAMAGE, 1))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_130.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_130.java index cd4aba742..8062d4769 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_130.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_130.java @@ -43,10 +43,10 @@ public class Card18_130 extends AbstractMinion { new RemoveTwilightEffect(2)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, 1), Phase.SKIRMISH)); + new StrengthModifier(self, self, 1))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, self, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, self, Keyword.DAMAGE, 1))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/Card19_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/Card19_001.java index 8a78e6fe7..48f239136 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/Card19_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/Card19_001.java @@ -66,7 +66,7 @@ public class Card19_001 extends AbstractAttachable { new AddBurdenEffect(self.getOwner(), self, 1)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self.getAttachedTo(), 3), Phase.SKIRMISH)); + new StrengthModifier(self, self.getAttachedTo(), 3))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/elven/Card19_007.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/elven/Card19_007.java index 8efa3bbbe..68df7be80 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/elven/Card19_007.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/elven/Card19_007.java @@ -44,7 +44,7 @@ public class Card19_007 extends AbstractCompanion { new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new DoesNotAddToArcheryTotalModifier(self, self), Phase.ARCHERY)); + new DoesNotAddToArcheryTotalModifier(self, self))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/gollum/Card19_011.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/gollum/Card19_011.java index 0b4649a66..4887e15ec 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/gollum/Card19_011.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/gollum/Card19_011.java @@ -76,7 +76,7 @@ public class Card19_011 extends AbstractCompanion { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.COMPANION, Keyword.RING_BOUND)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, 2), Phase.SKIRMISH)); + new StrengthModifier(self, self, 2))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/wraith/Card19_040.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/wraith/Card19_040.java index 5af43de6e..2af7cd602 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/wraith/Card19_040.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/wraith/Card19_040.java @@ -46,7 +46,7 @@ public class Card19_040 extends AbstractMinion { for (PhysicalCard physicalCard : cardsBeingDiscarded) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, null, PlayConditions.canSpot(game, Filters.name(physicalCard.getBlueprint().getName())) ? 2 : 1), Phase.SKIRMISH)); + new StrengthModifier(self, self, null, PlayConditions.canSpot(game, Filters.name(physicalCard.getBlueprint().getName())) ? 2 : 1))); } } });