diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_060.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_060.java index 885c91534..f03a6f7c0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_060.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_060.java @@ -1,6 +1,6 @@ package com.gempukku.lotro.cards.set18.men; -import com.gempukku.lotro.cards.AbstractAttachableFPPossession; +import com.gempukku.lotro.cards.AbstractAttachable; import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.effects.AddUntilStartOfPhaseModifierEffect; import com.gempukku.lotro.cards.effects.ReinforceTokenEffect; @@ -11,6 +11,8 @@ 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.modifiers.KeywordModifier; +import com.gempukku.lotro.logic.modifiers.Modifier; +import com.gempukku.lotro.logic.modifiers.StrengthModifier; import com.gempukku.lotro.logic.timing.Action; import java.util.Collections; @@ -26,9 +28,9 @@ import java.util.List; * Game Text: Bearer must be a [MEN] minion. Skirmish: Remove (3) to reinforce a [MEN] token and make bearer fierce * until the regroup phase. */ -public class Card18_060 extends AbstractAttachableFPPossession { +public class Card18_060 extends AbstractAttachable { public Card18_060() { - super(1, 2, 0, Culture.MEN, PossessionClass.HAND_WEAPON, "Corsair Boarding Axe"); + super(Side.SHADOW, CardType.POSSESSION, 1, Culture.MEN, PossessionClass.HAND_WEAPON, "Corsair Boarding Axe"); } @Override @@ -37,7 +39,12 @@ public class Card18_060 extends AbstractAttachableFPPossession { } @Override - protected List getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) { + public Modifier getAlwaysOnModifier(PhysicalCard self) { + return new StrengthModifier(self, Filters.hasAttached(self), 2); + } + + @Override + protected List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SKIRMISH, self, 3)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_061.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_061.java index 6a04a080c..57db42ebb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_061.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_061.java @@ -1,6 +1,6 @@ package com.gempukku.lotro.cards.set18.men; -import com.gempukku.lotro.cards.AbstractAttachableFPPossession; +import com.gempukku.lotro.cards.AbstractAttachable; import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.cards.effects.TakeControlOfASiteEffect; @@ -11,9 +11,11 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.modifiers.KeywordModifier; import com.gempukku.lotro.logic.modifiers.Modifier; +import com.gempukku.lotro.logic.modifiers.StrengthModifier; import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collections; +import java.util.LinkedList; import java.util.List; /** @@ -26,9 +28,9 @@ import java.util.List; * Game Text: Bearer must be a [MEN] minion. Bearer is an archer. Each time a companion is killed during * the archery phase, you may control a site. */ -public class Card18_061 extends AbstractAttachableFPPossession { +public class Card18_061 extends AbstractAttachable { public Card18_061() { - super(2, 1, 0, Culture.MEN, PossessionClass.RANGED_WEAPON, "Corsair Bow"); + super(Side.SHADOW, CardType.POSSESSION, 2, Culture.MEN, PossessionClass.RANGED_WEAPON, "Corsair Bow"); } @Override @@ -37,9 +39,13 @@ public class Card18_061 extends AbstractAttachableFPPossession { } @Override - protected List getNonBasicStatsModifiers(PhysicalCard self) { - return Collections.singletonList( + public List getAlwaysOnModifiers(LotroGame game, PhysicalCard self) { + List modifiers = new LinkedList(); + modifiers.add( + new StrengthModifier(self, Filters.hasAttached(self), 1)); + modifiers.add( new KeywordModifier(self, Filters.hasAttached(self), Keyword.ARCHER)); + return modifiers; } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_062.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_062.java new file mode 100644 index 000000000..e1cf37b45 --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_062.java @@ -0,0 +1,64 @@ +package com.gempukku.lotro.cards.set18.men; + +import com.gempukku.lotro.cards.AbstractAttachable; +import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.TriggerConditions; +import com.gempukku.lotro.cards.effects.ReinforceTokenEffect; +import com.gempukku.lotro.cards.effects.TakeControlOfASiteEffect; +import com.gempukku.lotro.common.*; +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.modifiers.Modifier; +import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.timing.EffectResult; + +import java.util.Collections; +import java.util.List; + +/** + * Set: Treachery & Deceit + * Side: Shadow + * Culture: Men + * Twilight Cost: 2 + * Type: Possession • Hand Weapon + * Strength: +1 + * Game Text: Bearer must be a [MEN] minion. When you play this possession you may reinforce a [MEN] token twice. + * Each time a companion is killed during a skirmish phase, you may control a site. + */ +public class Card18_062 extends AbstractAttachable { + public Card18_062() { + super(Side.SHADOW, CardType.POSSESSION, 2, Culture.MEN, PossessionClass.HAND_WEAPON, "Corsair Grappling Hook"); + } + + @Override + protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) { + return Filters.and(Culture.MEN, CardType.MINION); + } + + @Override + public Modifier getAlwaysOnModifier(PhysicalCard self) { + return new StrengthModifier(self, Filters.hasAttached(self), 1); + } + + @Override + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (TriggerConditions.played(game, effectResult, self)) { + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.appendEffect( + new ReinforceTokenEffect(self, playerId, Token.MEN)); + action.appendEffect( + new ReinforceTokenEffect(self, playerId, Token.MEN)); + return Collections.singletonList(action); + } + if (TriggerConditions.forEachKilled(game, effectResult, CardType.COMPANION) + && PlayConditions.isPhase(game, Phase.SKIRMISH)) { + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.appendEffect( + new TakeControlOfASiteEffect(self, playerId)); + return Collections.singletonList(action); + } + return null; + } +}