From 70960366afa5819a0445394d0d11e0c6c651f55a Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 11:04:35 +0000 Subject: [PATCH] convert Act of Treason, Slave of Bolas and Threaten to AF_GainControl --- res/cardsfolder/act_of_treason.txt | 4 +++- res/cardsfolder/slave_of_bolas.txt | 4 +++- res/cardsfolder/threaten.txt | 4 +++- src/forge/AbilityFactory_GainControl.java | 7 +++---- src/forge/CardFactory_Sorceries.java | 5 ++--- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/res/cardsfolder/act_of_treason.txt b/res/cardsfolder/act_of_treason.txt index 238dd041bab..e59dd9d6780 100644 --- a/res/cardsfolder/act_of_treason.txt +++ b/res/cardsfolder/act_of_treason.txt @@ -1,7 +1,9 @@ Name:Act of Treason ManaCost:2 R Types:Sorcery -Text:Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn. (It can attack this turn.) +Text:no text +A:SP$GainControl|Cost$2 R|Tgt$TgtC|LoseControl$EOT|Untap$True|AddKWs$Haste|SpellDescription$Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. +SVar:PlayMain1:TRUE SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/act_of_treason.jpg End diff --git a/res/cardsfolder/slave_of_bolas.txt b/res/cardsfolder/slave_of_bolas.txt index 87ea670c46f..58f31ba3a40 100644 --- a/res/cardsfolder/slave_of_bolas.txt +++ b/res/cardsfolder/slave_of_bolas.txt @@ -1,7 +1,9 @@ Name:Slave of Bolas ManaCost:3 UR B Types:Sorcery -Text:Gain control of target creature. Untap that creature. It gains haste until end of turn. Sacrifice it at the beginning of the next end step. +Text:no text +A:SP$GainControl|Cost$3 UR B|Tgt$TgtC|LoseControl$EOT|Untap$True|AddKWs$Haste & At the beginning of the end step, sacrifice CARDNAME. |SpellDescription$Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. +SVar:PlayMain1:TRUE SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/slave_of_bolas.jpg End diff --git a/res/cardsfolder/threaten.txt b/res/cardsfolder/threaten.txt index 9a97f595798..05487fd34e2 100644 --- a/res/cardsfolder/threaten.txt +++ b/res/cardsfolder/threaten.txt @@ -1,7 +1,9 @@ Name:Threaten ManaCost:2 R Types:Sorcery -Text:Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn. (It can attack this turn.) +Text:no text +A:SP$GainControl|Cost$2 R|Tgt$TgtC|LoseControl$EOT|Untap$True|AddKWs$Haste|SpellDescription$Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. +SVar:PlayMain1:True SVar:Rarity:Uncommon SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83472.jpg End diff --git a/src/forge/AbilityFactory_GainControl.java b/src/forge/AbilityFactory_GainControl.java index 7583a300de0..58e9ab5de52 100644 --- a/src/forge/AbilityFactory_GainControl.java +++ b/src/forge/AbilityFactory_GainControl.java @@ -31,18 +31,17 @@ public class AbilityFactory_GainControl { AF = newAF; params = AF.getMapParams(); hostCard = AF.getHostCard(); - if (params.containsKey("LoseControl")) + if (params.containsKey("LoseControl")) { lose = new ArrayList(Arrays.asList(params.get("LoseControl").split(","))); + } if(params.containsKey("Untap")) { bUntap = true; } if(params.containsKey("TapOnLose")) { - //if(params.get("Untap").equals("True")) { bTapOnLose = true; - //} } if(params.containsKey("AddKWs")) { - kws = new ArrayList(Arrays.asList(params.get("AddKWs").split("&"))); + kws = new ArrayList(Arrays.asList(params.get("AddKWs").split(" & "))); } } diff --git a/src/forge/CardFactory_Sorceries.java b/src/forge/CardFactory_Sorceries.java index 3687b0a2aa3..2eaa69f9caf 100644 --- a/src/forge/CardFactory_Sorceries.java +++ b/src/forge/CardFactory_Sorceries.java @@ -660,7 +660,7 @@ public class CardFactory_Sorceries { card.addSpellAbility(spell_two); }//*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Threaten") || cardName.equals("Act of Treason") || cardName.equals("Slave of Bolas")) { final PlayerZone[] orig = new PlayerZone[1]; @@ -750,6 +750,7 @@ public class CardFactory_Sorceries { card.setSVar("PlayMain1", "TRUE"); }//*************** END ************ END ************************** + */ //*************** START *********** START ************************** else if(cardName.equals("Insurrection")) { @@ -7524,8 +7525,6 @@ public class CardFactory_Sorceries { maxCards = Math.min(maxCards, num); //opponent moves this many cards to graveyard - PlayerZone oppLib = AllZone.getZone(Constant.Zone.Library, opp); - opp.mill(maxCards); //then, move revealed cards to bottom of library