Shuffle cards from play and stacked on them.
This commit is contained in:
@@ -10,12 +10,12 @@ import java.util.Collection;
|
|||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
public class ShuffleCardsFromPlayOrStackedIntoDeckEffect extends AbstractEffect {
|
public class ShuffleCardsFromPlayAndStackedOnItIntoDeckEffect extends AbstractEffect {
|
||||||
private PhysicalCard _source;
|
private PhysicalCard _source;
|
||||||
private String _playerDeck;
|
private String _playerDeck;
|
||||||
private Collection<PhysicalCard> _cards;
|
private Collection<PhysicalCard> _cards;
|
||||||
|
|
||||||
public ShuffleCardsFromPlayOrStackedIntoDeckEffect(PhysicalCard source, String playerDeck, Collection<PhysicalCard> cards) {
|
public ShuffleCardsFromPlayAndStackedOnItIntoDeckEffect(PhysicalCard source, String playerDeck, Collection<PhysicalCard> cards) {
|
||||||
_source = source;
|
_source = source;
|
||||||
_playerDeck = playerDeck;
|
_playerDeck = playerDeck;
|
||||||
_cards = cards;
|
_cards = cards;
|
||||||
@@ -43,29 +43,34 @@ public class ShuffleCardsFromPlayOrStackedIntoDeckEffect extends AbstractEffect
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected FullEffectResult playEffectReturningResult(LotroGame game) {
|
protected FullEffectResult playEffectReturningResult(LotroGame game) {
|
||||||
Set<PhysicalCard> stacked = new HashSet<PhysicalCard>();
|
Set<PhysicalCard> toShuffleIn = new HashSet<PhysicalCard>();
|
||||||
Set<PhysicalCard> inPlay = new HashSet<PhysicalCard>();
|
Set<PhysicalCard> inPlay = new HashSet<PhysicalCard>();
|
||||||
|
|
||||||
for (PhysicalCard card : _cards) {
|
for (PhysicalCard card : _cards) {
|
||||||
if (card.getZone() == Zone.STACKED)
|
if (card.getZone().isInPlay()) {
|
||||||
stacked.add(card);
|
|
||||||
else if (card.getZone().isInPlay())
|
|
||||||
inPlay.add(card);
|
inPlay.add(card);
|
||||||
|
toShuffleIn.add(card);
|
||||||
|
toShuffleIn.addAll(game.getGameState().getStackedCards(card));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (PhysicalCard physicalCard : inPlay)
|
for (PhysicalCard physicalCard : inPlay)
|
||||||
game.getGameState().stopAffecting(physicalCard);
|
game.getGameState().stopAffecting(physicalCard);
|
||||||
|
|
||||||
Set<PhysicalCard> shuffleIn = new HashSet<PhysicalCard>(stacked);
|
if (toShuffleIn.size() > 0) {
|
||||||
shuffleIn.addAll(inPlay);
|
game.getGameState().removeCardsFromZone(toShuffleIn);
|
||||||
|
|
||||||
if (shuffleIn.size() > 0) {
|
game.getGameState().shuffleCardsIntoDeck(toShuffleIn, _playerDeck);
|
||||||
game.getGameState().removeCardsFromZone(shuffleIn);
|
|
||||||
|
|
||||||
game.getGameState().shuffleCardsIntoDeck(shuffleIn, _playerDeck);
|
game.getGameState().sendMessage(getAppendedNames(toShuffleIn) + " is/are shuffled into " + _playerDeck + " deck");
|
||||||
|
|
||||||
game.getGameState().sendMessage(getAppendedNames(shuffleIn) + " is/are shuffled into " + _playerDeck + " deck");
|
cardsShuffledCallback(toShuffleIn);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new FullEffectResult(null, shuffleIn.size() == _cards.size(), shuffleIn.size() == _cards.size());
|
return new FullEffectResult(null, inPlay.size() == _cards.size(), inPlay.size() == _cards.size());
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void cardsShuffledCallback(Set<PhysicalCard> cardsShuffled) {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set4.dwarven;
|
|||||||
|
|
||||||
import com.gempukku.lotro.cards.AbstractEvent;
|
import com.gempukku.lotro.cards.AbstractEvent;
|
||||||
import com.gempukku.lotro.cards.actions.PlayEventAction;
|
import com.gempukku.lotro.cards.actions.PlayEventAction;
|
||||||
import com.gempukku.lotro.cards.effects.ShuffleCardsFromPlayOrStackedIntoDeckEffect;
|
import com.gempukku.lotro.cards.effects.ShuffleCardsFromPlayAndStackedOnItIntoDeckEffect;
|
||||||
import com.gempukku.lotro.common.CardType;
|
import com.gempukku.lotro.common.CardType;
|
||||||
import com.gempukku.lotro.common.Culture;
|
import com.gempukku.lotro.common.Culture;
|
||||||
import com.gempukku.lotro.common.Phase;
|
import com.gempukku.lotro.common.Phase;
|
||||||
@@ -13,8 +13,6 @@ import com.gempukku.lotro.game.state.LotroGame;
|
|||||||
import com.gempukku.lotro.logic.effects.ChooseActiveCardsEffect;
|
import com.gempukku.lotro.logic.effects.ChooseActiveCardsEffect;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set: The Two Towers
|
* Set: The Two Towers
|
||||||
@@ -41,14 +39,8 @@ public class Card4_054 extends AbstractEvent {
|
|||||||
new ChooseActiveCardsEffect(self, playerId, "Choose DWARVEN conditions", 0, Integer.MAX_VALUE, Filters.culture(Culture.DWARVEN), Filters.type(CardType.CONDITION)) {
|
new ChooseActiveCardsEffect(self, playerId, "Choose DWARVEN conditions", 0, Integer.MAX_VALUE, Filters.culture(Culture.DWARVEN), Filters.type(CardType.CONDITION)) {
|
||||||
@Override
|
@Override
|
||||||
protected void cardsSelected(LotroGame game, Collection<PhysicalCard> cards) {
|
protected void cardsSelected(LotroGame game, Collection<PhysicalCard> cards) {
|
||||||
Set<PhysicalCard> toShuffle = new HashSet<PhysicalCard>();
|
|
||||||
for (PhysicalCard card : cards) {
|
|
||||||
toShuffle.add(card);
|
|
||||||
toShuffle.addAll(game.getGameState().getStackedCards(card));
|
|
||||||
}
|
|
||||||
|
|
||||||
action.insertEffect(
|
action.insertEffect(
|
||||||
new ShuffleCardsFromPlayOrStackedIntoDeckEffect(self, playerId, toShuffle));
|
new ShuffleCardsFromPlayAndStackedOnItIntoDeckEffect(self, playerId, cards));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return action;
|
return action;
|
||||||
|
|||||||
@@ -4,14 +4,14 @@ import com.gempukku.lotro.cards.AbstractEvent;
|
|||||||
import com.gempukku.lotro.cards.PlayConditions;
|
import com.gempukku.lotro.cards.PlayConditions;
|
||||||
import com.gempukku.lotro.cards.actions.PlayEventAction;
|
import com.gempukku.lotro.cards.actions.PlayEventAction;
|
||||||
import com.gempukku.lotro.cards.effects.ChooseAndExertCharactersEffect;
|
import com.gempukku.lotro.cards.effects.ChooseAndExertCharactersEffect;
|
||||||
import com.gempukku.lotro.cards.effects.ShuffleCardsFromPlayOrStackedIntoDeckEffect;
|
import com.gempukku.lotro.cards.effects.ShuffleCardsFromPlayAndStackedOnItIntoDeckEffect;
|
||||||
import com.gempukku.lotro.common.*;
|
import com.gempukku.lotro.common.*;
|
||||||
import com.gempukku.lotro.filters.Filters;
|
import com.gempukku.lotro.filters.Filters;
|
||||||
import com.gempukku.lotro.game.PhysicalCard;
|
import com.gempukku.lotro.game.PhysicalCard;
|
||||||
import com.gempukku.lotro.game.state.LotroGame;
|
import com.gempukku.lotro.game.state.LotroGame;
|
||||||
import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
|
import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.Collections;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -48,15 +48,15 @@ public class Card4_055 extends AbstractEvent {
|
|||||||
new ChooseActiveCardEffect(self, playerId, "Choose a DWARVEN condition", Filters.culture(Culture.DWARVEN), Filters.type(CardType.CONDITION)) {
|
new ChooseActiveCardEffect(self, playerId, "Choose a DWARVEN condition", Filters.culture(Culture.DWARVEN), Filters.type(CardType.CONDITION)) {
|
||||||
@Override
|
@Override
|
||||||
protected void cardSelected(PhysicalCard card) {
|
protected void cardSelected(PhysicalCard card) {
|
||||||
Set<PhysicalCard> toShuffle = new HashSet<PhysicalCard>();
|
|
||||||
toShuffle.add(card);
|
|
||||||
toShuffle.addAll(game.getGameState().getStackedCards(card));
|
|
||||||
|
|
||||||
action.insertEffect(
|
action.insertEffect(
|
||||||
new ShuffleCardsFromPlayOrStackedIntoDeckEffect(self, playerId, toShuffle));
|
new ShuffleCardsFromPlayAndStackedOnItIntoDeckEffect(self, playerId, Collections.singleton(card)) {
|
||||||
|
@Override
|
||||||
|
protected void cardsShuffledCallback(Set<PhysicalCard> cardsShuffled) {
|
||||||
|
action.appendEffect(
|
||||||
|
new ChooseAndExertCharactersEffect(action, playerId, cardsShuffled.size(), cardsShuffled.size(), Filters.type(CardType.MINION)));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
action.appendEffect(
|
|
||||||
new ChooseAndExertCharactersEffect(action, playerId, toShuffle.size(), toShuffle.size(), Filters.type(CardType.MINION)));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return action;
|
return action;
|
||||||
|
|||||||
Reference in New Issue
Block a user