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

Fixing Playing event.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-12-20 14:37:03 +00:00
parent 5dccafbea2
commit dabec3b920
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ package com.gempukku.lotro.cards.actions;
import com.gempukku.lotro.cards.effects.DiscountEffect; import com.gempukku.lotro.cards.effects.DiscountEffect;
import com.gempukku.lotro.cards.effects.PayTwilightCostEffect; import com.gempukku.lotro.cards.effects.PayTwilightCostEffect;
import com.gempukku.lotro.cards.effects.PlayEventEffect;
import com.gempukku.lotro.cards.effects.discount.ToilDiscountEffect; import com.gempukku.lotro.cards.effects.discount.ToilDiscountEffect;
import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Side; import com.gempukku.lotro.common.Side;
@@ -10,7 +11,6 @@ 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.GameUtils; import com.gempukku.lotro.logic.GameUtils;
import com.gempukku.lotro.logic.actions.AbstractCostToEffectAction; import com.gempukku.lotro.logic.actions.AbstractCostToEffectAction;
import com.gempukku.lotro.logic.effects.PlayEventEffect;
import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.Effect;
import java.util.Collections; import java.util.Collections;
@@ -42,7 +42,7 @@ public class PlayEventAction extends AbstractCostToEffectAction implements Disco
_eventPlayed = card; _eventPlayed = card;
_requiresRanger = requiresRanger; _requiresRanger = requiresRanger;
_playCardEffect = new PlayEventEffect(card.getZone(), card, requiresRanger); _playCardEffect = new PlayEventEffect(this, card.getZone(), card, requiresRanger);
_text = "Play " + _eventPlayed.getBlueprint().getName(); _text = "Play " + _eventPlayed.getBlueprint().getName();
} }

10
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/PlayEventEffect.java → gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlayEventEffect.java
View File

@@ -1,9 +1,11 @@
package com.gempukku.lotro.logic.effects; package com.gempukku.lotro.cards.effects;
import com.gempukku.lotro.cards.actions.PlayEventAction;
import com.gempukku.lotro.cards.results.PlayEventResult;
import com.gempukku.lotro.common.Zone; import com.gempukku.lotro.common.Zone;
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.timing.results.PlayEventResult; import com.gempukku.lotro.logic.effects.PlayCardEffect;
import java.util.Collections; import java.util.Collections;
@@ -11,10 +13,10 @@ public class PlayEventEffect extends PlayCardEffect {
private PhysicalCard _cardPlayed; private PhysicalCard _cardPlayed;
private PlayEventResult _playEventResult; private PlayEventResult _playEventResult;
public PlayEventEffect(Zone playedFrom, PhysicalCard cardPlayed, boolean requiresRanger) { public PlayEventEffect(PlayEventAction action, Zone playedFrom, PhysicalCard cardPlayed, boolean requiresRanger) {
super(playedFrom, cardPlayed, (Zone) null, null); super(playedFrom, cardPlayed, (Zone) null, null);
_cardPlayed = cardPlayed; _cardPlayed = cardPlayed;
_playEventResult = new PlayEventResult(playedFrom, getPlayedCard(), requiresRanger); _playEventResult = new PlayEventResult(action, playedFrom, getPlayedCard(), requiresRanger);
} }
public PlayEventResult getPlayEventResult() { public PlayEventResult getPlayEventResult() {