Eomer, Keeper of Oaths shuffles deck even if no cards played

This commit is contained in:
Troy Biesterfeld
2021-06-09 19:08:35 -05:00
parent 388c35930f
commit 6b5de9208d
4 changed files with 12 additions and 3 deletions

View File

@@ -1,6 +1,7 @@
package com.gempukku.lotro.cards.set8.rohan;
import com.gempukku.lotro.logic.cardtype.AbstractCompanion;
import com.gempukku.lotro.logic.effects.ShuffleDeckEffect;
import com.gempukku.lotro.logic.timing.TriggerConditions;
import com.gempukku.lotro.logic.effects.RevealTopCardsOfDrawDeckEffect;
import com.gempukku.lotro.logic.effects.choose.ChooseAndPlayCardFromDeckEffect;
@@ -49,6 +50,8 @@ public class Card8_087 extends AbstractCompanion {
new PlayAnyNumberOfCardsFromDeckEffect(action, playerId, rohanPossessions));
}
});
action.appendEffect(
new ShuffleDeckEffect(playerId));
return Collections.singletonList(action);
}
return null;

View File

@@ -87,8 +87,10 @@ public class AttachPermanentAction extends AbstractCostToEffectAction {
game.getGameState().addCardToZone(game, _cardToAttach, Zone.VOID_FROM_HAND);
else
game.getGameState().addCardToZone(game, _cardToAttach, Zone.VOID);
if (playedFromZone == Zone.DECK)
if (playedFromZone == Zone.DECK) {
game.getGameState().sendMessage(_cardToAttach.getOwner() + " shuffles his or her deck");
game.getGameState().shuffleDeck(_cardToAttach.getOwner());
}
}
if (!_targetChosen) {

View File

@@ -78,8 +78,10 @@ public class PlayEventAction extends AbstractCostToEffectAction {
else
game.getGameState().addCardToZone(game, _eventPlayed, Zone.VOID);
if (playedFromZone == Zone.DECK)
if (playedFromZone == Zone.DECK) {
game.getGameState().sendMessage(_eventPlayed.getOwner() + " shuffles his or her deck");
game.getGameState().shuffleDeck(_eventPlayed.getOwner());
}
game.getGameState().eventPlayed(_eventPlayed);
}

View File

@@ -78,8 +78,10 @@ public class PlayPermanentAction extends AbstractCostToEffectAction {
game.getGameState().addCardToZone(game, _permanentPlayed, Zone.VOID_FROM_HAND);
else
game.getGameState().addCardToZone(game, _permanentPlayed, Zone.VOID);
if (playedFromZone == Zone.DECK && !_skipShuffling)
if (playedFromZone == Zone.DECK && !_skipShuffling) {
game.getGameState().sendMessage(_permanentPlayed.getOwner() + " shuffles his or her deck");
game.getGameState().shuffleDeck(_permanentPlayed.getOwner());
}
}
if (!_discountResolved) {