- Added Disrupting Shoal and Minamo's Meddling

This commit is contained in:
swordshine
2013-05-06 00:45:41 +00:00
parent 9c630f7155
commit 33276e0d67
4 changed files with 29 additions and 0 deletions

2
.gitattributes vendored
View File

@@ -2750,6 +2750,7 @@ res/cardsfolder/d/disperse.txt svneol=native#text/plain
res/cardsfolder/d/dispersing_orb.txt svneol=native#text/plain
res/cardsfolder/d/disrupt.txt svneol=native#text/plain
res/cardsfolder/d/disrupting_scepter.txt svneol=native#text/plain
res/cardsfolder/d/disrupting_shoal.txt -text
res/cardsfolder/d/disruption_aura.txt -text
res/cardsfolder/d/disruptive_pitmage.txt svneol=native#text/plain
res/cardsfolder/d/disruptive_student.txt svneol=native#text/plain
@@ -6755,6 +6756,7 @@ res/cardsfolder/m/miming_slime.txt -text
res/cardsfolder/m/minamo_school_at_waters_edge.txt svneol=native#text/plain
res/cardsfolder/m/minamo_scrollkeeper.txt svneol=native#text/plain
res/cardsfolder/m/minamo_sightbender.txt svneol=native#text/plain
res/cardsfolder/m/minamos_meddling.txt -text
res/cardsfolder/m/mind_burst.txt svneol=native#text/plain
res/cardsfolder/m/mind_control.txt svneol=native#text/plain
res/cardsfolder/m/mind_extraction.txt -text

View File

@@ -0,0 +1,12 @@
Name:Disrupting Shoal
ManaCost:X U U
Types:Instant Arcane
A:SP$ Counter | Cost$ X U U | TargetType$ Spell | ValidTgts$ Card | ConditionCheckSVar$ TargetCMC | ConditionSVarCompare$ EQX | References$ X,TargetCMC | SpellDescription$ Counter target spell if its converted mana cost is X.
A:SP$ Counter | Cost$ ExileFromHand<1/Card.Blue> | CostDesc$ You may exile a blue card with converted mana cost X from your hand. | TargetType$ Spell | ValidTgts$ Card | ConditionCheckSVar$ TargetCMC | ConditionSVarCompare$ EQY | References$ TargetCMC,Y | SpellDescription$ Counter target spell if its converted mana cost is X.
SVar:X:Count$xPaid
SVar:TargetCMC:Targeted$CardManaCost
SVar:Y:Exiled$CardManaCost
SVar:RemAIDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/disrupting_shoal.jpg
Oracle:You may exile a blue card with converted mana cost X from your hand rather than pay Disrupting Shoal's mana cost.\nCounter target spell if its converted mana cost is X.
SetInfo:BOK Rare

View File

@@ -0,0 +1,9 @@
Name:Minamo's Meddling
ManaCost:2 U U
Types:Instant
A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ DBDisCard | RememberSplicedOntoCounteredSpell$ True | SpellDescription$ Counter target spell. That spell's controller reveals his or her hand, then discards each card with the same name as a card spliced onto that spell.
SVar:DBDisCard:DB$ Discard | Defined$ TargetedController | DiscardValid$ Card.sharesNameWith Remembered | Mode$ RevealDiscardAll | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:Picture:http://www.wizards.com/global/images/magic/general/minamos_meddling.jpg
Oracle:Counter target spell. That spell's controller reveals his or her hand, then discards each card with the same name as a card spliced onto that spell.
SetInfo:BOK Common

View File

@@ -116,6 +116,12 @@ public class CounterEffect extends SpellAbilityEffect {
sa.getSourceCard().addRemembered(tgtSACard);
}
}
if (sa.hasParam("RememberSplicedOntoCounteredSpell")) {
if (tgtSA.getSplicedCards() != null) {
sa.getSourceCard().getRemembered().addAll(tgtSA.getSplicedCards());
}
}
}
} // end counterResolve