diff --git a/.gitattributes b/.gitattributes index 73411d831e5..c010b09eb10 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6006,6 +6006,7 @@ res/cardsfolder/volcanic_spray.txt -text svneol=native#text/plain res/cardsfolder/volcanic_strength.txt -text svneol=native#text/plain res/cardsfolder/volcanic_submersion.txt -text svneol=native#text/plain res/cardsfolder/volcano_imp.txt -text svneol=native#text/plain +res/cardsfolder/volition_reins.txt -text svneol=native#text/plain res/cardsfolder/volraths_dungeon.txt -text svneol=native#text/plain res/cardsfolder/volraths_gardens.txt -text svneol=native#text/plain res/cardsfolder/volraths_stronghold.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/volition_reins.txt b/res/cardsfolder/volition_reins.txt new file mode 100644 index 00000000000..90e3ee40746 --- /dev/null +++ b/res/cardsfolder/volition_reins.txt @@ -0,0 +1,11 @@ +Name:Volition Reins +ManaCost:3 U U U +Types:Enchantment Aura +Text:You control enchanted permanent. +K:Enchant permanent +# This trigger does not work. Yet. +#T:Mode$ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ When CARDNAME enters the battlefield, if enchanted permanent is tapped, untap it. +#SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Enchanted +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/volition_reins.jpg +End \ No newline at end of file diff --git a/src/forge/CardFactory_Auras.java b/src/forge/CardFactory_Auras.java index 581b815e9d5..89be92f8113 100644 --- a/src/forge/CardFactory_Auras.java +++ b/src/forge/CardFactory_Auras.java @@ -47,7 +47,7 @@ class CardFactory_Auras { return -1; } - public static Card getCard(final Card card, String cardName, Player owner) { + public static Card getCard(final Card card, final String cardName, Player owner) { Command standardUnenchant = new Command() { private static final long serialVersionUID = 3938247133551483568L; @@ -1636,11 +1636,11 @@ class CardFactory_Auras { //*************** START *********** START ************************** - else if(cardName.equals("Take Possession")) { + else if(cardName.equals("Take Possession") || cardName.equals("Volition Reins")) { final Player[] prevController = new Player[1]; prevController[0] = null; - - Ability_Cost cost = new Ability_Cost("5 U U", cardName, false); + String costString = cardName.equals("Volition Reins") ? "3 U U U" : "5 U U"; + Ability_Cost cost = new Ability_Cost(costString, cardName, false); Target tgt = new Target("Select target Permanent", "Permanent".split(",")); final SpellAbility spell = new Spell(card, cost, tgt) { @@ -1662,7 +1662,10 @@ class CardFactory_Auras { prevController[0] = c.getController(); AllZone.GameAction.moveToPlay(card); c.attachCard(card); - AllZone.GameAction.changeController(new CardList(c), c.getController(), card.getController()); + AllZone.GameAction.changeController(new CardList(c), c.getController(), card.getController()); + if(cardName.equals("Volition Reins")) { + if(c.isTapped()) c.untap(); + } }//resolve() };