From 4334cd38dbcd42f4670d78a822958b7e6cd3cec8 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:08:53 -0400 Subject: [PATCH 01/14] Added chat call for 1R147 "Uruk Guard" Now announces which companion cannot be assigned to skirmish Uruk Guard --- .../java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java index 66abb9333..9257cc680 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java @@ -8,6 +8,7 @@ import com.gempukku.lotro.cards.modifiers.CantBeAssignedAgainstModifier; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; @@ -47,6 +48,7 @@ public class Card1_147 extends AbstractMinion { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new CantBeAssignedAgainstModifier(self, Side.FREE_PEOPLE, Filters.sameCard(companion), self))); + game.getGameState().sendMessage(self.getOwner() +" has chosen "+ companion.getBlueprint().getName()); } }); return Collections.singletonList(action); From 2f5cc577ef82a3621432d131509225b30d174c49 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:11:33 -0400 Subject: [PATCH 02/14] Fix to 1U211 "Drawn to Its Power" Previously, burdens would be added if the Ring-bearer died (triggering exertions from Gates of the Dead) even though "burdens are only placed on your Ring-bearer." --- .../java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java index 25d7f4bcd..77406fa15 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java @@ -4,6 +4,7 @@ import com.gempukku.lotro.cards.AbstractPermanent; import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.cards.effects.AddBurdenEffect; import com.gempukku.lotro.common.*; +import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; @@ -28,7 +29,7 @@ public class Card1_211 extends AbstractPermanent { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilledInASkirmish(game, effectResult, Race.NAZGUL, CardType.COMPANION)) { + if (TriggerConditions.forEachKilledInASkirmish(game, effectResult, Race.NAZGUL, CardType.COMPANION, Filters.not(Filters.ringBearer))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new AddBurdenEffect(self.getOwner(), self, 1)); From 87cb36510aafa8c79873f4c70eb990aaa9c089d9 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:12:46 -0400 Subject: [PATCH 03/14] Fix to 6P122 "The Witch-king, Deathless Lord" Can now wound an ally once if and only if all companions are exhausted and no ally can be wounded twice --- .../lotro/cards/set6/wraith/Card6_122.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java index d5413a409..c82912405 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java @@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.cards.effects.ChoiceEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect; import com.gempukku.lotro.common.*; +import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; @@ -39,13 +40,20 @@ public class Card6_122 extends AbstractMinion { if (TriggerConditions.forEachKilledInASkirmish(game, effectResult, Race.NAZGUL, CardType.COMPANION)) { RequiredTriggerAction action = new RequiredTriggerAction(self); List possibleEffects = new LinkedList(); - possibleEffects.add( - new ChooseAndWoundCharactersEffect(action, self.getOwner(), 1, 1, 2, CardType.ALLY) { - @Override - public String getText(LotroGame game) { - return "Wound an ally twice"; - } - }); + if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), + CardType.ALLY, Filters.moreVitalityThan(1))) { + possibleEffects.add( + new ChooseAndWoundCharactersEffect(action, self.getOwner(), 1, 1, 2, CardType.ALLY) { + @Override + public String getText(LotroGame game) { + return "Wound an ally twice"; + } + }); + } else if (!Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), + CardType.COMPANION, Filters.moreVitalityThan(1))) { + possibleEffects.add( + new ChooseAndWoundCharactersEffect(action, self.getOwner(), 1, 1, 1, CardType.ALLY)); + } possibleEffects.add( new ChooseAndExertCharactersEffect(action, self.getOwner(), 1, 1, CardType.COMPANION) { @Override From ccfe676b78ee6bb867b3f5fd54e2b7462c5a9af9 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:13:51 -0400 Subject: [PATCH 04/14] Fix to 8R20 "Saved From the Fire" Can no longer target the Ring-bearer, per card text --- .../java/com/gempukku/lotro/cards/set8/gandalf/Card8_020.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gandalf/Card8_020.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gandalf/Card8_020.java index 0777d46cc..1a0ddc887 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gandalf/Card8_020.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gandalf/Card8_020.java @@ -39,7 +39,7 @@ public class Card8_020 extends AbstractEvent { public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { final PlayEventAction action = new PlayEventAction(self); action.appendCost( - new ChooseActiveCardEffect(self, playerId, "Choose a companion", CardType.COMPANION) { + new ChooseActiveCardEffect(self, playerId, "Choose a companion", CardType.COMPANION, Filters.not(Filters.ringBearer)) { @Override protected void cardSelected(LotroGame game, final PhysicalCard card) { action.insertCost( From 7e2dc152cae62ed642cfefc2b0cd64ad67137937 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:15:00 -0400 Subject: [PATCH 05/14] Added chat call for 10R23 "Shelob, Her Ladyship" Now announces which companion cannot be assigned to skirmishes --- .../java/com/gempukku/lotro/cards/set10/gollum/Card10_023.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/gollum/Card10_023.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/gollum/Card10_023.java index 6d3e1ccd5..7aca75c14 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/gollum/Card10_023.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/gollum/Card10_023.java @@ -10,6 +10,7 @@ import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Race; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; @@ -50,6 +51,7 @@ public class Card10_023 extends AbstractMinion { action.appendEffect( new AddUntilEndOfTurnModifierEffect( new CantBeAssignedToSkirmishModifier(self, card))); + game.getGameState().sendMessage(self.getOwner() +" has chosen "+ card.getBlueprint().getName()); } }); return Collections.singletonList(action); From d91efbae5c7be704bf5ddaa056d0abefe5e5d8a2 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:16:03 -0400 Subject: [PATCH 06/14] Fix to 10R112 "Nine-fingered Frodo and the Ring of Doom" Can now remove one threat if and only if there are no burdens and not two threats --- .../lotro/cards/set10/shire/Card10_112.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_112.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_112.java index f85bed16f..c2a1c3510 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_112.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/shire/Card10_112.java @@ -47,13 +47,18 @@ public class Card10_112 extends AbstractEvent { List possibleEffects = new LinkedList(); possibleEffects.add( new RemoveBurdenEffect(playerId, self)); - possibleEffects.add( - new RemoveThreatsEffect(self, 2) { - @Override - public String getText(LotroGame game) { - return "Remove 2 threats"; - } - }); + if (game.getGameState().getThreats() > 1) { + possibleEffects.add( + new RemoveThreatsEffect(self, 2) { + @Override + public String getText(LotroGame game) { + return "Remove 2 threats"; + } + }); + } else if (game.getGameState().getBurdens() == 0) { + possibleEffects.add( + new RemoveThreatsEffect(self, 1)); + } action.appendEffect( new ChoiceEffect(action, playerId, possibleEffects)); return action; From a9287a8555e44c5ed6fd14f7a329d795e8f48650 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:17:05 -0400 Subject: [PATCH 07/14] Added chat call for 11R50 "Safe Passage" Now announces which keyword is named --- .../com/gempukku/lotro/cards/set11/gollum/Card11_050.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gollum/Card11_050.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gollum/Card11_050.java index 991c15259..d73194f84 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gollum/Card11_050.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/gollum/Card11_050.java @@ -8,6 +8,7 @@ import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; @@ -33,7 +34,7 @@ public class Card11_050 extends AbstractPermanent { } @Override - public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, final PhysicalCard self) { + public List getRequiredAfterTriggers(final LotroGame game, EffectResult effectResult, final PhysicalCard self) { if (TriggerConditions.played(game, effectResult, self)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( @@ -49,6 +50,8 @@ public class Card11_050 extends AbstractPermanent { self.setWhileInZoneData(Keyword.PLAINS); else self.setWhileInZoneData(Keyword.RIVER); + + game.getGameState().sendMessage(self.getOwner() +" has chosen "+ result); } })); return Collections.singletonList(action); From d3a7844e93fc7fe230331a53a06b71980ce6cbad Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:18:19 -0400 Subject: [PATCH 08/14] Added chat call for 12R54 "Saruman, Of Many Colours" Now announces which culture's companions are strength -1 --- .../com/gempukku/lotro/cards/set12/isengard/Card12_054.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/isengard/Card12_054.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/isengard/Card12_054.java index 20f3ddc59..1bebbba03 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/isengard/Card12_054.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/isengard/Card12_054.java @@ -63,7 +63,7 @@ public class Card12_054 extends AbstractMinion { } @Override - public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, final PhysicalCard self) { + public List getRequiredAfterTriggers(final LotroGame game, EffectResult effectResult, final PhysicalCard self) { if (TriggerConditions.played(game, effectResult, self)) { RequiredTriggerAction action = new RequiredTriggerAction(self); @@ -78,6 +78,7 @@ public class Card12_054 extends AbstractMinion { @Override protected void validDecisionMade(int index, String result) { self.setWhileInZoneData(Culture.findCultureByHumanReadable(result)); + game.getGameState().sendMessage(self.getOwner() +" has chosen "+ result); } })); return Collections.singletonList(action); From d6df21c5eae86975cb21f599489fc1500961d9b9 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:19:04 -0400 Subject: [PATCH 09/14] Added chat call for 12R156 "Uruk-hai Guard" Now announces which companion cannot be assigned to skirmish Uruk-Hai Guard --- .../com/gempukku/lotro/cards/set12/uruk_hai/Card12_156.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/uruk_hai/Card12_156.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/uruk_hai/Card12_156.java index 8c03b2bf3..2236d8014 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/uruk_hai/Card12_156.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/uruk_hai/Card12_156.java @@ -7,6 +7,7 @@ import com.gempukku.lotro.cards.effects.SelfExertEffect; import com.gempukku.lotro.cards.modifiers.CantBeAssignedAgainstModifier; import com.gempukku.lotro.common.*; import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; @@ -48,6 +49,7 @@ public class Card12_156 extends AbstractMinion { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new CantBeAssignedAgainstModifier(self, Side.FREE_PEOPLE, card, self))); + game.getGameState().sendMessage(self.getOwner() +" has chosen "+ card.getBlueprint().getName()); } }); return Collections.singletonList(action); From ef755dabc10354d9a1dbd72dcf18251da5de4298 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:19:55 -0400 Subject: [PATCH 10/14] Minor fix to 15R117 "Tower Troll" Prevention text now properly populates --- .../lotro/cards/set15/orc/Card15_117.java | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_117.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_117.java index 107a5ac12..9433a7f9e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_117.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_117.java @@ -56,23 +56,28 @@ public class Card15_117 extends AbstractMinion { new SelfExertEffect(action, self)); action.appendEffect( new ChooseActiveCardEffect(self, playerId, "Choose companion", CardType.COMPANION, Filters.not(Filters.ringBearer), Filters.assignableToSkirmishAgainst(Side.SHADOW, self)) { - @Override - protected void cardSelected(LotroGame game, PhysicalCard companion) { - if (PlayConditions.canSpot(game, 6, CardType.COMPANION)) - action.appendEffect( - new AssignmentEffect(playerId, companion, self)); - else - action.appendEffect( - new PreventableEffect(action, - new AssignmentEffect(playerId, companion, self), game.getGameState().getCurrentPlayerId(), - new PreventableEffect.PreventionCost() { - @Override - public Effect createPreventionCostForPlayer(SubAction subAction, String playerId) { - return new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.COMPANION); - } - })); - } - }); + @Override + protected void cardSelected(LotroGame game, PhysicalCard companion) { + if (PlayConditions.canSpot(game, 6, CardType.COMPANION)) + action.appendEffect( + new AssignmentEffect(playerId, companion, self)); + else + action.appendEffect( + new PreventableEffect(action, + new AssignmentEffect(playerId, companion, self), game.getGameState().getCurrentPlayerId(), + new PreventableEffect.PreventionCost() { + @Override + public Effect createPreventionCostForPlayer(SubAction subAction, String playerId) { + return new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.COMPANION) { + @Override + public String getText(LotroGame game) { + return "Exert a companion"; + } + }; + } + })); + } + }); return Collections.singletonList(action); } return null; From 8134335f8b41422949b0b4616608a2289ae57532 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:26:35 -0400 Subject: [PATCH 11/14] Semi-Fix for The Hobbit League Right now, cards from The Hobbit Draft League (and only that league) disappear the next server day. I have no idea why only The Hobbit was affected. Adding this code back in allows the collection to stay until the next server reset, FotR and TTT still persist through resets. Should at least allow the league to be playable. --- .../gempukku/lotro/league/SoloDraftLeagueData.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java index 52fbb4a2f..e4f8029f1 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java @@ -86,10 +86,20 @@ public class SoloDraftLeagueData implements LeagueData { @Override public int process(CollectionsManager collectionsManager, List leagueStandings, int oldStatus, int currentTime) { int status = oldStatus; - + + if (status == 0) { + Map map = collectionsManager.getPlayersCollection(_collectionType.getCode()); + for (Map.Entry playerCardCollectionEntry : map.entrySet()) { + Player player = playerCardCollectionEntry.getKey(); + CardCollection leagueProduct = _draft.initializeNewCollection(getSeed(player)); + collectionsManager.addItemsToPlayerCollection(false, "New sealed league product", player, _collectionType, leagueProduct.getAll().values()); + } + status = 1; + } + int maxGamesTotal = _serie.getMaxMatches(); - if (status == 0) { + if (status == 1) { if (currentTime > DateUtils.offsetDate(_serie.getEnd(), 1)) { for (PlayerStanding leagueStanding : leagueStandings) { CardCollection leaguePrize = _leaguePrizes.getPrizeForLeague(leagueStanding.getStanding(), leagueStandings.size(), leagueStanding.getGamesPlayed(), maxGamesTotal, _collectionType); From 9e450335aa41eb381d98afd0333ec03ddaf2ef7c Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:41:46 -0400 Subject: [PATCH 12/14] Fix to 6P122 "The Witch-king, Deathless Lord" Correctly allows The Witch-king to wound an ally with one vitality twice (for corner cases with wound prevention) if all Free Peoples characters are exhausted --- .../com/gempukku/lotro/cards/set6/wraith/Card6_122.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java index c82912405..3c3447943 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java @@ -10,6 +10,7 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; +import com.gempukku.lotro.logic.effects.WoundCharactersEffect; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; @@ -52,7 +53,13 @@ public class Card6_122 extends AbstractMinion { } else if (!Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), CardType.COMPANION, Filters.moreVitalityThan(1))) { possibleEffects.add( - new ChooseAndWoundCharactersEffect(action, self.getOwner(), 1, 1, 1, CardType.ALLY)); + new ChooseAndWoundCharactersEffect(action, self.getOwner(), 1, 1, 1, CardType.ALLY) { + @Override + protected void woundedCardsCallback(Collection cards) { + for (PhysicalCard card : cards) + action.appendEffect(new WoundCharactersEffect(self, card)); + } + }); } possibleEffects.add( new ChooseAndExertCharactersEffect(action, self.getOwner(), 1, 1, CardType.COMPANION) { From 080906432d7e6ce86e262f75f6fb69fae4a9f7d3 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 12 Sep 2018 11:49:24 -0400 Subject: [PATCH 13/14] Update changeLog.html --- .../src/main/web/includes/changeLog.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 259bc5b2e..14141035a 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 @@ -1,5 +1,17 @@ 
 Most recent update
+- "Drawn to Its Power" can no longer adds burden if The Ring-Bearer was killed
+- "The Witch-king, Deathless Lord" can now wound an ally twice if all Free Peoples characters are exhausted
+- "Nine-fingered Frodo and the Ring of Doom" can now remove one threat if there is one threat and no burdens
+- "Saved from the Fire" can no longer target the Ring-Bearer
+- "Tower Troll" now has the correct prevention pop-up text
+- "Uruk Guard" and "Uruk-hai Guard" now announce the selected companion in chat
+- "Shelob, Her Ladyship" now announces the seclected companion in chat
+- "Safe Passage" now announces the selected keyword in chat
+- "Saruman, Of Many Colours" now announces the selected culture in chat
+- The Hobbit Draft League should no longer disappear from users' collections each server day
+
+21 June 2018
 - Added Draft for Fellowship block, The Two Towers block, and The Hobbit
 - Added prize support for Draft games
 - Users can now select what kind of foiling they want to see under the "Settings" tab in-game

From cc3bd2e09f9182c0c3147b3e6328444a32b5755a Mon Sep 17 00:00:00 2001
From: PhallenCassidy 
Date: Wed, 12 Sep 2018 11:53:15 -0400
Subject: [PATCH 14/14] Fix to 6P122 "The Witch-king, Deathless Lord"

Will allow The Witch-king to wound an ally twice if all Free Peoples characters are exhausted, and should compile as an added bonus
---
 .../java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java
index 3c3447943..fae3763ef 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/wraith/Card6_122.java
@@ -14,6 +14,8 @@ import com.gempukku.lotro.logic.effects.WoundCharactersEffect;
 import com.gempukku.lotro.logic.timing.Effect;
 import com.gempukku.lotro.logic.timing.EffectResult;
 
+
+import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;