From e834d6a8ec0e7b3357d39ef5c779b760a5f9b182 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 19 Aug 2022 19:29:45 -0500 Subject: [PATCH] Altered Orc Assassin to no longer prompt the player with its ability after it has been used to assign itself --- .../web/cards/official/set01/set1-sauron.hjson | 16 +++++++++++----- .../com/gempukku/lotro/at/AssignmentAtTest.java | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-sauron.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-sauron.hjson index 7abab0f0e..366e96b2b 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-sauron.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-sauron.hjson @@ -677,11 +677,17 @@ { type: activated phase: assignment - requires: { - type: canSpot - filter: hobbit,companion - count: 2 - } + requires: [ + { + type: canSpot + filter: hobbit,companion + count: 2 + } + { + type: cantspot + filter: AssignedToSkirmish(self) + } + ] effect: { type: assignFpCharacterToSkirmish player: fp 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 234c9025e..1f2a4d634 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 @@ -499,9 +499,9 @@ public class AssignmentAtTest extends AbstractAtTest { assignmentActions = _userFeedback.getAwaitingDecision(P2); assertEquals(AwaitingDecisionType.CARD_ACTION_CHOICE, assignmentActions.getDecisionType()); - validateContents(toCardIdArray(orcAssassin1, orcAssassin2), (String[]) assignmentActions.getDecisionParameters().get("cardId")); + validateContents(toCardIdArray(orcAssassin2), (String[]) assignmentActions.getDecisionParameters().get("cardId")); - playerDecided(P2, "1"); + playerDecided(P2, "0"); assertEquals(2, _game.getGameState().getAssignments().size()); final Assignment secondAssignment = _game.getGameState().getAssignments().get(1);