From 1a5c749b15528141f0f97dfbc58e90fa31eaea3a Mon Sep 17 00:00:00 2001 From: moomarc Date: Thu, 8 Aug 2013 18:34:20 +0000 Subject: [PATCH] - Improved script of Venser, Shaper Savant --- res/cardsfolder/v/venser_shaper_savant.txt | 8 ++------ .../java/forge/card/ability/effects/ChangeZoneEffect.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/res/cardsfolder/v/venser_shaper_savant.txt b/res/cardsfolder/v/venser_shaper_savant.txt index 5f1223e018a..3d01f4ecbbe 100644 --- a/res/cardsfolder/v/venser_shaper_savant.txt +++ b/res/cardsfolder/v/venser_shaper_savant.txt @@ -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. \ No newline at end of file diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java index a3d10a0cf1f..9d9a019e6f7 100644 --- a/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java +++ b/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java @@ -519,7 +519,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect { if (sa.hasParam("Fizzle")) { ArrayList 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);