diff --git a/res/cardsfolder/spiteful_visions.txt b/res/cardsfolder/spiteful_visions.txt index 49956b74bec..1881208270c 100644 --- a/res/cardsfolder/spiteful_visions.txt +++ b/res/cardsfolder/spiteful_visions.txt @@ -1,7 +1,11 @@ Name:Spiteful Visions ManaCost:2 BR BR Types:Enchantment -Text:At the beginning of each player's draw step, that player draws an additional card.\r\nWhenever a player draws a card, Spiteful Visions deals 1 damage to that player. +Text:no text +T:Mode$ Phase | Phase$ Draw | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of each player's draw step, that player draws an additional card. +SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 1 | Defined$ TriggeredPlayer +T:Mode$ Drawn | ValidCard$ Card | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a player draws a card, CARDNAME deals 1 damage to that player. +SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredCardOwner | NumDmg$ 1 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/spiteful_visions.jpg SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/198.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index d453dd8abc9..e2832ff06f5 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -114,7 +114,6 @@ public class GameActionUtil { draw_Howling_Mine(player); draw_Rites_of_Flourishing(player); draw_Anvil_of_Bogardan(player); - draw_Spiteful_Visions(player); draw_Kami_Crescent_Moon(player); draw_Font_of_Mythos(player); draw_Overbeing_of_Myth(player); @@ -1241,35 +1240,6 @@ public class GameActionUtil { }//if }//Curse of Wizardry - - public static void executeDrawCardTriggeredEffects(Player player) { - Object[] DrawCard_Whenever_Parameters = new Object[1]; - DrawCard_Whenever_Parameters[0] = player; - AllZone.GameAction.checkWheneverKeyword(AllZone.CardFactory.HumanNullCard,"DrawCard",DrawCard_Whenever_Parameters); - - drawCardTriggered_Spiteful_Visions(player); - } - - private static void drawCardTriggered_Spiteful_Visions(final Player player) { - CardList list = AllZoneUtil.getCardsInPlay("Spiteful Visions"); - - for(int i = 0; i < list.size(); i++) { - final Card source = list.get(i); - final Ability ability = new Ability(source, "0") { - @Override - public void resolve() { - player.addDamage(1, source); - } - };// Ability - - StringBuilder sb = new StringBuilder(); - sb.append(source).append(" - deals 1 damage to ").append(player).append("."); - ability.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability); - } - } - //UPKEEP CARDS: public static void payManaDuringAbilityResolve(String message, String manaCost, Command paid, Command unpaid){ @@ -6088,11 +6058,6 @@ public class GameActionUtil { } }// Howling_Mine() - private static void draw_Spiteful_Visions(final Player player) { - CardList list = AllZoneUtil.getCardsInPlay("Spiteful Visions"); - player.drawCards(list.size()); - }// Spiteful_Visions() - private static void draw_Sylvan_Library(final Player player) { /* * At the beginning of your draw step, you may draw two additional diff --git a/src/forge/Player.java b/src/forge/Player.java index 2efdf3e7b5a..60829b0676f 100644 --- a/src/forge/Player.java +++ b/src/forge/Player.java @@ -557,7 +557,9 @@ public abstract class Player extends MyObservable{ c.setDrawnThisTurn(true); numDrawnThisTurn++; - GameActionUtil.executeDrawCardTriggeredEffects(this); + Object[] DrawCard_Whenever_Parameters = new Object[1]; + DrawCard_Whenever_Parameters[0] = this; + AllZone.GameAction.checkWheneverKeyword(AllZone.CardFactory.HumanNullCard,"DrawCard",DrawCard_Whenever_Parameters); //Run triggers HashMap runParams = new HashMap();