From 3c171b2cbc767658c2c8458b9235672179fffc07 Mon Sep 17 00:00:00 2001 From: friarsol Date: Sun, 28 Jun 2020 22:47:44 -0400 Subject: [PATCH] Update companion rules to move to hand for 3 mana --- forge-game/src/main/java/forge/game/player/Player.java | 9 ++++++--- forge-gui/res/cardsfolder/m/mask_of_the_mimic.txt | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 41864de4de9..55c0df3b019 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -3009,9 +3009,12 @@ public class Player extends GameEntity implements Comparable { final String name = Lang.getPossesive(companion.getName()) + " Companion Effect"; DetachedCardEffect eff = new DetachedCardEffect(companion, name); - String mayBePlayedAbility = "Mode$ Continuous | EffectZone$ Command | MayPlay$ True | Affected$ Card.YouOwn+EffectSource | AffectedZone$ Command"; - eff.addStaticAbility(mayBePlayedAbility); - // Probably remove this effect when the spell is cast via a static trigger + String addToHandAbility = "Mode$ Continuous | EffectZone$ Command | Affected$ Card.YouOwn+EffectSource | AffectedZone$ Command | AddAbility$ MoveToHand"; + String moveToHand = "ST$ ChangeZone | Cost$ 3 | Defined$ Self | Origin$ Command | Destination$ Hand | ActivationZone$ Command | SpellDescription$ Companion - Put CARDNAME in to your hand"; + eff.setSVar("MoveToHand", moveToHand); + eff.addStaticAbility(addToHandAbility); + + // TODO Probably remove this effect when the moved to hand return eff; } diff --git a/forge-gui/res/cardsfolder/m/mask_of_the_mimic.txt b/forge-gui/res/cardsfolder/m/mask_of_the_mimic.txt index 87ad91674ec..259f64277df 100644 --- a/forge-gui/res/cardsfolder/m/mask_of_the_mimic.txt +++ b/forge-gui/res/cardsfolder/m/mask_of_the_mimic.txt @@ -1,7 +1,7 @@ Name:Mask of the Mimic ManaCost:U Types:Instant -A:SP$ Pump | Cost$ U Sac<1/Creature> | ValidTgts$ Creature.nonToken | TgtPrompt$ Select target nontoken creature | Static$ True | StackDescription$ None | SubAbility$ DBChangeZone +A:SP$ Pump | Cost$ U Sac<1/Creature> | ValidTgts$ Creature.nonToken | TgtPrompt$ Select target nontoken creature | StackDescription$ None | SubAbility$ DBChangeZone SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Targeted.sameName | ChangeNum$ 1 | Hidden$ True | StackDescription$ Search your library for a card with the same name as target nontoken creature and put that card onto the battlefield. | SpellDescription$ As an additional cost to cast CARDNAME, sacrifice a creature. Search your library for a card with the same name as target nontoken creature and put that card onto the battlefield. Then shuffle your library. AI:RemoveDeck:All SVar:Picture:http://www.wizards.com/global/images/magic/general/mask_of_the_mimic.jpg