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

Differentiation between cards to be discarded callbacks and actual cards that were discarded callback.

Browse Source
This commit is contained in:
marcins78
2013-01-07 12:02:31 +00:00
parent c7383efbe8
commit e966c0e321
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndDiscardCardsFromPlayEffect.java
View File

@@ -33,7 +33,12 @@ public class ChooseAndDiscardCardsFromPlayEffect extends ChooseActiveCardsEffect
@Override
protected void cardsSelected(LotroGame game, Collection<PhysicalCard> cards) {
_resultSubAction = new SubAction(_action);
_resultSubAction.appendEffect(new DiscardCardsFromPlayEffect(_playerId, _action.getActionSource(), Filters.in(cards)));
_resultSubAction.appendEffect(new DiscardCardsFromPlayEffect(_playerId, _action.getActionSource(), Filters.in(cards)) {
@Override
protected void forEachDiscardedByEffectCallback(Collection<PhysicalCard> discardedCards) {
ChooseAndDiscardCardsFromPlayEffect.this.forEachDiscardedByEffectCallback(discardedCards);
}
});
game.getActionsEnvironment().addActionToStack(_resultSubAction);
cardsToBeDiscardedCallback(cards);
}
@@ -42,6 +47,10 @@ public class ChooseAndDiscardCardsFromPlayEffect extends ChooseActiveCardsEffect
}
protected void forEachDiscardedByEffectCallback(Collection<PhysicalCard> cards) {
}
@Override
public boolean wasCarriedOut() {
return super.wasCarriedOut() && _resultSubAction != null && _resultSubAction.wasCarriedOut();

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/orc/Card13_111.java
View File

@@ -34,7 +34,7 @@ public class Card13_111 extends AbstractEvent {
action.appendCost(
new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 0, Integer.MAX_VALUE, Filters.owner(playerId), Culture.ORC, CardType.MINION) {
@Override
protected void cardsToBeDiscardedCallback(Collection<PhysicalCard> cards) {
protected void forEachDiscardedByEffectCallback(Collection<PhysicalCard> cards) {
if (cards.size() > 0)
action.appendEffect(
new ChooseAndAddUntilEOPStrengthBonusEffect(action, self, playerId, 3 * cards.size(), Culture.ORC, CardType.MINION));

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gollum/Card7_054.java
View File

@@ -32,7 +32,7 @@ public class Card7_054 extends AbstractEvent {
action.appendCost(
new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 0, Integer.MAX_VALUE, Culture.GOLLUM, CardType.CONDITION) {
@Override
protected void cardsToBeDiscardedCallback(Collection<PhysicalCard> cards) {
protected void forEachDiscardedByEffectCallback(Collection<PhysicalCard> cards) {
int count = cards.size();
game.getModifiersEnvironment().addUntilEndOfPhaseModifier(
new StrengthModifier(self, Filters.smeagol, count * 3), Phase.SKIRMISH);

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java
View File

@@ -65,6 +65,10 @@ public class DiscardCardsFromPlayEffect extends AbstractPreventableCardEffect {
return "Discard " + getAppendedTextNames(cards);
}
protected void forEachDiscardedByEffectCallback(Collection<PhysicalCard> discardedCards) {
}
@Override
protected void playoutEffectOn(LotroGame game, Collection<PhysicalCard> cards) {
Set<PhysicalCard> discardedCards = new HashSet<PhysicalCard>();
@@ -92,5 +96,7 @@ public class DiscardCardsFromPlayEffect extends AbstractPreventableCardEffect {
for (PhysicalCard discardedCard : discardedCards)
game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(_source, discardedCard));
forEachDiscardedByEffectCallback(cards);
}
}