Skip to content

Commit

Permalink
create MagicManifestCardAction that always uses MagicPlayCardEvent.cr…
Browse files Browse the repository at this point in the history
…eate() for the card event, fixed issue #107
  • Loading branch information
melvinzhang committed Mar 15, 2015
1 parent a1e5653 commit 4522d1d
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 8 deletions.
6 changes: 1 addition & 5 deletions src/magic/model/action/MagicManifestAction.java
Expand Up @@ -28,11 +28,7 @@ public void doAction(final MagicGame game) {
card,
MagicLocationType.OwnersLibrary
));
game.doAction(new MagicPlayCardAction(
card,
player,
MagicPlayMod.MANIFEST
));
game.doAction(new MagicManifestCardAction(card, player));
}
}

Expand Down
34 changes: 34 additions & 0 deletions src/magic/model/action/MagicManifestCardAction.java
@@ -0,0 +1,34 @@

package magic.model.action;

import magic.model.MagicCard;
import magic.model.MagicGame;
import magic.model.MagicPermanent;
import magic.model.MagicPlayer;
import magic.model.MagicPayedCost;
import magic.model.event.MagicPlayCardEvent;
import magic.model.stack.MagicCardOnStack;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;

public class MagicManifestCardAction extends MagicPlayCardAction {

public MagicManifestCardAction(final MagicCard card, final MagicPlayer player) {
super(card, player, MagicPlayMod.MANIFEST);
}

@Override
public void doAction(final MagicGame game) {
final MagicCardOnStack cardOnStack = new MagicCardOnStack(
card,
card,
controller,
MagicPlayCardEvent.create(),
MagicPayedCost.NOT_SPELL,
modifications
);
game.addEvent(cardOnStack.getEvent());
}
}
6 changes: 3 additions & 3 deletions src/magic/model/action/MagicPlayCardAction.java
Expand Up @@ -13,9 +13,9 @@

public class MagicPlayCardAction extends MagicAction {

private final MagicCard card;
private final MagicPlayer controller;
private final List<? extends MagicPermanentAction> modifications;
protected final MagicCard card;
protected final MagicPlayer controller;
protected final List<? extends MagicPermanentAction> modifications;

public MagicPlayCardAction(final MagicCard aCard, final MagicPlayer aController,final List<? extends MagicPermanentAction> aModifications) {
card = aCard;
Expand Down

0 comments on commit 4522d1d

Please sign in to comment.