From 5d73c99a34113daadab83d1529cd66b79bc55e13 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Wed, 20 Mar 2013 18:17:46 +0000 Subject: [PATCH] - If one side is removed from Skirmish, before it ends and the other side has a total strength less than or equal to 0, the side that is present, still wins. --- .../gemp-lotr-async/src/main/web/includes/changeLog.html | 2 ++ .../lotro/logic/effects/ResolveSkirmishEffect.java | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index e1d434543..1e3462ec5 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -2,6 +2,8 @@ 20 Mar. 2013 - "Uruk Mender" has now 8 strength (per card text). - "Illuminate" now spots Gandalf, not just GANDALF culture card to play it. +- If one side is removed from Skirmish, before it ends and the other side has a total strength less than or equal to 0, +the side that is present, still wins. 19 Mar. 2013 - Applied revision 1 changes to set 20. diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ResolveSkirmishEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ResolveSkirmishEffect.java index 297ff3095..5f883843a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ResolveSkirmishEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ResolveSkirmishEffect.java @@ -34,10 +34,17 @@ public class ResolveSkirmishEffect extends AbstractEffect { } public Result getUpcomingResult(LotroGame game) { + final Skirmish skirmish = game.getGameState().getSkirmish(); + + if (skirmish.getShadowCharacters().size() == 0) + return Result.SHADOW_LOSES; + if (skirmish.getFellowshipCharacter() == null) + return Result.FELLOWSHIP_LOSES; + int fpStrength = RuleUtils.getFellowshipSkirmishStrength(game); int shadowStrength = RuleUtils.getShadowSkirmishStrength(game); - final PhysicalCard fellowshipCharacter = game.getGameState().getSkirmish().getFellowshipCharacter(); + final PhysicalCard fellowshipCharacter = skirmish.getFellowshipCharacter(); int multiplier = 2; if (fellowshipCharacter != null)