external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

*Added UnlessCost$ parameter to AF_CounterMagic. Unfortunately it does not handle proper AbilityCosts but only simple manacosts. At least it's a start.

Browse Source 
*Converted to AF_CounterMagic:
	Convolute
	Daze
	Force Spike
	Mana Leak
	Mana Tithe
	Miscalculation
	Spell Pierce
	Spell Snip
	Runeboggle
This commit is contained in:
jendave
2011-08-06 14:09:13 +00:00
parent 402d538316
commit 94fed9d720
11 changed files with 244 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/cardsfolder/convolute.txt
View File

@@ -1,7 +1,8 @@
Name:Convolute Name:Convolute
ManaCost:2 U ManaCost:2 U
Types:Instant Types:Instant
Text:Counter target spell unless its controller pays 4. Text:no text
A:SP$Counter | Cost$ 2 U | Type$ Spell | UnlessCost$ 4 | SpellDescription$ Counter target spell unless its controller pays 4.
SVar:Rarity:Common SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/convolute.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/convolute.jpg
SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/41.jpg SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/41.jpg

2
res/cardsfolder/daze.txt
View File

@@ -2,6 +2,8 @@ Name:Daze
ManaCost:1 U ManaCost:1 U
Types:Instant Types:Instant
Text:no text Text:no text
A:SP$Counter | Cost$ 1 U | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
A:SP$Counter | Cost$ Return<1/Island> | Type$ Spell | UnlessCost$ 1 | CostDesc$ You may return an Island you control to its owner's hand | SpellDescription$ rather than pay CARDNAME's mana cost.
SVar:RemAIDeck:True SVar:RemAIDeck:True
SVar:Rarity:Common SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/daze.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/daze.jpg

3
res/cardsfolder/force_spike.txt
View File

@@ -1,7 +1,8 @@
Name:Force Spike Name:Force Spike
ManaCost:U ManaCost:U
Types:Instant Types:Instant
Text:Counter target spell unless its controller pays 1. Text:no text
A:SP$Counter | Cost$ U | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
SVar:Rarity:Common SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/force_spike.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/force_spike.jpg
SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/88.jpg SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/88.jpg

3
res/cardsfolder/mana_leak.txt
View File

@@ -1,7 +1,8 @@
Name:Mana Leak Name:Mana Leak
ManaCost:1 U ManaCost:1 U
Types:Instant Types:Instant
Text:Counter target spell unless its controller pays 3. Text:no text
A:SP$Counter | Cost$ 1 U | Type$ Spell | UnlessCost$ 3 | SpellDescription$ Counter target spell unless its controller pays 3.
SVar:Rarity:Common SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_leak.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_leak.jpg
SetInfo:M11|Common|http://magiccards.info/scans/en/m11/62.jpg SetInfo:M11|Common|http://magiccards.info/scans/en/m11/62.jpg

3
res/cardsfolder/mana_tithe.txt
View File

@@ -1,7 +1,8 @@
Name:Mana Tithe Name:Mana Tithe
ManaCost:W ManaCost:W
Types:Instant Types:Instant
Text:Counter target spell unless its controller pays 1. Text:no text
A:SP$Counter | Cost$ W | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
SVar:Rarity:Common SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_tithe.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_tithe.jpg
SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/25.jpg SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/25.jpg

3
res/cardsfolder/miscalculation.txt
View File

@@ -1,7 +1,8 @@
Name:Miscalculation Name:Miscalculation
ManaCost:1 U ManaCost:1 U
Types:Instant Types:Instant
Text:Counter target spell unless its controller pays 2. Text:no text
A:SP$Counter | Cost$ 1 U | Type$ Spell | UnlessCost$ 2 | SpellDescription$ Counter target spell unless its controller pays 2.
K:Cycling:2 K:Cycling:2
SVar:Rarity:Common SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/miscalculation.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/miscalculation.jpg

5
res/cardsfolder/runeboggle.txt
View File

@@ -1,8 +1,9 @@
Name:Runeboggle Name:Runeboggle
ManaCost:2 U ManaCost:2 U
Types:Instant Types:Instant
Text:Counter target spell unless its controller pays 1. Text:no text
K:Draw a card. A:SP$Counter | Cost$ 2 U | Type$ Spell | UnlessCost$ 1 | SubAbility$SVar=DBDraw | SpellDescription$ Counter target spell unless its controller pays 1. Draw a card
SVar:DBDraw:DB$Draw | NumCards$ 1
SVar:Rarity:Common SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/runeboggle.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/runeboggle.jpg
SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/33.jpg SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/33.jpg

3
res/cardsfolder/spell_pierce.txt
View File

@@ -1,7 +1,8 @@
Name:Spell Pierce Name:Spell Pierce
ManaCost:U ManaCost:U
Types:Instant Types:Instant
Text:Counter target noncreature spell unless its controller pays 2. Text:no text
A:SP$Counter | Cost$ U | Type$ Spell | CounterValid$ Card.nonCreature | UnlessCost$ 2 | SpellDescription$ Counter target noncreature spell unless its controller pays 2.
SVar:Rarity:Common SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_pierce.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_pierce.jpg
SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/67.jpg SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/67.jpg

3
res/cardsfolder/spell_snip.txt
View File

@@ -1,7 +1,8 @@
Name:Spell Snip Name:Spell Snip
ManaCost:2 U ManaCost:2 U
Types:Instant Types:Instant
Text:Counter target spell unless its controller pays 1. Text:no text
A:SP$Counter | Cost$ 2 U | Type$ Spell | UnlessCost$ 1 | SpellDescription$ Counter target spell unless its controller pays 1.
K:Cycling:2 K:Cycling:2
SVar:Rarity:Common SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_snip.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_snip.jpg

390
src/forge/AbilityFactory_CounterMagic.java
View File

@@ -27,6 +27,7 @@ public class AbilityFactory_CounterMagic {
private String destination = null; private String destination = null;
private String[] splitTargetingRestrictions = null; private String[] splitTargetingRestrictions = null;
private String[] splitExtraActions; private String[] splitExtraActions;
private String unlessCost = null;
private final SpellAbility[] tgt = new SpellAbility[1]; private final SpellAbility[] tgt = new SpellAbility[1];
@@ -46,6 +47,9 @@ public class AbilityFactory_CounterMagic {
} }
else splitExtraActions = new String[] {"None"}; else splitExtraActions = new String[] {"None"};
if(params.containsKey("UnlessCost"))
unlessCost = params.get("UnlessCost");
tgt[0] = null; tgt[0] = null;
} }
@@ -116,191 +120,44 @@ public class AbilityFactory_CounterMagic {
if(matchSpellAbility(sa.getSourceCard(), tgt[0], splitTargetingRestrictions, targetType) if(matchSpellAbility(sa.getSourceCard(), tgt[0], splitTargetingRestrictions, targetType)
&& AllZone.Stack.contains(tgt[0]) && AllZone.Stack.contains(tgt[0])
&& !tgt[0].getSourceCard().keywordsContain("CARDNAME can't be countered.")) { && !tgt[0].getSourceCard().keywordsContain("CARDNAME can't be countered.")) {
SpellAbility tgtSA = tgt[0]; final SpellAbility tgtSA = tgt[0];
AllZone.Stack.remove(tgt[0]);
System.out.println("Send countered spell to " + destination); System.out.println("Send countered spell to " + destination);
if(tgtSA.isAbility()) { if(unlessCost != null) {
//For Ability-targeted counterspells - do not move it anywhere, even if Destination$ is specified. Ability ability = new Ability(af.getHostCard(), unlessCost) {
@Override
public void resolve() {
;
} }
else if(destination.equals("Graveyard")) { };
AllZone.GameAction.moveToGraveyard(tgtSA.getSourceCard());
} final Command unpaidCommand = new Command() {
else if(destination.equals("Exile")) { private static final long serialVersionUID = 8094833091127334678L;
AllZone.GameAction.exile(tgtSA.getSourceCard());
} public void execute() {
else if(destination.equals("Topdeck")) { removeFromStack(tgtSA,sa);
AllZone.GameAction.moveToTopOfLibrary(tgtSA.getSourceCard());
}
else if(destination.equals("Hand")) {
AllZone.GameAction.moveToHand(tgtSA.getSourceCard());
}
else if(destination.equals("BottomDeck")) {
AllZone.GameAction.moveToBottomOfLibrary(tgtSA.getSourceCard());
}
else if(destination.equals("Shuffle")) {
AllZone.GameAction.moveToBottomOfLibrary(tgtSA.getSourceCard());
tgtSA.getSourceCard().getController().shuffle();
} }
};
if(AllZone.Stack.peek().getActivatingPlayer().isHuman()) {
GameActionUtil.payManaDuringAbilityResolve(af.getHostCard() + "\r\n", ability.getManaCost(),
Command.Blank, unpaidCommand);
} else {
if(ComputerUtil.canPayCost(ability)) ComputerUtil.playNoStack(ability);
else { else {
throw new IllegalArgumentException("AbilityFactory_CounterMagic: Invalid Destination argument for card " + source.getName()); removeFromStack(tgtSA,sa);
}
for(int ea = 0; ea < splitExtraActions.length; ea++) {
boolean isOptional = false;
if(splitExtraActions[0].equals("None")) {
break;
}
String ActionID = splitExtraActions[ea].substring(0,splitExtraActions[ea].indexOf('('));
Player Target = null;
String ActionParams = splitExtraActions[ea].substring(splitExtraActions[ea].indexOf('(')+1);
ActionParams = ActionParams.substring(0,ActionParams.length()-1);
String[] SplitActionParams = ActionParams.split(",");
System.out.println("Extra Action: " + ActionID);
System.out.println("Parameters: " + ActionParams);
if(ActionID.startsWith("My-")) {
ActionID = ActionID.substring(3);
Target = source.getController();
}
else if(ActionID.startsWith("Opp-")) {
ActionID = ActionID.substring(4);
Target = source.getController().getOpponent();
}
else if(ActionID.startsWith("CC-")) {
ActionID = ActionID.substring(3);
Target = tgtSA.getSourceCard().getController();
}
if(ActionID.startsWith("May-")) {
ActionID = ActionID.substring(4);
isOptional = true;
}
if(ActionID.equals("Draw")) {
if(isOptional) {
if(Target == AllZone.HumanPlayer) {
if(GameActionUtil.showYesNoDialog(source, "Do you want to draw " + SplitActionParams[0] + " card(s)?")) {
Target.drawCards(Integer.parseInt(SplitActionParams[0]));
} }
} }
else { doExtraActions(tgtSA,sa);
//AI decision-making, only draws a card if it doesn't risk discarding it.
if(AllZone.getZone(Constant.Zone.Hand,AllZone.ComputerPlayer).getCards().length + Integer.parseInt(SplitActionParams[0]) < 6) {
Target.drawCards(Integer.parseInt(SplitActionParams[0]));
} }
} else
} {
else { removeFromStack(tgtSA,sa);
Target.drawCards(Integer.parseInt(SplitActionParams[0])); doExtraActions(tgtSA,sa);
} }
} }
else if(ActionID.equals("Discard")) {
if(isOptional) {
if(Target == AllZone.HumanPlayer) {
if(GameActionUtil.showYesNoDialog(source, "Do you want to discard " + SplitActionParams[0] + " card(s)?")) {
Target.discard(Integer.parseInt(SplitActionParams[0]), sa, true);
}
}
else {
//AI decisionmaking. Should take Madness cards and the like into account in the future. Right now always refuses to discard.
}
}
else {
Target.discard(Integer.parseInt(SplitActionParams[0]), sa, true);
}
}
else if(ActionID.equals("LoseLife")) {
if(isOptional) {
if(Target == AllZone.HumanPlayer) {
if(GameActionUtil.showYesNoDialog(source, "Do you want to lose " + SplitActionParams[0] + " life?")) {
Target.loseLife(Integer.parseInt(SplitActionParams[0]), source);
}
}
else {
//AI decisionmaking. Not sure why one would ever want to agree to this, except for the rare case of Near-Death Experience+Ali Baba.
}
}
else {
Target.loseLife(Integer.parseInt(SplitActionParams[0]), source);
}
}
else if(ActionID.equals("GainLife")) {
if(isOptional) {
if(Target == AllZone.HumanPlayer) {
if(AllZone.Display.getChoice("Do you want to gain" + SplitActionParams[0] + "life?","Yes","No").equals("Yes")) {
Target.gainLife(Integer.parseInt(SplitActionParams[0]), source);
}
}
else {
//AI decisionmaking. Not sure why one would ever want to decline this, except for the rare case of Near-Death Experience.
Target.gainLife(Integer.parseInt(SplitActionParams[0]), source);
}
}
else {
Target.gainLife(Integer.parseInt(SplitActionParams[0]), source);
}
}
else if(ActionID.equals("RevealHand")) {
if(isOptional) {
System.out.println(Target);
if(Target == AllZone.HumanPlayer) {
if(AllZone.Display.getChoice("Do you want to reveal your hand?","Yes","No").equals("Yes")) {
//Does nothing now, of course, but sometime in the future the AI may be able to remember cards revealed and prioritize discard spells accordingly.
}
}
else {
//AI decisionmaking. Not sure why one would ever want to agree to this
}
}
else {
System.out.println(Target);
if(Target == AllZone.HumanPlayer) {
//Does nothing now, of course, but sometime in the future the AI may be able to remember cards revealed and prioritize discard spells accordingly.
}
else {
CardList list = new CardList(AllZone.getZone(Constant.Zone.Hand,AllZone.ComputerPlayer).getCards());
AllZone.Display.getChoiceOptional("Revealed cards",list.toArray());
}
}
}
else if(ActionID.equals("RearrangeTopOfLibrary")) {
if(isOptional) {
if(Target == AllZone.HumanPlayer) {
if(AllZone.Display.getChoice("Do you want to rearrange the top " + SplitActionParams[0] + " cards of your library?","Yes","No").equals("Yes")) {
AllZoneUtil.rearrangeTopOfLibrary(Target, Integer.parseInt(SplitActionParams[0]), false);
}
}
else {
//AI decisionmaking. AI simply can't atm, and wouldn't know how best to do it anyway.
}
}
else {
if(Target == AllZone.HumanPlayer) {
AllZoneUtil.rearrangeTopOfLibrary(Target, Integer.parseInt(SplitActionParams[0]), false);
}
else {
CardList list = new CardList(AllZone.getZone(Constant.Zone.Hand,AllZone.ComputerPlayer).getCards());
AllZone.Display.getChoiceOptional("Revealed cards",list.toArray());
}
}
}
else {
throw new IllegalArgumentException("AbilityFactory_CounterMagic: Invalid Extra Action for card " + sa.getSourceCard().getName());
}
}
}
//end copied from spCounter
//}
if (af.hasSubAbility()){ if (af.hasSubAbility()){
Ability_Sub abSub = sa.getSubAbility(); Ability_Sub abSub = sa.getSubAbility();
@@ -316,6 +173,7 @@ public class AbilityFactory_CounterMagic {
//reset tgts //reset tgts
tgt[0] = null; tgt[0] = null;
} }
private String counterStackDescription(AbilityFactory af, SpellAbility sa){ private String counterStackDescription(AbilityFactory af, SpellAbility sa){
@@ -372,9 +230,195 @@ public class AbilityFactory_CounterMagic {
Ability_Sub subAb = sa.getSubAbility(); Ability_Sub subAb = sa.getSubAbility();
if (subAb != null) if (subAb != null)
toReturn &= subAb.chkAI_Drawback(); toReturn &= subAb.chkAI_Drawback();
return toReturn; return toReturn;
} }
private void removeFromStack(SpellAbility tgtSA,SpellAbility srcSA)
{
AllZone.Stack.remove(tgtSA);
if(tgtSA.isAbility()) {
//For Ability-targeted counterspells - do not move it anywhere, even if Destination$ is specified.
}
else if(destination.equals("Graveyard")) {
AllZone.GameAction.moveToGraveyard(tgtSA.getSourceCard());
}
else if(destination.equals("Exile")) {
AllZone.GameAction.exile(tgtSA.getSourceCard());
}
else if(destination.equals("Topdeck")) {
AllZone.GameAction.moveToTopOfLibrary(tgtSA.getSourceCard());
}
else if(destination.equals("Hand")) {
AllZone.GameAction.moveToHand(tgtSA.getSourceCard());
}
else if(destination.equals("BottomDeck")) {
AllZone.GameAction.moveToBottomOfLibrary(tgtSA.getSourceCard());
}
else if(destination.equals("Shuffle")) {
AllZone.GameAction.moveToBottomOfLibrary(tgtSA.getSourceCard());
tgtSA.getSourceCard().getController().shuffle();
}
else {
throw new IllegalArgumentException("AbilityFactory_CounterMagic: Invalid Destination argument for card " + srcSA.getSourceCard().getName());
}
}
private void doExtraActions(SpellAbility tgtSA,SpellAbility srcSA)
{
for(int ea = 0; ea < splitExtraActions.length; ea++) {
boolean isOptional = false;
if(splitExtraActions[0].equals("None")) {
break;
}
String ActionID = splitExtraActions[ea].substring(0,splitExtraActions[ea].indexOf('('));
Player Target = null;
String ActionParams = splitExtraActions[ea].substring(splitExtraActions[ea].indexOf('(')+1);
ActionParams = ActionParams.substring(0,ActionParams.length()-1);
String[] SplitActionParams = ActionParams.split(",");
System.out.println("Extra Action: " + ActionID);
System.out.println("Parameters: " + ActionParams);
if(ActionID.startsWith("My-")) {
ActionID = ActionID.substring(3);
Target = srcSA.getSourceCard().getController();
}
else if(ActionID.startsWith("Opp-")) {
ActionID = ActionID.substring(4);
Target = srcSA.getSourceCard().getController().getOpponent();
}
else if(ActionID.startsWith("CC-")) {
ActionID = ActionID.substring(3);
Target = tgtSA.getSourceCard().getController();
}
if(ActionID.startsWith("May-")) {
ActionID = ActionID.substring(4);
isOptional = true;
}
if(ActionID.equals("Draw")) {
if(isOptional) {
if(Target == AllZone.HumanPlayer) {
if(GameActionUtil.showYesNoDialog(srcSA.getSourceCard(), "Do you want to draw " + SplitActionParams[0] + " card(s)?")) {
Target.drawCards(Integer.parseInt(SplitActionParams[0]));
}
}
else {
//AI decision-making, only draws a card if it doesn't risk discarding it.
if(AllZone.getZone(Constant.Zone.Hand,AllZone.ComputerPlayer).getCards().length + Integer.parseInt(SplitActionParams[0]) < 6) {
Target.drawCards(Integer.parseInt(SplitActionParams[0]));
}
}
}
else {
Target.drawCards(Integer.parseInt(SplitActionParams[0]));
}
}
else if(ActionID.equals("Discard")) {
if(isOptional) {
if(Target == AllZone.HumanPlayer) {
if(GameActionUtil.showYesNoDialog(srcSA.getSourceCard(), "Do you want to discard " + SplitActionParams[0] + " card(s)?")) {
Target.discard(Integer.parseInt(SplitActionParams[0]), srcSA, true);
}
}
else {
//AI decisionmaking. Should take Madness cards and the like into account in the future. Right now always refuses to discard.
}
}
else {
Target.discard(Integer.parseInt(SplitActionParams[0]), srcSA, true);
}
}
else if(ActionID.equals("LoseLife")) {
if(isOptional) {
if(Target == AllZone.HumanPlayer) {
if(GameActionUtil.showYesNoDialog(srcSA.getSourceCard(), "Do you want to lose " + SplitActionParams[0] + " life?")) {
Target.loseLife(Integer.parseInt(SplitActionParams[0]), srcSA.getSourceCard());
}
}
else {
//AI decisionmaking. Not sure why one would ever want to agree to this, except for the rare case of Near-Death Experience+Ali Baba.
}
}
else {
Target.loseLife(Integer.parseInt(SplitActionParams[0]), srcSA.getSourceCard());
}
}
else if(ActionID.equals("GainLife")) {
if(isOptional) {
if(Target == AllZone.HumanPlayer) {
if(AllZone.Display.getChoice("Do you want to gain" + SplitActionParams[0] + "life?","Yes","No").equals("Yes")) {
Target.gainLife(Integer.parseInt(SplitActionParams[0]), srcSA.getSourceCard());
}
}
else {
//AI decisionmaking. Not sure why one would ever want to decline this, except for the rare case of Near-Death Experience.
Target.gainLife(Integer.parseInt(SplitActionParams[0]), srcSA.getSourceCard());
}
}
else {
Target.gainLife(Integer.parseInt(SplitActionParams[0]), srcSA.getSourceCard());
}
}
else if(ActionID.equals("RevealHand")) {
if(isOptional) {
System.out.println(Target);
if(Target == AllZone.HumanPlayer) {
if(AllZone.Display.getChoice("Do you want to reveal your hand?","Yes","No").equals("Yes")) {
//Does nothing now, of course, but sometime in the future the AI may be able to remember cards revealed and prioritize discard spells accordingly.
}
}
else {
//AI decisionmaking. Not sure why one would ever want to agree to this
}
}
else {
System.out.println(Target);
if(Target == AllZone.HumanPlayer) {
//Does nothing now, of course, but sometime in the future the AI may be able to remember cards revealed and prioritize discard spells accordingly.
}
else {
CardList list = new CardList(AllZone.getZone(Constant.Zone.Hand,AllZone.ComputerPlayer).getCards());
AllZone.Display.getChoiceOptional("Revealed cards",list.toArray());
}
}
}
else if(ActionID.equals("RearrangeTopOfLibrary")) {
if(isOptional) {
if(Target == AllZone.HumanPlayer) {
if(AllZone.Display.getChoice("Do you want to rearrange the top " + SplitActionParams[0] + " cards of your library?","Yes","No").equals("Yes")) {
AllZoneUtil.rearrangeTopOfLibrary(Target, Integer.parseInt(SplitActionParams[0]), false);
}
}
else {
//AI decisionmaking. AI simply can't atm, and wouldn't know how best to do it anyway.
}
}
else {
if(Target == AllZone.HumanPlayer) {
AllZoneUtil.rearrangeTopOfLibrary(Target, Integer.parseInt(SplitActionParams[0]), false);
}
else {
CardList list = new CardList(AllZone.getZone(Constant.Zone.Hand,AllZone.ComputerPlayer).getCards());
AllZone.Display.getChoiceOptional("Revealed cards",list.toArray());
}
}
}
else {
throw new IllegalArgumentException("AbilityFactory_CounterMagic: Invalid Extra Action for card " + srcSA.getSourceCard().getName());
}
}
}
private static boolean matchSpellAbility(Card srcCard, SpellAbility sa, String[] splitRestrictions, String targetType) { private static boolean matchSpellAbility(Card srcCard, SpellAbility sa, String[] splitRestrictions, String targetType) {
if(targetType.equals("Spell")) { if(targetType.equals("Spell")) {
if(sa.isAbility()) { if(sa.isAbility()) {

4
src/forge/CardFactory_Instants.java
View File

@@ -1210,7 +1210,7 @@ public class CardFactory_Instants {
spell.setBeforePayMana(CardFactoryUtil.input_targetPlayer(spell)); spell.setBeforePayMana(CardFactoryUtil.input_targetPlayer(spell));
}//*************** END ************ END ************************** }//*************** END ************ END **************************
/*
//*************** START *********** START ************************** //*************** START *********** START **************************
else if(cardName.equals("Spell Pierce")) { else if(cardName.equals("Spell Pierce")) {
SpellAbility spell = new Spell(card) { SpellAbility spell = new Spell(card) {
@@ -1405,7 +1405,7 @@ public class CardFactory_Instants {
card.setText(""); card.setText("");
} }
}//*************** END ************ END ************************** }//*************** END ************ END **************************
*/
//*************** START *********** START ************************** //*************** START *********** START **************************
else if(cardName.equals("Impulse")) { else if(cardName.equals("Impulse")) {