ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/rohan/Card8_087.java
View File

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

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/AttachPermanentAction.java
View File

@@ -87,8 +87,10 @@ public class AttachPermanentAction extends AbstractCostToEffectAction {
game.getGameState().addCardToZone(game, _cardToAttach, Zone.VOID_FROM_HAND); game.getGameState().addCardToZone(game, _cardToAttach, Zone.VOID_FROM_HAND);
else else
game.getGameState().addCardToZone(game, _cardToAttach, Zone.VOID); 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()); game.getGameState().shuffleDeck(_cardToAttach.getOwner());
}
} }
if (!_targetChosen) { if (!_targetChosen) {

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayEventAction.java
View File

@@ -78,8 +78,10 @@ public class PlayEventAction extends AbstractCostToEffectAction {
else else
game.getGameState().addCardToZone(game, _eventPlayed, Zone.VOID); 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().shuffleDeck(_eventPlayed.getOwner());
}
game.getGameState().eventPlayed(_eventPlayed); game.getGameState().eventPlayed(_eventPlayed);
} }

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayPermanentAction.java
View File

@@ -78,8 +78,10 @@ public class PlayPermanentAction extends AbstractCostToEffectAction {
game.getGameState().addCardToZone(game, _permanentPlayed, Zone.VOID_FROM_HAND); game.getGameState().addCardToZone(game, _permanentPlayed, Zone.VOID_FROM_HAND);
else else
game.getGameState().addCardToZone(game, _permanentPlayed, Zone.VOID); 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()); game.getGameState().shuffleDeck(_permanentPlayed.getOwner());
}
} }
if (!_discountResolved) { if (!_discountResolved) {