From 926b7badb4835ef361d9644dcd8fc1e70c22a04c Mon Sep 17 00:00:00 2001 From: marcins78 Date: Thu, 14 Feb 2013 16:30:48 +0000 Subject: [PATCH] Code lift and review of old cards. --- .../com/gempukku/lotro/cards/set4/isengard/Card4_151.java | 2 +- .../com/gempukku/lotro/cards/set4/isengard/Card4_152.java | 2 +- .../com/gempukku/lotro/cards/set4/isengard/Card4_156.java | 2 +- .../com/gempukku/lotro/cards/set4/isengard/Card4_160.java | 2 +- .../com/gempukku/lotro/cards/set4/isengard/Card4_161.java | 2 +- .../com/gempukku/lotro/cards/set4/isengard/Card4_169.java | 2 +- .../com/gempukku/lotro/cards/set4/isengard/Card4_175.java | 2 +- .../com/gempukku/lotro/cards/set4/isengard/Card4_183.java | 2 +- .../com/gempukku/lotro/cards/set4/isengard/Card4_184.java | 2 +- .../com/gempukku/lotro/cards/set4/isengard/Card4_191.java | 2 +- .../com/gempukku/lotro/cards/set4/isengard/Card4_208.java | 2 +- .../com/gempukku/lotro/cards/set4/isengard/Card4_210.java | 4 ++-- .../com/gempukku/lotro/cards/set4/isengard/Card4_211.java | 2 +- .../com/gempukku/lotro/cards/set4/raider/Card4_219.java | 2 +- .../com/gempukku/lotro/cards/set4/raider/Card4_225.java | 6 +++--- .../com/gempukku/lotro/cards/set4/raider/Card4_232.java | 2 +- .../com/gempukku/lotro/cards/set4/raider/Card4_233.java | 4 ++-- .../com/gempukku/lotro/cards/set4/raider/Card4_237.java | 2 +- .../com/gempukku/lotro/cards/set4/raider/Card4_239.java | 2 +- .../com/gempukku/lotro/cards/set4/raider/Card4_241.java | 2 +- .../com/gempukku/lotro/cards/set4/raider/Card4_243.java | 2 +- .../com/gempukku/lotro/cards/set4/raider/Card4_248.java | 2 +- .../com/gempukku/lotro/cards/set4/raider/Card4_261.java | 2 +- .../java/com/gempukku/lotro/cards/set4/rohan/Card4_262.java | 2 +- .../java/com/gempukku/lotro/cards/set4/rohan/Card4_273.java | 2 +- .../java/com/gempukku/lotro/cards/set4/rohan/Card4_281.java | 2 +- .../java/com/gempukku/lotro/cards/set4/rohan/Card4_297.java | 4 ++-- .../java/com/gempukku/lotro/cards/set4/shire/Card4_307.java | 2 +- .../java/com/gempukku/lotro/cards/set4/shire/Card4_319.java | 2 +- .../java/com/gempukku/lotro/cards/set4/shire/Card4_321.java | 2 +- .../java/com/gempukku/lotro/cards/set5/elven/Card5_011.java | 2 +- .../com/gempukku/lotro/cards/set5/gandalf/Card5_015.java | 2 +- .../com/gempukku/lotro/cards/set5/gandalf/Card5_017.java | 2 +- .../com/gempukku/lotro/cards/set5/gandalf/Card5_019.java | 2 +- .../com/gempukku/lotro/cards/set5/gollum/Card5_027.java | 2 +- .../com/gempukku/lotro/cards/set5/gollum/Card5_029.java | 4 ++-- .../com/gempukku/lotro/cards/set5/isengard/Card5_044.java | 2 +- .../com/gempukku/lotro/cards/set5/isengard/Card5_046.java | 2 +- .../com/gempukku/lotro/cards/set5/isengard/Card5_068.java | 2 +- .../java/com/gempukku/lotro/cards/set5/rohan/Card5_082.java | 4 ++-- .../java/com/gempukku/lotro/cards/set5/rohan/Card5_087.java | 2 +- .../java/com/gempukku/lotro/cards/set5/rohan/Card5_094.java | 2 +- .../com/gempukku/lotro/cards/set5/sauron/Card5_096.java | 2 +- .../java/com/gempukku/lotro/cards/set5/shire/Card5_116.java | 4 ++-- .../java/com/gempukku/lotro/cards/set5/site/Card5_118.java | 2 +- 45 files changed, 53 insertions(+), 53 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_151.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_151.java index 405873ae7..eda14c83f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_151.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_151.java @@ -38,7 +38,7 @@ public class Card4_151 extends AbstractOldEvent { int bonus = (game.getModifiersQuerying().hasKeyword(game.getGameState(), game.getGameState().getCurrentSite(), Keyword.BATTLEGROUND)) ? 3 : 2; action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), bonus))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_152.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_152.java index 3dcf6f058..3c1cb3cfd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_152.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_152.java @@ -35,7 +35,7 @@ public class Card4_152 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new CantBeAssignedToSkirmishModifier(self, Filters.sameCard(card)), Phase.ASSIGNMENT)); + new CantBeAssignedToSkirmishModifier(self, Filters.sameCard(card)))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_156.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_156.java index c8a3a2f71..324802b19 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_156.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_156.java @@ -37,7 +37,7 @@ public class Card4_156 extends AbstractOldEvent { (Filters.inSkirmishAgainst(Filters.hasAttached(Keyword.SEARCH)).accepts(game.getGameState(), game.getModifiersQuerying(), card)) ? 4 : 2; action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), bonus))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_160.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_160.java index c3b490e1a..ec6611c6b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_160.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_160.java @@ -49,7 +49,7 @@ public class Card4_160 extends AbstractMinion { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new CantTakeWoundsModifier(self, Filters.sameCard(card)), Phase.SKIRMISH)); + new CantTakeWoundsModifier(self, Filters.sameCard(card)))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_161.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_161.java index a3c834384..a98a16771 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_161.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_161.java @@ -42,7 +42,7 @@ public class Card4_161 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), -2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), -2))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_169.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_169.java index f1efdcf3e..c7433c316 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_169.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_169.java @@ -56,7 +56,7 @@ public class Card4_169 extends AbstractMinion { new ChooseAndWoundCharactersEffect(action, game.getGameState().getCurrentPlayerId(), 1, 1, Filters.unboundCompanion)); 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/set4/isengard/Card4_175.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_175.java index 4366b6bab..ba4bcf5cb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_175.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_175.java @@ -52,7 +52,7 @@ public class Card4_175 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 3), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 3))); } }); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_183.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_183.java index 18a53bf0b..b233078ab 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_183.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_183.java @@ -48,7 +48,7 @@ public class Card4_183 extends AbstractMinion { new ChooseAndWoundCharactersEffect(action, game.getGameState().getCurrentPlayerId(), 1, 1, Filters.unboundCompanion)); 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/set4/isengard/Card4_184.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_184.java index 6412b874b..64b87e312 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_184.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_184.java @@ -50,7 +50,7 @@ public class Card4_184 extends AbstractMinion { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 2))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_191.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_191.java index 2609f8418..04941d4b6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_191.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_191.java @@ -50,7 +50,7 @@ public class Card4_191 extends AbstractMinion { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 1), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 1))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_208.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_208.java index dc8fc69aa..04e6a2b11 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_208.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_208.java @@ -36,7 +36,7 @@ public class Card4_208 extends AbstractOldEvent { int bonus = 2 * Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.attachedTo(Filters.inSkirmishAgainst(card))); action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), bonus))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_210.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_210.java index d25f62812..aacea11cd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_210.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_210.java @@ -34,11 +34,11 @@ public class Card4_210 extends AbstractOldEvent { boolean controlsSite = Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.siteControlled(playerId)) > 0; action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, 2), Phase.SKIRMISH)); + new StrengthModifier(self, card, 2))); if (controlsSite) action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, card, Keyword.DAMAGE), Phase.SKIRMISH)); + new KeywordModifier(self, card, Keyword.DAMAGE))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_211.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_211.java index 65c98df48..a44a5ccab 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_211.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_211.java @@ -52,7 +52,7 @@ public class Card4_211 extends AbstractPermanent { new RemoveTokenEffect(self, self, Token.ISENGARD, 2)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.SHADOW, 2), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.SHADOW, 2))); action.appendEffect( new SelfDiscardEffect(self)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_219.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_219.java index e118240b9..43e09538a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_219.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_219.java @@ -46,7 +46,7 @@ public class Card4_219 extends AbstractMinion { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.COMPANION, Filters.not(Filters.ringBearer))); 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/set4/raider/Card4_225.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_225.java index 0fbf672ef..fb3337133 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_225.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_225.java @@ -56,7 +56,7 @@ public class Card4_225 extends AbstractMinion { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 2))); } }); actions.add(action); @@ -72,7 +72,7 @@ public class Card4_225 extends AbstractMinion { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 3), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 3))); } }); actions.add(action); @@ -88,7 +88,7 @@ public class Card4_225 extends AbstractMinion { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 4), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 4))); } }); actions.add(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_232.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_232.java index 0d9599184..e44dcc662 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_232.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_232.java @@ -46,7 +46,7 @@ public class Card4_232 extends AbstractMinion { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.COMPANION, Filters.not(Filters.ringBearer))); 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/set4/raider/Card4_233.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_233.java index f6fb73f70..c0853c793 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_233.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_233.java @@ -44,7 +44,7 @@ public class Card4_233 extends AbstractOldEvent { int bonus = Math.min(5, game.getGameState().getBurdens()); action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, bonus), Phase.SKIRMISH)); + new StrengthModifier(self, card, bonus))); } }); possibleEffects.add( @@ -58,7 +58,7 @@ public class Card4_233 extends AbstractOldEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, 2), Phase.SKIRMISH)); + new StrengthModifier(self, card, 2))); } }); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_237.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_237.java index a94ae2a8f..86d45e7c9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_237.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_237.java @@ -64,7 +64,7 @@ public class Card4_237 extends AbstractPermanent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, 2), Phase.SKIRMISH)); + new StrengthModifier(self, card, 2))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_239.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_239.java index 2efd74bc7..8cc87ec0a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_239.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_239.java @@ -35,7 +35,7 @@ public class Card4_239 extends AbstractOldEvent { int bonus = (game.getGameState().getBurdens() >= 4) ? 4 : 3; action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, card, bonus), Phase.SKIRMISH)); + new StrengthModifier(self, card, bonus))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_241.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_241.java index d29c21878..084917edb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_241.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_241.java @@ -34,7 +34,7 @@ public class Card4_241 extends AbstractOldEvent { int bonus = (PlayConditions.canSpot(game, 6, CardType.COMPANION)) ? 5 : 3; action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), bonus))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_243.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_243.java index bd1708456..18d1dc102 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_243.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_243.java @@ -40,7 +40,7 @@ public class Card4_243 extends AbstractOldEvent { int total = Math.min(5, game.getGameState().getBurdens()); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.SHADOW, total), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.SHADOW, total))); return action; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_248.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_248.java index 2d6db727b..4dbc0f333 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_248.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_248.java @@ -46,7 +46,7 @@ public class Card4_248 extends AbstractMinion { new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.COMPANION, Filters.not(Filters.ringBearer))); 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/set4/raider/Card4_261.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_261.java index 3ca2d3df2..c84bc2141 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_261.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/raider/Card4_261.java @@ -69,7 +69,7 @@ public class Card4_261 extends AbstractPermanent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 2))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_262.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_262.java index c8e3cb2f8..3639bc008 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_262.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_262.java @@ -40,7 +40,7 @@ public class Card4_262 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/set4/rohan/Card4_273.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_273.java index 801138800..e8e64bf97 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_273.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_273.java @@ -33,7 +33,7 @@ public class Card4_273 extends AbstractOldEvent { int bonus = Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Keyword.VILLAGER) ? 3 : 2; action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), bonus))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_281.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_281.java index 8f678cfc2..062d14274 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_281.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_281.java @@ -50,7 +50,7 @@ public class Card4_281 extends AbstractAlly { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 2))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_297.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_297.java index 266010c71..2006f8abd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_297.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/rohan/Card4_297.java @@ -33,13 +33,13 @@ public class Card4_297 extends AbstractEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 2))); boolean mounted = Filters.mounted.accepts(game.getGameState(), game.getModifiersQuerying(), card); if (mounted) action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE, 2), Phase.SKIRMISH)); + new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE, 2))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java index 7a3a8feeb..fdb81ce75 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_307.java @@ -50,7 +50,7 @@ public class Card4_307 extends AbstractEvent { protected void forEachCardExertedCallback(final PhysicalCard character) { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(character), 3), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(character), 3))); action.appendEffect( new AddUntilEndOfPhaseActionProxyEffect( new AbstractActionProxy() { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_319.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_319.java index 5baa66fe4..00fba2f98 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_319.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_319.java @@ -40,7 +40,7 @@ public class Card4_319 extends AbstractEvent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new OverwhelmedByMultiplierModifier(self, Filters.sameCard(card), 3), Phase.SKIRMISH)); + new OverwhelmedByMultiplierModifier(self, Filters.sameCard(card), 3))); } }); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_321.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_321.java index 96501e66e..0331e18c1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_321.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_321.java @@ -39,7 +39,7 @@ public class Card4_321 extends AbstractEvent { protected void cardSelected(LotroGame game, final PhysicalCard hobbit) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new CantTakeMoreThanXWoundsModifier(self, Phase.SKIRMISH, 1, hobbit), Phase.SKIRMISH)); + new CantTakeMoreThanXWoundsModifier(self, Phase.SKIRMISH, 1, hobbit))); } }); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/elven/Card5_011.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/elven/Card5_011.java index d4a98df4d..2686a01b5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/elven/Card5_011.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/elven/Card5_011.java @@ -36,7 +36,7 @@ public class Card5_011 extends AbstractEvent { new ChooseAndExertCharactersEffect(action, playerId, 3, 3, Race.ELF, CardType.COMPANION)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 2), Phase.ARCHERY)); + new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 2))); return action; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_015.java index 708c0f25d..754bd4c37 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_015.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_015.java @@ -76,7 +76,7 @@ public class Card5_015 extends AbstractCompanion { new ChoiceEffect(action, playerId, possibleCosts)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new UnhastyCompanionParticipatesInSkirmishedModifier(self, self), Phase.ASSIGNMENT)); + new UnhastyCompanionParticipatesInSkirmishedModifier(self, self))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_017.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_017.java index 332d0e217..ca2578f20 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_017.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_017.java @@ -65,7 +65,7 @@ public class Card5_017 extends AbstractCompanion { new ChoiceEffect(action, playerId, possibleCosts)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new UnhastyCompanionParticipatesInSkirmishedModifier(self, self), Phase.ASSIGNMENT)); + new UnhastyCompanionParticipatesInSkirmishedModifier(self, self))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_019.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_019.java index 347160cf5..d1cac7d2c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_019.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_019.java @@ -64,7 +64,7 @@ public class Card5_019 extends AbstractCompanion { new ChoiceEffect(action, playerId, possibleCosts)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new UnhastyCompanionParticipatesInSkirmishedModifier(self, self), Phase.ASSIGNMENT)); + new UnhastyCompanionParticipatesInSkirmishedModifier(self, self))); return Collections.singletonList(action); } if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gollum/Card5_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gollum/Card5_027.java index 30ff2709a..2726d4cda 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gollum/Card5_027.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gollum/Card5_027.java @@ -57,7 +57,7 @@ public class Card5_027 extends AbstractAttachable { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE), Phase.SKIRMISH)); + new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gollum/Card5_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gollum/Card5_029.java index aee65ec18..d99583ca4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gollum/Card5_029.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gollum/Card5_029.java @@ -52,10 +52,10 @@ public class Card5_029 extends AbstractCompanion { new AddBurdenEffect(self.getOwner(), self, 1)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, 2), Phase.SKIRMISH)); + new StrengthModifier(self, self, 2))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new CantTakeWoundsModifier(self, self), Phase.SKIRMISH)); + new CantTakeWoundsModifier(self, self))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_044.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_044.java index f05000609..be8eff326 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_044.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_044.java @@ -54,7 +54,7 @@ public class Card5_044 extends AbstractPermanent { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE), Phase.SKIRMISH)); + new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE))); } }); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_046.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_046.java index 65291fc01..5f736f646 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_046.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_046.java @@ -68,7 +68,7 @@ public class Card5_046 extends AbstractMinion { new SelfExertEffect(action, self)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, 8), Phase.SKIRMISH)); + new StrengthModifier(self, self, 8))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_068.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_068.java index b45ae6ddf..bb3957dbf 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_068.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_068.java @@ -37,7 +37,7 @@ public class Card5_068 extends AbstractEvent { boolean isMounted = Filters.mounted.accepts(game.getGameState(), game.getModifiersQuerying(), card); action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 2))); if (isMounted) action.appendEffect( new HealCharactersEffect(self, card)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_082.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_082.java index 064c372a9..d1927b386 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_082.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_082.java @@ -61,10 +61,10 @@ public class Card5_082 extends AbstractCompanion { }); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, self, 2), Phase.SKIRMISH)); + new StrengthModifier(self, self, 2))); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, self, Keyword.DAMAGE), Phase.SKIRMISH)); + new KeywordModifier(self, self, Keyword.DAMAGE))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_087.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_087.java index f1f2d2bbd..8cd6fd1b2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_087.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_087.java @@ -48,7 +48,7 @@ public class Card5_087 extends AbstractPermanent { }); possibleEffects.add( new AddUntilEndOfPhaseModifierEffect( - new ArcheryTotalModifier(self, Side.SHADOW, -3), Phase.ARCHERY) { + new ArcheryTotalModifier(self, Side.SHADOW, -3)) { @Override public String getText(LotroGame game) { return "Make the minion archery total -3"; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_094.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_094.java index 1418c2ee7..dc8d93ccd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_094.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/rohan/Card5_094.java @@ -45,7 +45,7 @@ public class Card5_094 extends AbstractPermanent { boolean atPlains = game.getModifiersQuerying().hasKeyword(game.getGameState(), game.getGameState().getCurrentSite(), Keyword.PLAINS); action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 3), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 3))); if (atPlains) action.appendEffect( new HealCharactersEffect(self, card)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/sauron/Card5_096.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/sauron/Card5_096.java index c9d0b6059..93c819674 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/sauron/Card5_096.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/sauron/Card5_096.java @@ -41,7 +41,7 @@ public class Card5_096 extends AbstractEvent { int ringBoundCompanions = Filters.countActive(game.getGameState(), game.getModifiersQuerying(), CardType.COMPANION, Keyword.RING_BOUND); action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), -ringBoundCompanions), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), -ringBoundCompanions))); } }); return action; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_116.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_116.java index d4e55e411..317b0912a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_116.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_116.java @@ -52,11 +52,11 @@ public class Card5_116 extends AbstractAttachableFPPossession { if (card.getBlueprint().getName().equals("Smeagol")) action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), 2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), 2))); else action.insertEffect( new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(card), -2), Phase.SKIRMISH)); + new StrengthModifier(self, Filters.sameCard(card), -2))); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/site/Card5_118.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/site/Card5_118.java index 68bd3a220..c2576aece 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/site/Card5_118.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/site/Card5_118.java @@ -41,7 +41,7 @@ public class Card5_118 extends AbstractSite { new RemoveTwilightEffect(9)); 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;