From 0445d31ca7c81e9de9c156509c272ec310d96d2f Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 11:00:09 +0000 Subject: [PATCH] add Wheel of Torture (from Urza's Legacy) --- .gitattributes | 1 + res/cardsfolder/wheel_of_torture.txt | 7 +++++++ src/forge/GameActionUtil.java | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 res/cardsfolder/wheel_of_torture.txt diff --git a/.gitattributes b/.gitattributes index baed94d24e3..c9635f7c8f2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5151,6 +5151,7 @@ res/cardsfolder/werebear.txt -text svneol=native#text/plain res/cardsfolder/western_paladin.txt -text svneol=native#text/plain res/cardsfolder/wheel_and_deal.txt -text svneol=native#text/plain res/cardsfolder/wheel_of_fortune.txt -text svneol=native#text/plain +res/cardsfolder/wheel_of_torture.txt -text svneol=native#text/plain res/cardsfolder/whip_sergeant.txt -text svneol=native#text/plain res/cardsfolder/whip_spine_drake.txt -text svneol=native#text/plain res/cardsfolder/whipcorder.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/wheel_of_torture.txt b/res/cardsfolder/wheel_of_torture.txt new file mode 100644 index 00000000000..4403ad0f61a --- /dev/null +++ b/res/cardsfolder/wheel_of_torture.txt @@ -0,0 +1,7 @@ +Name:Wheel of Torture +ManaCost:3 +Types:Artifact +Text:At the beginning of each opponent's upkeep, Wheel of Torture deals X damage to that player, where X is 3 minus the number of cards in his or her hand. +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/wheel_of_torture.jpg +End diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index ad2047185a4..620a8bb46e0 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -9165,6 +9165,7 @@ public class GameActionUtil { final Player player = AllZone.Phase.getPlayerTurn(); CardList racks = AllZoneUtil.getPlayerCardsInPlay(player.getOpponent(), "The Rack"); + racks.add(AllZoneUtil.getPlayerCardsInPlay(player.getOpponent(), "Wheel of Torture")); // if there are 1 or more The Racks owned by the opponent of the // current player have each of them deal damage. @@ -9182,7 +9183,8 @@ public class GameActionUtil { };// Ability StringBuilder sb = new StringBuilder(); - sb.append("The Rack - deals X damage to ").append(player); + sb.append(src.getName()); + sb.append(" - deals X damage to ").append(player); sb.append(", where X is 3 minus the number of cards in his or her hand."); ability.setStackDescription(sb.toString());