From 635aa6fd088eac1c4527448edd868187445bd4db Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sun, 2 Sep 2012 18:55:38 +0000 Subject: [PATCH] - "Slow-kindled Courage" and other FP conditions that give Assignment actions to minions, now actually do that. --- .../lotro/cards/set7/dwarven/Card7_013.java | 2 +- .../lotro/cards/set7/elven/Card7_015.java | 2 +- .../lotro/cards/set7/gandalf/Card7_049.java | 2 +- .../lotro/cards/set7/gollum/Card7_077.java | 2 +- .../lotro/cards/set7/gondor/Card7_126.java | 2 +- .../lotro/cards/set7/shire/Card7_328.java | 2 +- .../gempukku/lotro/at/AssignmentAtTest.java | 48 ++++++++++++++++++- .../src/main/webapp/includes/changeLog.html | 3 ++ 8 files changed, 55 insertions(+), 8 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_013.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_013.java index a9ff148b5..b45b234ca 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_013.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/dwarven/Card7_013.java @@ -45,7 +45,7 @@ public class Card7_013 extends AbstractAttachable { new AddActionToCardModifier(self, null, CardType.MINION) { @Override protected ActivateCardAction createExtraPhaseAction(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard matchingCard) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard)) { + if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard, 0)) { ActivateCardAction action = new ActivateCardAction(matchingCard); action.setText("Assign to " + GameUtils.getFullName(self.getAttachedTo())); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_015.java index 84bb030e2..c623ad742 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_015.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/elven/Card7_015.java @@ -50,7 +50,7 @@ public class Card7_015 extends AbstractAttachable { new AddActionToCardModifier(self, null, CardType.MINION) { @Override protected ActivateCardAction createExtraPhaseAction(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard matchingCard) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard)) { + if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard, 0)) { ActivateCardAction action = new ActivateCardAction(matchingCard); action.setText("Assign to " + GameUtils.getFullName(self.getAttachedTo())); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gandalf/Card7_049.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gandalf/Card7_049.java index a0d323168..5bc67d2c2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gandalf/Card7_049.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gandalf/Card7_049.java @@ -45,7 +45,7 @@ public class Card7_049 extends AbstractAttachable { new AddActionToCardModifier(self, null, CardType.MINION) { @Override protected ActivateCardAction createExtraPhaseAction(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard matchingCard) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard)) { + if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard, 0)) { ActivateCardAction action = new ActivateCardAction(matchingCard); action.setText("Assign to Gandalf"); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gollum/Card7_077.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gollum/Card7_077.java index 9377ffc56..0ce4665e4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gollum/Card7_077.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gollum/Card7_077.java @@ -46,7 +46,7 @@ public class Card7_077 extends AbstractAttachable { new AddActionToCardModifier(self, null, CardType.MINION) { @Override protected ActivateCardAction createExtraPhaseAction(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard matchingCard) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard)) { + if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard, 0)) { ActivateCardAction action = new ActivateCardAction(matchingCard); action.setText("Assign to " + GameUtils.getFullName(self.getAttachedTo())); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_126.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_126.java index 485c633f9..3b69ebd4a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_126.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_126.java @@ -46,7 +46,7 @@ public class Card7_126 extends AbstractAttachable { new AddActionToCardModifier(self, null, CardType.MINION) { @Override protected ActivateCardAction createExtraPhaseAction(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard matchingCard) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard)) { + if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard, 0)) { ActivateCardAction action = new ActivateCardAction(matchingCard); action.setText("Assign to " + GameUtils.getFullName(self.getAttachedTo())); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_328.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_328.java index dc5797c50..626c8c491 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_328.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_328.java @@ -46,7 +46,7 @@ public class Card7_328 extends AbstractAttachable { new AddActionToCardModifier(self, null, CardType.MINION) { @Override protected ActivateCardAction createExtraPhaseAction(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard matchingCard) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard)) { + if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.ASSIGNMENT, matchingCard, 0)) { ActivateCardAction action = new ActivateCardAction(matchingCard); action.setText("Assign to " + GameUtils.getFullName(self.getAttachedTo())); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/AssignmentAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/AssignmentAtTest.java index e7aba7cf2..8bdf17cb9 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/AssignmentAtTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/AssignmentAtTest.java @@ -11,14 +11,13 @@ import com.gempukku.lotro.logic.decisions.AwaitingDecisionType; import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException; import com.gempukku.lotro.logic.modifiers.KeywordModifier; import com.gempukku.lotro.logic.vo.LotroDeck; +import static junit.framework.Assert.*; import org.junit.Test; import java.util.HashMap; import java.util.List; import java.util.Map; -import static junit.framework.Assert.*; - public class AssignmentAtTest extends AbstractAtTest { @Test public void orcAssassinAssignNotToAlly() throws DecisionResultInvalidException { @@ -508,4 +507,49 @@ public class AssignmentAtTest extends AbstractAtTest { assertEquals(1, secondAssignment.getShadowCharacters().size()); assertTrue(secondAssignment.getShadowCharacters().contains(orcAssassin2)); } + + @Test + public void slowKindledCourageAllowsMinionsToAssign() throws DecisionResultInvalidException { + initializeSimplestGame(); + + skipMulligans(); + + PhysicalCardImpl merry = new PhysicalCardImpl(100, "1_303", P1, _library.getLotroCardBlueprint("1_303")); + PhysicalCardImpl slowKindledCourage = new PhysicalCardImpl(101, "7_328", P1, _library.getLotroCardBlueprint("7_328")); + PhysicalCardImpl urukHaiRaidingParty = new PhysicalCardImpl(102, "1_158", P2, _library.getLotroCardBlueprint("1_158")); + + _game.getGameState().addCardToZone(_game, merry, Zone.FREE_CHARACTERS); + _game.getGameState().attachCard(_game, slowKindledCourage, merry); + + // End fellowship phase + playerDecided(P1, ""); + + _game.getGameState().addCardToZone(_game, urukHaiRaidingParty, Zone.SHADOW_CHARACTERS); + + // End shadow phase + playerDecided(P2, ""); + + // End maneuvers phase + playerDecided(P1, ""); + playerDecided(P2, ""); + + // End arhcery phase + playerDecided(P1, ""); + playerDecided(P2, ""); + + // Assignment phase + playerDecided(P1, ""); + + AwaitingDecision assignmentActions = _userFeedback.getAwaitingDecision(P2); + assertEquals(AwaitingDecisionType.CARD_ACTION_CHOICE, assignmentActions.getDecisionType()); + validateContents(toCardIdArray(urukHaiRaidingParty), (String[]) assignmentActions.getDecisionParameters().get("cardId")); + + playerDecided(P2, "0"); + + assertEquals(1, _game.getGameState().getAssignments().size()); + final Assignment assignment = _game.getGameState().getAssignments().get(0); + assertEquals(merry, assignment.getFellowshipCharacter()); + assertEquals(1, assignment.getShadowCharacters().size()); + assertTrue(assignment.getShadowCharacters().contains(urukHaiRaidingParty)); + } } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index 0c7bce05e..94f058ecd 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -1,4 +1,7 @@ 
+2 Sep. 2012
+- "Slow-kindled Courage" and other FP conditions that give Assignment actions to minions, now actually do that.
+
 1 Sep. 2012
 - "Long Prepared" now correctly allows to exert a GONDOR Man and then wounds a roaming minion in that man's skirmish.