From 93ba86d611cbc2c600627dfdbfce764aff6db6c9 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 7 Mar 2012 11:22:53 +0000 Subject: [PATCH] "Elendil's Army" --- .../lotro/cards/AbstractFollower.java | 5 ++- .../lotro/cards/set13/gandalf/Card13_028.java | 3 +- .../lotro/cards/set13/gandalf/Card13_037.java | 3 +- .../lotro/cards/set13/gandalf/Card13_038.java | 3 +- .../lotro/cards/set13/gollum/Card13_046.java | 2 +- .../lotro/cards/set13/shire/Card13_144.java | 3 +- .../lotro/cards/set13/shire/Card13_150.java | 3 +- .../lotro/cards/set13/shire/Card13_151.java | 3 +- .../lotro/cards/set15/elven/Card15_012.java | 3 +- .../lotro/cards/set15/elven/Card15_026.java | 3 +- .../lotro/cards/set15/rohan/Card15_134.java | 3 +- .../lotro/cards/set15/rohan/Card15_135.java | 3 +- .../lotro/cards/set15/rohan/Card15_137.java | 3 +- .../lotro/cards/set15/shire/Card15_146.java | 3 +- .../lotro/cards/set15/shire/Card15_147.java | 3 +- .../lotro/cards/set17/gandalf/Card17_020.java | 3 +- .../lotro/cards/set17/gandalf/Card17_022.java | 3 +- .../cards/set17/isengard/Card17_038.java | 3 +- .../lotro/cards/set18/elven/Card18_007.java | 3 +- .../lotro/cards/set18/elven/Card18_017.java | 3 +- .../lotro/cards/set18/gondor/Card18_047.java | 38 +++++++++++++++++++ 21 files changed, 78 insertions(+), 21 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_047.java diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractFollower.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractFollower.java index 7794a5622..fff6cd620 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractFollower.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractFollower.java @@ -11,6 +11,7 @@ import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -62,7 +63,7 @@ public abstract class AbstractFollower extends AbstractPermanent { protected abstract boolean canPayAidCost(LotroGame game, PhysicalCard self); - protected abstract Effect getAidCost(LotroGame game, PhysicalCard self); + protected abstract Effect getAidCost(LotroGame game, Action action, PhysicalCard self); protected Filterable getFollowerTarget(LotroGame game, PhysicalCard self) { return Filters.and(Filters.owner(self.getOwner()), Filters.or(CardType.COMPANION, CardType.MINION)); @@ -75,7 +76,7 @@ public abstract class AbstractFollower extends AbstractPermanent { && PlayConditions.canSpot(game, getFollowerTarget(game, self))) { final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( - getAidCost(game, self)); + getAidCost(game, action, self)); action.appendCost( new ChooseActiveCardEffect(self, playerId, "Choose character to transfer follower to", getFollowerTarget(game, self)) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_028.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_028.java index 891233e97..848e3ab73 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_028.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_028.java @@ -15,6 +15,7 @@ import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.modifiers.SpotCondition; import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -42,7 +43,7 @@ public class Card13_028 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddTwilightEffect(self, 2); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_037.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_037.java index 7e3e493c4..e1e872a22 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_037.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_037.java @@ -13,6 +13,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; import com.gempukku.lotro.logic.effects.AddTwilightEffect; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -40,7 +41,7 @@ public class Card13_037 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddTwilightEffect(self, 2); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_038.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_038.java index 8f8ac0a4d..1bb903ec3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_038.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gandalf/Card13_038.java @@ -11,6 +11,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.modifiers.SpotCondition; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -37,7 +38,7 @@ public class Card13_038 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddTwilightEffect(self, 2); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gollum/Card13_046.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gollum/Card13_046.java index 789ab0e83..e3f0b0d2f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gollum/Card13_046.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gollum/Card13_046.java @@ -50,7 +50,7 @@ public class Card13_046 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddBurdenEffect(self, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_144.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_144.java index 2bc3fece8..146c456af 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_144.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_144.java @@ -10,6 +10,7 @@ import com.gempukku.lotro.common.Side; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -38,7 +39,7 @@ public class Card13_144 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddBurdenEffect(self, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_150.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_150.java index 38c89d30a..268b04149 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_150.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_150.java @@ -13,6 +13,7 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -45,7 +46,7 @@ public class Card13_150 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddBurdenEffect(self, 2); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_151.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_151.java index 0fd4ab0be..2d836859a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_151.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/shire/Card13_151.java @@ -13,6 +13,7 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; import com.gempukku.lotro.logic.effects.HealCharactersEffect; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -41,7 +42,7 @@ public class Card13_151 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddBurdenEffect(self, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_012.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_012.java index 76ce4d368..e3c6dbb7e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_012.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_012.java @@ -14,6 +14,7 @@ import com.gempukku.lotro.logic.actions.RequiredTriggerAction; import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.modifiers.KeywordModifier; import com.gempukku.lotro.logic.modifiers.Modifier; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -40,7 +41,7 @@ public class Card15_012 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddTwilightEffect(self, 3); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_026.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_026.java index c8a2013c7..b0a360cc8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_026.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_026.java @@ -11,6 +11,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.modifiers.KeywordModifier; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -39,7 +40,7 @@ public class Card15_026 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddTwilightEffect(self, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_134.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_134.java index da00029a7..5c656ac14 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_134.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_134.java @@ -12,6 +12,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.modifiers.KeywordModifier; import com.gempukku.lotro.logic.modifiers.Modifier; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -38,7 +39,7 @@ public class Card15_134 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddTwilightEffect(self, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_135.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_135.java index 844ad9550..46c2e124e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_135.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_135.java @@ -13,6 +13,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; import com.gempukku.lotro.logic.effects.AddTwilightEffect; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -39,7 +40,7 @@ public class Card15_135 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddTwilightEffect(self, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_137.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_137.java index a2578130b..5db3bc39c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_137.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_137.java @@ -13,6 +13,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -38,7 +39,7 @@ public class Card15_137 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddTwilightEffect(self, 2); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_146.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_146.java index 93fc6dd7c..9949c1cc3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_146.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_146.java @@ -14,6 +14,7 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -48,7 +49,7 @@ public class Card15_146 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddBurdenEffect(self, 2); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_147.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_147.java index 80a9af5c6..920652a35 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_147.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_147.java @@ -10,6 +10,7 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -37,7 +38,7 @@ public class Card15_147 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddBurdenEffect(self, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_020.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_020.java index b917bd3a3..d47ae7f5b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_020.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_020.java @@ -15,6 +15,7 @@ import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.effects.AddThreatsEffect; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -44,7 +45,7 @@ public class Card17_020 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddThreatsEffect(self.getOwner(), self, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_022.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_022.java index 8b487d6cc..4dd2b7741 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_022.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_022.java @@ -12,6 +12,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import java.util.Collections; @@ -37,7 +38,7 @@ public class Card17_022 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddTwilightEffect(self, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/isengard/Card17_038.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/isengard/Card17_038.java index 027808904..2124fe3c0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/isengard/Card17_038.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/isengard/Card17_038.java @@ -11,6 +11,7 @@ import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -38,7 +39,7 @@ public class Card17_038 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new RemoveTwilightEffect(1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_007.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_007.java index 269c7b4b0..d34416e79 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_007.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_007.java @@ -11,6 +11,7 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.effects.AddTwilightEffect; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -44,7 +45,7 @@ public class Card18_007 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddTwilightEffect(self, 2); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_017.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_017.java index 7f9c4cedc..47fb79390 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_017.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/elven/Card18_017.java @@ -11,6 +11,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.effects.DrawCardsEffect; +import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -38,7 +39,7 @@ public class Card18_017 extends AbstractFollower { } @Override - protected Effect getAidCost(LotroGame game, PhysicalCard self) { + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { return new AddTwilightEffect(self, 2); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_047.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_047.java new file mode 100644 index 000000000..75feb0eea --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_047.java @@ -0,0 +1,38 @@ +package com.gempukku.lotro.cards.set18.gondor; + +import com.gempukku.lotro.cards.AbstractFollower; +import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect; +import com.gempukku.lotro.common.CardType; +import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Side; +import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.timing.Effect; + +/** + * Set: Treachery & Deceit + * Side: Free + * Culture: Gondor + * Twilight Cost: 0 + * Type: Follower + * Strength: +2 + * Game Text: Aid - Exert a [GONDOR] companion. (At the start of the maneuver phase, you may exert a [GONDOR] companion + * to transfer this to a companion.) + */ +public class Card18_047 extends AbstractFollower { + public Card18_047() { + super(Side.FREE_PEOPLE, 0, 2, 0, 0, Culture.GONDOR, "Elendil's Army", true); + } + + @Override + protected boolean canPayAidCost(LotroGame game, PhysicalCard self) { + return PlayConditions.canExert(self, game, Culture.GONDOR, CardType.COMPANION); + } + + @Override + protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) { + return new ChooseAndExertCharactersEffect(action, self.getOwner(), 1, 1, Culture.GONDOR, CardType.COMPANION); + } +}