From 7c7f8359003c9dc7957a097d51412e87f7c7c561 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Thu, 14 Feb 2013 15:54:45 +0000 Subject: [PATCH] Code lift and review of old cards. --- .../com/gempukku/lotro/cards/set1/gondor/Card1_102.java | 4 ++-- .../com/gempukku/lotro/cards/set1/gondor/Card1_114.java | 2 +- .../com/gempukku/lotro/cards/set1/isengard/Card1_121.java | 2 +- .../com/gempukku/lotro/cards/set1/isengard/Card1_128.java | 4 ++-- .../com/gempukku/lotro/cards/set1/isengard/Card1_139.java | 2 +- .../com/gempukku/lotro/cards/set1/isengard/Card1_145.java | 3 +-- .../com/gempukku/lotro/cards/set1/isengard/Card1_147.java | 3 +-- .../com/gempukku/lotro/cards/set1/isengard/Card1_153.java | 2 +- .../java/com/gempukku/lotro/cards/set1/moria/Card1_167.java | 2 +- .../java/com/gempukku/lotro/cards/set1/moria/Card1_190.java | 2 +- .../com/gempukku/lotro/cards/set1/sauron/Card1_246.java | 2 +- .../com/gempukku/lotro/cards/set1/sauron/Card1_269.java | 2 +- .../com/gempukku/lotro/cards/set1/sauron/Card1_278.java | 2 +- .../java/com/gempukku/lotro/cards/set1/shire/Card1_286.java | 2 +- .../java/com/gempukku/lotro/cards/set1/shire/Card1_293.java | 2 +- .../java/com/gempukku/lotro/cards/set1/shire/Card1_296.java | 2 +- .../java/com/gempukku/lotro/cards/set1/shire/Card1_298.java | 2 +- .../java/com/gempukku/lotro/cards/set1/shire/Card1_302.java | 2 +- .../java/com/gempukku/lotro/cards/set1/shire/Card1_304.java | 2 +- .../java/com/gempukku/lotro/cards/set1/site/Card1_331.java | 2 +- .../java/com/gempukku/lotro/cards/set1/site/Card1_363.java | 4 ++-- .../com/gempukku/lotro/cards/set1/wraith/Card1_204.java | 2 +- .../com/gempukku/lotro/cards/set1/wraith/Card1_210.java | 4 ++-- .../com/gempukku/lotro/cards/set1/wraith/Card1_213.java | 2 +- .../com/gempukku/lotro/cards/set1/wraith/Card1_224.java | 2 +- .../com/gempukku/lotro/cards/set1/wraith/Card1_227.java | 2 +- .../com/gempukku/lotro/cards/set1/wraith/Card1_229.java | 2 +- .../com/gempukku/lotro/cards/set1/wraith/Card1_238.java | 2 +- .../java/com/gempukku/lotro/cards/set17/men/Card17_045.java | 2 +- .../com/gempukku/lotro/cards/set20/dunland/Card20_024.java | 4 ++-- .../com/gempukku/lotro/cards/set20/dunland/Card20_029.java | 2 +- .../com/gempukku/lotro/cards/set20/dwarven/Card20_040.java | 4 ++-- .../com/gempukku/lotro/cards/set20/dwarven/Card20_041.java | 2 +- .../com/gempukku/lotro/cards/set20/dwarven/Card20_049.java | 2 +- .../com/gempukku/lotro/cards/set20/dwarven/Card20_059.java | 4 ++-- .../com/gempukku/lotro/cards/set20/dwarven/Card20_060.java | 4 ++-- .../com/gempukku/lotro/cards/set20/dwarven/Card20_070.java | 2 +- .../com/gempukku/lotro/cards/set20/elven/Card20_072.java | 2 +- .../com/gempukku/lotro/cards/set20/elven/Card20_078.java | 2 +- .../com/gempukku/lotro/cards/set20/elven/Card20_099.java | 2 +- .../com/gempukku/lotro/cards/set20/elven/Card20_102.java | 2 +- .../com/gempukku/lotro/cards/set20/elven/Card20_106.java | 2 +- .../com/gempukku/lotro/cards/set20/gandalf/Card20_151.java | 6 +++--- .../com/gempukku/lotro/cards/set20/gandalf/Card20_153.java | 2 +- .../com/gempukku/lotro/cards/set20/gondor/Card20_176.java | 2 +- .../com/gempukku/lotro/cards/set20/gondor/Card20_187.java | 4 ++-- .../com/gempukku/lotro/cards/set20/gondor/Card20_192.java | 2 +- .../com/gempukku/lotro/cards/set20/gondor/Card20_207.java | 4 ++-- .../com/gempukku/lotro/cards/set20/isengard/Card20_215.java | 2 +- .../com/gempukku/lotro/cards/set20/rohan/Card20_322.java | 2 +- .../com/gempukku/lotro/cards/set20/sauron/Card20_380.java | 2 +- .../com/gempukku/lotro/cards/set20/shire/Card20_399.java | 2 +- .../com/gempukku/lotro/cards/set20/site/Card20_425.java | 2 +- .../com/gempukku/lotro/cards/set20/site/Card20_437.java | 2 +- .../com/gempukku/lotro/cards/set20/wraith/Card20_288.java | 4 ++-- 55 files changed, 68 insertions(+), 70 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_102.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_102.java index 5f850b6d0..2ddbfb389 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_102.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_102.java @@ -33,10 +33,10 @@ public class Card1_102 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard companion) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(companion), 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(companion), 2))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, Filters.sameCard(companion), Keyword.DAMAGE), Phase.SKIRMISH)); + new KeywordModifier(self, Filters.sameCard(companion), Keyword.DAMAGE))); } } ); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java index ea003b8c9..497e4f6bb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java @@ -45,7 +45,7 @@ public class Card1_114 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/isengard/Card1_121.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_121.java index 65c7fb929..23c97b4e4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_121.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_121.java @@ -47,7 +47,7 @@ public class Card1_121 extends AbstractOldEvent { protected void forEachCardExertedCallback(PhysicalCard urukHai) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(urukHai), 3), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(urukHai), 3))); } } ); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_128.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_128.java index 3d08dce88..bd58d68f2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_128.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_128.java @@ -45,10 +45,10 @@ public class Card1_128 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard urukHai) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(urukHai), -1), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(urukHai), -1))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, Filters.sameCard(urukHai), Keyword.DAMAGE), Phase.SKIRMISH)); + new KeywordModifier(self, Filters.sameCard(urukHai), Keyword.DAMAGE))); } } ); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_139.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_139.java index 34761d739..4a029f441 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_139.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_139.java @@ -49,7 +49,7 @@ public class Card1_139 extends AbstractOldEvent { } else { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(urukHai), 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(urukHai), 2))); } } }); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java index 5e2fc51a3..88ef2c2f7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java @@ -52,8 +52,7 @@ public class Card1_145 extends AbstractMinion { int spotCount = getValidatedResult(result); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, spotCount) - , Phase.SKIRMISH)); + new StrengthModifier(self, self, spotCount))); } } )); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java index 69cc03104..66abb9333 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java @@ -46,8 +46,7 @@ public class Card1_147 extends AbstractMinion { protected void cardSelected(LotroGame game, PhysicalCard companion) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new CantBeAssignedAgainstModifier(self, Side.FREE_PEOPLE, Filters.sameCard(companion), self) - , Phase.ASSIGNMENT)); + new CantBeAssignedAgainstModifier(self, Side.FREE_PEOPLE, Filters.sameCard(companion), self))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_153.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_153.java index 6ad8cbf1d..9706fb43b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_153.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_153.java @@ -45,7 +45,7 @@ public class Card1_153 extends AbstractMinion { new AddUntilEndOfPhaseModifierEffect( new StrengthModifier(self, self, null, new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 3, - new ConstantEvaluator(1))), Phase.SKIRMISH)); + new ConstantEvaluator(1))))); return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_167.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_167.java index a84d06ed9..f6da9aaff 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_167.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_167.java @@ -36,7 +36,7 @@ public class Card1_167 extends AbstractOldEvent { int bonus = Math.min(4, Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Culture.MORIA, Race.ORC, Filters.not(Filters.sameCard(orc)))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(orc), bonus), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(orc), bonus))); } } ); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java index 2e3e22740..cac77013e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java @@ -55,7 +55,7 @@ public class Card1_190 extends AbstractAttachable { new ExertCharactersEffect(action, self, self.getAttachedTo())); 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); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_246.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_246.java index 0326d75fa..a7fbe475a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_246.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_246.java @@ -40,7 +40,7 @@ public class Card1_246 extends AbstractOldEvent { protected void burdensSpotted(int burdensSpotted) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(skirmish.getFellowshipCharacter()), -burdensSpotted), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(skirmish.getFellowshipCharacter()), -burdensSpotted))); } }); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_269.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_269.java index 2de5b7f21..bfb52813b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_269.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_269.java @@ -52,7 +52,7 @@ public class Card1_269 extends AbstractAttachable { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), null, - new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 3, new ConstantEvaluator(1))), Phase.SKIRMISH)); + new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 3, new ConstantEvaluator(1))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_278.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_278.java index 86b71e61c..7d024bccd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_278.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_278.java @@ -40,7 +40,7 @@ public class Card1_278 extends AbstractPermanent { protected void cardSelected(LotroGame game, PhysicalCard sauronOrc) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(sauronOrc), 1), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(sauronOrc), 1))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_286.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_286.java index c304f9146..290a0789a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_286.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_286.java @@ -48,7 +48,7 @@ public class Card1_286 extends AbstractAlly { protected void cardSelected(LotroGame game, PhysicalCard hobbit) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new OverwhelmedByMultiplierModifier(self, Filters.sameCard(hobbit), 3), Phase.SKIRMISH)); + new OverwhelmedByMultiplierModifier(self, Filters.sameCard(hobbit), 3))); } } ); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_293.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_293.java index cb68f8d06..f19d17f8e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_293.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_293.java @@ -47,7 +47,7 @@ public class Card1_293 extends AbstractOldEvent { protected void forEachCardExertedCallback(PhysicalCard hobbit) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(hobbit), 3), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(hobbit), 3))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_296.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_296.java index 5c473b7f9..6b86c82ac 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_296.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_296.java @@ -47,7 +47,7 @@ public class Card1_296 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard hobbit) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(hobbit), 3), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(hobbit), 3))); } }); } else { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_298.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_298.java index 97d390c79..0cc0e8b46 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_298.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_298.java @@ -48,7 +48,7 @@ public class Card1_298 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard hobbit) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(hobbit), 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(hobbit), 2))); } }); } else { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_302.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_302.java index dd67c368d..968d24e2c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_302.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_302.java @@ -50,7 +50,7 @@ public class Card1_302 extends AbstractCompanion { int merryStrength = game.getModifiersQuerying().getStrength(game.getGameState(), self); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(anotherCompanion), merryStrength), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(anotherCompanion), merryStrength))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_304.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_304.java index e625c73c1..bfff2517a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_304.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_304.java @@ -47,7 +47,7 @@ public class Card1_304 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard hobbit) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(hobbit), 3), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(hobbit), 3))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java index de3986b85..e294db3e6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java @@ -42,7 +42,7 @@ public class Card1_331 extends AbstractSite { protected void forEachCardExertedCallback(PhysicalCard character) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, character, 2), Phase.SKIRMISH)); + new StrengthModifier(self, character, 2))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_363.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_363.java index 316b54ce0..1c241eb94 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_363.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_363.java @@ -86,11 +86,11 @@ public class Card1_363 extends AbstractSite { else _action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new PlayersCantPlayPhaseEventsOrPhaseSpecialAbilitiesModifier(null, Phase.SHADOW), Phase.SHADOW)); + new PlayersCantPlayPhaseEventsOrPhaseSpecialAbilitiesModifier(null, Phase.SHADOW))); } else { _action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new PlayersCantPlayPhaseEventsOrPhaseSpecialAbilitiesModifier(null, Phase.SHADOW), Phase.SHADOW)); + new PlayersCantPlayPhaseEventsOrPhaseSpecialAbilitiesModifier(null, Phase.SHADOW))); } } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_204.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_204.java index 99c4a93ef..b52865639 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_204.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_204.java @@ -36,7 +36,7 @@ public class Card1_204 extends AbstractOldEvent { int bonus = (game.getGameState().isWearingRing()) ? 5 : 2; action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(nazgul), bonus), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(nazgul), bonus))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_210.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_210.java index 4907ff151..b0980540c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_210.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_210.java @@ -42,10 +42,10 @@ public class Card1_210 extends AbstractOldEvent { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(nazgul), (burdens >= 6) ? 3 : 1), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(nazgul), (burdens >= 6) ? 3 : 1))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, Filters.sameCard(nazgul), Keyword.DAMAGE, (burdens >= 6) ? 2 : 1), Phase.SKIRMISH)); + new KeywordModifier(self, Filters.sameCard(nazgul), Keyword.DAMAGE, (burdens >= 6) ? 2 : 1))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_213.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_213.java index f11d7eab8..c000ac308 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_213.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_213.java @@ -37,7 +37,7 @@ public class Card1_213 extends AbstractOldEvent { boolean notAssigned = Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.ringBearer, Filters.notAssignedToSkirmish); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(nazgul), notAssigned ? 2 : 3), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(nazgul), notAssigned ? 2 : 3))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_224.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_224.java index 72020e22c..2a8a317fb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_224.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_224.java @@ -68,7 +68,7 @@ public class Card1_224 extends AbstractResponseOldEvent { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new SpecialFlagModifier(self, ModifierFlag.RING_TEXT_INACTIVE), Phase.SKIRMISH)); + new SpecialFlagModifier(self, ModifierFlag.RING_TEXT_INACTIVE))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_227.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_227.java index fb9c8f875..f999050a5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_227.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_227.java @@ -36,7 +36,7 @@ public class Card1_227 extends AbstractOldEvent { int bonus = (game.getGameState().getBurdens() >= 5) ? 4 : 2; action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(nazgul), bonus), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(nazgul), bonus))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_229.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_229.java index 3ab279506..7b8cb434a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_229.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_229.java @@ -41,7 +41,7 @@ public class Card1_229 extends AbstractMinion { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new StrengthModifier(self, self, null, - new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 5, new ConstantEvaluator(1))), Phase.SKIRMISH)); + new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 5, new ConstantEvaluator(1))))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_238.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_238.java index e8af1b975..d37d1f4b9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_238.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_238.java @@ -42,7 +42,7 @@ public class Card1_238 extends AbstractPermanent { action.appendCost(new RemoveTwilightEffect(1)); 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/set17/men/Card17_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_045.java index c5ec5ea5f..7f81120d7 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 @@ -49,7 +49,7 @@ public class Card17_045 extends AbstractEvent { new DiscardCardsFromPlayEffect(self, possession)); subAction.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, minion, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, minion, Keyword.DAMAGE, 1))); action.appendEffect( new OptionalEffect(action, playerId, new StackActionEffect(subAction) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_024.java index 0d2c80d4f..bc228353d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_024.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_024.java @@ -32,11 +32,11 @@ public class Card20_024 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 (PlayConditions.canSpot(game, 2, Filters.siteControlled(playerId))) 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/set20/dunland/Card20_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_029.java index b631db35b..a1d2905c5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_029.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_029.java @@ -48,7 +48,7 @@ public class Card20_029 extends AbstractEvent { protected void cardSelected(LotroGame game, final PhysicalCard minion) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, minion, 3), Phase.SKIRMISH)); + new StrengthModifier(self, minion, 3))); action.appendEffect( new AddUntilEndOfPhaseActionProxyEffect( new AbstractActionProxy() { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_040.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_040.java index 880fafd03..6f07ed642 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_040.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_040.java @@ -45,10 +45,10 @@ public class Card20_040 extends AbstractEvent { new ReplaceInSkirmishEffect(gimli, Filters.unboundCompanion)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, gimli, new SpotCondition(gimli, Filters.inSkirmish), 2), Phase.SKIRMISH)); + new StrengthModifier(self, gimli, new SpotCondition(gimli, Filters.inSkirmish), 2))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, gimli, new SpotCondition(gimli, Filters.inSkirmish), Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, gimli, new SpotCondition(gimli, Filters.inSkirmish), Keyword.DAMAGE, 1))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_041.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_041.java index a78977f8a..d700ab507 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_041.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_041.java @@ -47,7 +47,7 @@ public class Card20_041 extends AbstractEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new CantTakeMoreThanXWoundsModifier(self, Phase.SKIRMISH, 1, card), Phase.SKIRMISH)); + new CantTakeMoreThanXWoundsModifier(self, Phase.SKIRMISH, 1, card))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_049.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_049.java index 3a487982d..c1f21795b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_049.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_049.java @@ -49,7 +49,7 @@ public class Card20_049 extends AbstractAttachable { new SelfDiscardEffect(self)); 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/set20/dwarven/Card20_059.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_059.java index 9f7b993cc..1221e436f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_059.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_059.java @@ -32,11 +32,11 @@ public class Card20_059 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 (PlayConditions.canSpot(game, Culture.DWARVEN, CardType.CONDITION, Filters.hasStacked(Filters.any))) 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/set20/dwarven/Card20_060.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_060.java index 76f9f45dc..e9fea7da4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_060.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_060.java @@ -37,10 +37,10 @@ public class Card20_060 extends AbstractEvent { protected void forEachCardExertedCallback(PhysicalCard character) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, character, 3), Phase.SKIRMISH)); + new StrengthModifier(self, character, 3))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, character, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, character, Keyword.DAMAGE, 1))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_070.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_070.java index cd5e17136..d2a1d1ca5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_070.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_070.java @@ -40,7 +40,7 @@ public class Card20_070 extends AbstractEvent { protected void discardingCardsCallback(Collection cards) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.SHADOW, -cards.size()), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.SHADOW, -cards.size()))); } } ); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_072.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_072.java index 5e626ada6..feaf92cf9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_072.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_072.java @@ -35,7 +35,7 @@ public class Card20_072 extends AbstractEvent { int x = Filters.countActive(game.getGameState(), game.getModifiersQuerying(), CardType.COMPANION, Keyword.ARCHER); action.appendCost( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.FREE_PEOPLE, -x), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.FREE_PEOPLE, -x))); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, x, x, CardType.CONDITION, Side.SHADOW)); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_078.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_078.java index 76d97263f..5f0cca1f4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_078.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_078.java @@ -47,7 +47,7 @@ public class Card20_078 extends AbstractPermanent { new SelfDiscardEffect(self)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 2), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 2))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_099.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_099.java index 99519ee57..56b69bd1c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_099.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_099.java @@ -47,7 +47,7 @@ public class Card20_099 extends AbstractAlly { new SelfExertEffect(action, self)); 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/set20/elven/Card20_102.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_102.java index 72b541704..bd6ffd15a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_102.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_102.java @@ -40,7 +40,7 @@ public class Card20_102 extends AbstractEvent { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new ArcheryTotalModifier(self, Side.FREE_PEOPLE, null, - new CountActiveEvaluator(Filters.siteControlledByShadowPlayer(playerId))), Phase.ARCHERY)); + new CountActiveEvaluator(Filters.siteControlledByShadowPlayer(playerId))))); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_106.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_106.java index 056a3c4fb..e3c789010 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_106.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_106.java @@ -32,7 +32,7 @@ public class Card20_106 extends AbstractEvent { int count = PlayConditions.location(game, Keyword.FOREST)?2:1; action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.FREE_PEOPLE, null, count), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.FREE_PEOPLE, null, count))); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_151.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_151.java index d17f7721c..d0b11b49e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_151.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_151.java @@ -32,14 +32,14 @@ public class Card20_151 extends AbstractEvent { if (initiative) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.gandalf, 4), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.gandalf, 4))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, Filters.gandalf, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, Filters.gandalf, Keyword.DAMAGE, 1))); } else { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.gandalf, 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.gandalf, 2))); } return action; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_153.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_153.java index 943e9e791..4c910ecf6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_153.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_153.java @@ -37,7 +37,7 @@ public class Card20_153 extends AbstractEvent { PlayEventAction action = new PlayEventAction(self); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new SidePlayerCantPlayPhaseEventsOrSpecialAbilitiesModifier(self, Side.SHADOW, Phase.SKIRMISH), Phase.SKIRMISH)); + new SidePlayerCantPlayPhaseEventsOrSpecialAbilitiesModifier(self, Side.SHADOW, Phase.SKIRMISH))); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_176.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_176.java index 28263e2c3..f2c394955 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_176.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_176.java @@ -50,7 +50,7 @@ public class Card20_176 extends AbstractCompanion { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, self, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, self, Keyword.DAMAGE, 1))); return Collections.singletonList(action); } if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_187.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_187.java index fe85a311d..f2e3d5408 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_187.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_187.java @@ -32,10 +32,10 @@ public class Card20_187 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/set20/gondor/Card20_192.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_192.java index de10d8bae..4e58df166 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_192.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_192.java @@ -51,7 +51,7 @@ public class Card20_192 extends AbstractAttachableFPPossession { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.name("Faramir"))); 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/set20/gondor/Card20_207.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_207.java index 2e69d96e1..acc0338f8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_207.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_207.java @@ -33,11 +33,11 @@ public class Card20_207 extends AbstractEvent { game.getGameState(), game.getModifiersQuerying(), ranger); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, ranger, matches?3:2), Phase.SKIRMISH)); + new StrengthModifier(self, ranger, matches?3:2))); if (matches) action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, ranger, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, ranger, Keyword.DAMAGE, 1))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/isengard/Card20_215.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/isengard/Card20_215.java index 7a2dfc3bc..83be8de7c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/isengard/Card20_215.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/isengard/Card20_215.java @@ -47,7 +47,7 @@ public class Card20_215 extends AbstractMinion { 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/set20/rohan/Card20_322.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/rohan/Card20_322.java index f5e365eb2..a48553f61 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/rohan/Card20_322.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/rohan/Card20_322.java @@ -33,7 +33,7 @@ public class Card20_322 extends AbstractEvent { if (Filters.and(Filters.inSkirmishAgainst(CardType.MINION, Filters.wounded)).accepts(game.getGameState(), game.getModifiersQuerying(), selectedCharacter)) action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, selectedCharacter, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, selectedCharacter, Keyword.DAMAGE, 1))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_380.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_380.java index 1aa90b053..050b1cece 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_380.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_380.java @@ -31,7 +31,7 @@ public class Card20_380 extends AbstractEvent { if (!PlayConditions.canSpotFPCultures(game, 2, playerId)) action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, selectedCharacter, Keyword.DAMAGE, 1), Phase.SKIRMISH)); + new KeywordModifier(self, selectedCharacter, Keyword.DAMAGE, 1))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_399.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_399.java index bbc625ade..a2974e3e4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_399.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_399.java @@ -51,7 +51,7 @@ public class Card20_399 extends AbstractAttachableFPPossession { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, 2, Filters.hasAttached(self))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new OverwhelmedByMultiplierModifier(self, self.getAttachedTo(), 3), Phase.SKIRMISH)); + new OverwhelmedByMultiplierModifier(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/set20/site/Card20_425.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_425.java index 34f83b956..234b969c8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_425.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_425.java @@ -40,7 +40,7 @@ public class Card20_425 extends AbstractSite { protected void forEachCardExertedCallback(PhysicalCard character) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, character, 2), Phase.SKIRMISH)); + new StrengthModifier(self, character, 2))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_437.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_437.java index bfba78c3b..8e01e5069 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_437.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_437.java @@ -41,7 +41,7 @@ public class Card20_437 extends AbstractSite { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.owner(playerId), Race.GOBLIN)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new SpecialFlagModifier(self, ModifierFlag.HAS_TO_MOVE_IF_POSSIBLE), Phase.REGROUP)); + new SpecialFlagModifier(self, ModifierFlag.HAS_TO_MOVE_IF_POSSIBLE))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_288.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_288.java index 121c589ca..497a11d6a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_288.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_288.java @@ -40,10 +40,10 @@ public class Card20_288 extends AbstractEvent { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(nazgul), (burdens >= 6) ? 3 : 1), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(nazgul), (burdens >= 6) ? 3 : 1))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, Filters.sameCard(nazgul), Keyword.DAMAGE, (burdens >= 6) ? 2 : 1), Phase.SKIRMISH)); + new KeywordModifier(self, Filters.sameCard(nazgul), Keyword.DAMAGE, (burdens >= 6) ? 2 : 1))); } }); return action;