From b6e7457f0dd38f1b02330056abaf38f45fb9ee64 Mon Sep 17 00:00:00 2001 From: Sloth Date: Sat, 12 May 2012 07:40:24 +0000 Subject: [PATCH] - Converted parts of Forsaken Wastes and Leyline of Punishment to script. --- res/cardsfolder/f/forsaken_wastes.txt | 3 ++- res/cardsfolder/l/leyline_of_punishment.txt | 3 ++- src/main/java/forge/game/player/Player.java | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/res/cardsfolder/f/forsaken_wastes.txt b/res/cardsfolder/f/forsaken_wastes.txt index 17f80fc4874..c3dad5542dd 100644 --- a/res/cardsfolder/f/forsaken_wastes.txt +++ b/res/cardsfolder/f/forsaken_wastes.txt @@ -1,7 +1,8 @@ Name:Forsaken Wastes ManaCost:2 B Types:World Enchantment -Text:Players cannot gain life. +Text:no text +S:Mode$ Continuous | Affected$ Player | AddKeyword$ You can't gain life. | Description$ Players can't gain life. T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player loses 1 life. T:Mode$ SpellCast | TargetsValid$ Card.Self | Execute$ TrigLoseLife5 | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes the target of a spell, that spell's controller loses 5 life. SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ 1 diff --git a/res/cardsfolder/l/leyline_of_punishment.txt b/res/cardsfolder/l/leyline_of_punishment.txt index 11b15abbeae..7a8994096d1 100644 --- a/res/cardsfolder/l/leyline_of_punishment.txt +++ b/res/cardsfolder/l/leyline_of_punishment.txt @@ -1,7 +1,8 @@ Name:Leyline of Punishment ManaCost:2 R R Types:Enchantment -Text:If Leyline of Punishment is in your opening hand, you may begin the game with it on the battlefield. Players can't gain life. Damage can't be prevented. +Text:If Leyline of Punishment is in your opening hand, you may begin the game with it on the battlefield. Damage can't be prevented. +S:Mode$ Continuous | Affected$ Player | AddKeyword$ You can't gain life. | Description$ Players can't gain life. SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/leyline_of_punishment.jpg diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 847ea940088..6bde8f9b369 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -381,8 +381,7 @@ public abstract class Player extends GameEntity { * @return a boolean. */ public final boolean canGainLife() { - if (AllZoneUtil.isCardInPlay("Leyline of Punishment") || AllZoneUtil.isCardInPlay("Platinum Emperion", this) - || AllZoneUtil.isCardInPlay("Forsaken Wastes")) { + if (AllZoneUtil.isCardInPlay("Platinum Emperion", this)) { return false; } if (this.hasKeyword("You can't gain life.")) {