- Improved script of Venser, Shaper Savant

This commit is contained in:
moomarc
2013-08-08 18:34:20 +00:00
parent 0afd72195b
commit 1a5c749b15
2 changed files with 3 additions and 7 deletions

View File

@@ -3,11 +3,7 @@ ManaCost:2 U U
Types:Legendary Creature Human Wizard
PT:2/2
K:Flash
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE1 | Execute$ ChooseTgtMode | TriggerDescription$ When CARDNAME enters the battlefield, return target spell or permanent to its owner's hand.
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ LT1 | Execute$ BouncePermanent | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield, return target spell or permanent to its owner's hand.
SVar:ChooseTgtMode:AB$ Charm | Cost$ 0 | Defined$ You | Choices$ BounceSpell,BouncePermanent
SVar:BounceSpell:DB$ChangeZone | TargetType$ Spell | ValidTgts$ Card | TgtZone$ Stack | Origin$ Stack | Destination$ Hand | TargetMin$ 1 | TargetMax$ 1 | SpellDescription$ Return target spell to its owner's hand.
SVar:BouncePermanent:DB$ChangeZone | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand | TargetMin$ 1 | TargetMax$ 1 | SpellDescription$ Return target permanent to its owner's hand.
SVar:X:Count$SpellsOnStack
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ VensersBounce | TriggerDescription$ When CARDNAME enters the battlefield, return target spell or permanent to its owner's hand.
SVar:VensersBounce:DB$ ChangeZone | ValidTgts$ Permanent,Card.inZoneStack | TgtZone$ Stack,Battlefield | Origin$ Battlefield,Stack | Fizzle$ True | Destination$ Hand
SVar:Picture:http://www.wizards.com/global/images/magic/general/venser_shaper_savant.jpg
Oracle:Flash (You may cast this spell any time you could cast an instant.)\nWhen Venser, Shaper Savant enters the battlefield, return target spell or permanent to its owner's hand.

View File

@@ -519,7 +519,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
if (sa.hasParam("Fizzle")) {
ArrayList<SpellAbility> spells = tgtC.getSpellAbilities();
for (SpellAbility spell : spells) {
if (tgtC.isInZone(ZoneType.Exile)) {
if (tgtC.isInZone(ZoneType.Exile) || tgtC.isInZone(ZoneType.Hand)) {
final SpellAbilityStackInstance si = game.getStack().getInstanceFromSpellAbility(spell);
if (si != null) {
game.getStack().remove(si);