From 09a61dec53a9c4c803a02dfed63e2dfe6fa31c9f Mon Sep 17 00:00:00 2001 From: Sol Date: Wed, 27 Mar 2013 02:40:18 +0000 Subject: [PATCH] - Underworld Dreeams will now effect the Player that drew the cards, not just the first Opponent --- res/cardsfolder/u/underworld_dreams.txt | 2 +- src/main/java/forge/card/trigger/TriggerDrawn.java | 1 + src/main/java/forge/game/player/Player.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/res/cardsfolder/u/underworld_dreams.txt b/res/cardsfolder/u/underworld_dreams.txt index 61f2197d351..56ac43337c5 100644 --- a/res/cardsfolder/u/underworld_dreams.txt +++ b/res/cardsfolder/u/underworld_dreams.txt @@ -2,7 +2,7 @@ Name:Underworld Dreams ManaCost:B B B Types:Enchantment T:Mode$ Drawn | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever an opponent draws a card, CARDNAME deals 1 damage to him or her. -SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ 1 +SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredPlayer | NumDmg$ 1 SVar:Picture:http://www.wizards.com/global/images/magic/general/underworld_dreams.jpg Oracle:Whenever an opponent draws a card, Underworld Dreams deals 1 damage to him or her. SetInfo:8ED Rare diff --git a/src/main/java/forge/card/trigger/TriggerDrawn.java b/src/main/java/forge/card/trigger/TriggerDrawn.java index 63ef79369e0..4487a24b3e5 100644 --- a/src/main/java/forge/card/trigger/TriggerDrawn.java +++ b/src/main/java/forge/card/trigger/TriggerDrawn.java @@ -83,5 +83,6 @@ public class TriggerDrawn extends Trigger { @Override public final void setTriggeringObjects(final SpellAbility sa) { sa.setTriggeringObject("Card", this.getRunParams().get("Card")); + sa.setTriggeringObject("Player", this.getRunParams().get("Player")); } } diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index cd5d0843279..e4d5fff86bd 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -1392,6 +1392,7 @@ public abstract class Player extends GameEntity implements Comparable { final HashMap runParams = new HashMap(); runParams.put("Card", c); runParams.put("Number", this.numDrawnThisTurn); + runParams.put("Player", this); game.getTriggerHandler().runTrigger(TriggerType.Drawn, runParams, false); } // lose: