From 11f13ce6858aea8438255ad0a6691cb26cfb9f88 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 10 Mar 2018 22:52:42 -0500 Subject: [PATCH] Fix to 4C15 "Dunlending Ravager" Assignment action properly allows an ally to participate in skirmishes --- .../lotro/cards/set4/dunland/Card4_015.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_015.java index f5bea53b8..4717035ba 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_015.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/dunland/Card4_015.java @@ -2,7 +2,9 @@ package com.gempukku.lotro.cards.set4.dunland; import com.gempukku.lotro.cards.AbstractMinion; import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.effects.AddUntilStartOfPhaseModifierEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndAssignCharacterToMinionEffect; +import com.gempukku.lotro.cards.modifiers.AllyParticipatesInArcheryFireAndSkirmishesModifier; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Phase; @@ -11,6 +13,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.ActivateCardAction; +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; @@ -53,7 +56,16 @@ public class Card4_015 extends AbstractMinion { && PlayConditions.canSpot(game, CardType.ALLY)) { final ActivateCardAction action = new ActivateCardAction(self); action.appendEffect( - new ChooseAndAssignCharacterToMinionEffect(action, playerId, self, true, CardType.ALLY)); + new ChooseActiveCardEffect(self, playerId, "Choose an Ally", CardType.ALLY) { + @Override + protected void cardSelected(LotroGame game, PhysicalCard card) { + action.appendEffect( + new AddUntilStartOfPhaseModifierEffect( + new AllyParticipatesInArcheryFireAndSkirmishesModifier(self, Filters.sameCard(card)), Phase.SKIRMISH)); + action.appendEffect( + new ChooseAndAssignCharacterToMinionEffect(action, playerId, self, true, Filters.sameCard(card))); + } + }); return Collections.singletonList(action); } return null;