diff --git a/.gitattributes b/.gitattributes index e67afa315d3..b48a7b13a26 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7584,6 +7584,7 @@ res/cardsfolder/unstable_mutation.txt -text svneol=native#text/plain res/cardsfolder/unsummon.txt -text svneol=native#text/plain res/cardsfolder/untamed_might.txt -text svneol=native#text/plain res/cardsfolder/untamed_wilds.txt -text svneol=native#text/plain +res/cardsfolder/unwilling_recruit.txt -text svneol=native#text/plain res/cardsfolder/unwinding_clock.txt -text svneol=native#text/plain res/cardsfolder/unworthy_dead.txt -text svneol=native#text/plain res/cardsfolder/unyaro_bee_sting.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/unwilling_recruit.txt b/res/cardsfolder/unwilling_recruit.txt new file mode 100644 index 00000000000..14d54197979 --- /dev/null +++ b/res/cardsfolder/unwilling_recruit.txt @@ -0,0 +1,10 @@ +Name:Unwilling Recruit +ManaCost:X R R R +Types:Sorcery +Text:no text +A:SP$ GainControl | Cost$ X R R R | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | SubAbility$ SVar=DBPump | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gets +X/+0 and gains haste until end of turn. +SVar:DBPump:DB$Pump | Defined$ Targeted | NumAtt$ X | KW$ Haste +SVar:X:Count$xPaid +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/unwilling_recruit.jpg +End \ No newline at end of file diff --git a/src/forge/card/abilityFactory/AbilityFactory_GainControl.java b/src/forge/card/abilityFactory/AbilityFactory_GainControl.java index 92b8c1e2638..cc3db75dca4 100644 --- a/src/forge/card/abilityFactory/AbilityFactory_GainControl.java +++ b/src/forge/card/abilityFactory/AbilityFactory_GainControl.java @@ -335,9 +335,11 @@ public class AbilityFactory_GainControl { if(null == c) return; if(AllZoneUtil.isCardInPlay(c)) { - AllZone.GameAction.changeController(new CardList(c), c.getController(), c.getController().getOpponent()); - - c.setSickness(true); + if(c.getController() != c.getOwner()) { + AllZone.GameAction.changeController(new CardList(c), c.getController(), c.getController().getOpponent()); + c.setSickness(true); + } + if(bTapOnLose) c.tap();