From 56c7fc9ee82119f8fc6e5f6b0822b5d682270f35 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 21 Nov 2011 23:35:56 +0000 Subject: [PATCH] - If there is more than one minion assigned to a character (but not yet skirmishing) and one of the minion gets removed from skirmish (for example - killed), the assignment should not be cancelled. --- .../src/main/java/com/gempukku/lotro/game/state/GameState.java | 3 ++- .../gemp-lotr-web/src/main/webapp/includes/changeLog.html | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java index 0942ce09e..eaa5d04ae 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java @@ -357,7 +357,8 @@ public class GameState { if (assignment.getFellowshipCharacter() == card) removeAssignment(assignment); if (assignment.getShadowCharacters().remove(card)) - removeAssignment(assignment); + if (assignment.getShadowCharacters().size() == 0) + removeAssignment(assignment); } if (_skirmish != null) 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 fffd11864..5d348a222 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 @@ -7,6 +7,8 @@ - "Three Monstrous Trolls" no longer freezes game, when systems adds twilight (for example for moving). - "Eomer, Keeper of Oaths" can play only ROHAN possessions from those revelead, rather than any cards. - "Terrible and Evil" exerts Gandalf X times now, rather than only once. +- If there is more than one minion assigned to a character (but not yet skirmishing) and one of the minion gets removed +from skirmish (for example - killed), the assignment should not be cancelled. 20 Nov. 2011 - "Sauron" no longer has his twilight cost reduced by the twilight pool size, instead of burdens spotted.