diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SkirmishPhaseAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SkirmishPhaseAction.java index 0224218aa..47ce5f158 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SkirmishPhaseAction.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SkirmishPhaseAction.java @@ -41,6 +41,8 @@ public class SkirmishPhaseAction extends SystemQueueAction { game.getActionsEnvironment().addActionToStack(new SkirmishActionProcedureAction()); } }); + appendEffect( + new TriggeringResultEffect(null, new SkirmishAboutToEndResult(fellowshipCharacter, shadowCharacters), "Skirmish about to end")); appendEffect( new UnrespondableEffect() { @Override @@ -51,8 +53,7 @@ public class SkirmishPhaseAction extends SystemQueueAction { } } }); - appendEffect( - new TriggeringResultEffect(null, new SkirmishAboutToEndResult(fellowshipCharacter, shadowCharacters), "Skirmish about to end")); + appendEffect( new TriggeringResultEffect(null, new EndOfPhaseResult(Phase.SKIRMISH), "End of skirmish phase")); appendEffect( diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set08/Card_08_113_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set08/Card_08_113_Tests.java index c8c2e72af..9c940cf97 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set08/Card_08_113_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set08/Card_08_113_Tests.java @@ -19,6 +19,7 @@ public class Card_08_113_Tests {{ put("sting", "8_113"); put("shelob", "8_25"); + put("sauron", "9_48"); }}, GenericCardTestHelper.FellowshipSites, GenericCardTestHelper.FOTRFrodo, @@ -85,13 +86,43 @@ public class Card_08_113_Tests scn.FreepsResolveSkirmish(frodo); scn.PassCurrentPhaseActions(); - scn.FreepsDeclineOptionalTrigger(); //Ring converting burdens assertTrue(scn.FreepsHasOptionalTriggerAvailable()); - assertEquals(0, scn.GetThreats()); assertEquals(Zone.SHADOW_CHARACTERS, shelob.getZone()); scn.FreepsAcceptOptionalTrigger(); assertEquals(1, scn.GetThreats()); assertEquals(Zone.DISCARD, shelob.getZone()); } + + @Test + public void StingTriggersOnOverwhelm() throws DecisionResultInvalidException, CardNotFoundException { + //Pre-game setup + var scn = GetScenario(); + + var frodo = scn.GetRingBearer(); + var sting = scn.GetFreepsCard("sting"); + scn.FreepsAttachCardsTo(frodo, sting); + + var sauron = scn.GetShadowCard("sauron"); + scn.ShadowMoveCharToTable(sauron); + + scn.StartGame(); + scn.SkipToAssignments(); + scn.FreepsDeclineAssignments(); + scn.ShadowDeclineAssignments(); + + //Fierce assignment + scn.PassCurrentPhaseActions(); + scn.FreepsAssignToMinions(frodo, sauron); + scn.FreepsResolveSkirmish(frodo); + scn.PassCurrentPhaseActions(); + + assertTrue(scn.FreepsHasOptionalTriggerAvailable()); + + assertEquals(0, scn.GetThreats()); + assertEquals(Zone.SHADOW_CHARACTERS, sauron.getZone()); + scn.FreepsAcceptOptionalTrigger(); + assertEquals(1, scn.GetThreats()); + assertEquals(Zone.DISCARD, sauron.getZone()); + } }