From 38b361fb7298f9295c369c076896b0d8aa9ac65b Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Thu, 8 May 2025 21:44:44 -0500 Subject: [PATCH] Implementing preliminary LR#8 for Sting, Bane of the Eight Legs --- .../lotro/logic/actions/SkirmishPhaseAction.java | 5 ++--- .../lotro/cards/official/set08/Card_08_113_Tests.java | 11 +++++------ 2 files changed, 7 insertions(+), 9 deletions(-) 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 47ce5f158..0224218aa 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,8 +41,6 @@ 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 @@ -53,7 +51,8 @@ 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 9c940cf97..dae5541d4 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 @@ -89,13 +89,14 @@ public class Card_08_113_Tests assertTrue(scn.FreepsHasOptionalTriggerAvailable()); assertEquals(0, scn.GetThreats()); assertEquals(Zone.SHADOW_CHARACTERS, shelob.getZone()); - scn.FreepsAcceptOptionalTrigger(); + scn.FreepsDeclineOptionalTrigger(); //Ring converting burdens + scn.FreepsAcceptOptionalTrigger(); //Sting assertEquals(1, scn.GetThreats()); assertEquals(Zone.DISCARD, shelob.getZone()); } @Test - public void StingTriggersOnOverwhelm() throws DecisionResultInvalidException, CardNotFoundException { + public void Sting_DOESNOT_TriggerOnOverwhelm() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup var scn = GetScenario(); @@ -117,12 +118,10 @@ public class Card_08_113_Tests scn.FreepsResolveSkirmish(frodo); scn.PassCurrentPhaseActions(); - assertTrue(scn.FreepsHasOptionalTriggerAvailable()); + assertFalse(scn.FreepsHasOptionalTriggerAvailable()); assertEquals(0, scn.GetThreats()); assertEquals(Zone.SHADOW_CHARACTERS, sauron.getZone()); - scn.FreepsAcceptOptionalTrigger(); - assertEquals(1, scn.GetThreats()); - assertEquals(Zone.DISCARD, sauron.getZone()); + } }