From fd42f11139067a7045da506a82c6dffdf8df9c94 Mon Sep 17 00:00:00 2001 From: moomarc Date: Fri, 8 Feb 2013 07:51:29 +0000 Subject: [PATCH] - Better fix for Goldmeadow --- res/cardsfolder/g/goldmeadow.txt | 2 +- src/main/java/forge/card/trigger/TriggerPlanarDice.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/res/cardsfolder/g/goldmeadow.txt b/res/cardsfolder/g/goldmeadow.txt index 36dfe52b491..9c376709d2a 100644 --- a/res/cardsfolder/g/goldmeadow.txt +++ b/res/cardsfolder/g/goldmeadow.txt @@ -5,7 +5,7 @@ Text:no text T:Mode$ ChangesZone | ValidCard$ Land | Destination$ Battlefield | Execute$ TripleGoat | TriggerZones$ Command | TriggerDescription$ Whenever a land enters the battlefield, that land's controller puts three 0/1 white Goat creature tokens onto the battlefield. SVar:TripleGoat:AB$ Token | Cost$ 0 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenPower$ 0 | TokenToughness$ 1 | TokenColors$ White | TokenOwner$ TriggeredCardController | TokenImage$ W 0 1 Goat | TokenAmount$ 3 T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll Chaos, put a 0/1 white Goat creature token onto the battlefield. -SVar:RolledChaos:AB$ Token | Cost$ 0 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenPower$ 0 | TokenToughness$ 1 | TokenColors$ White | TokenOwner$ You | TokenImage$ W 0 1 Goat | TokenAmount$ 1 +SVar:RolledChaos:AB$ Token | Cost$ 0 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenPower$ 0 | TokenToughness$ 1 | TokenColors$ White | TokenOwner$ TriggeredPlayer | TokenImage$ W 0 1 Goat | TokenAmount$ 1 T:Mode$ PlanarDice | Result$ Planeswalk | TriggerZones$ Command | Execute$ RolledWalk | Secondary$ True | TriggerDescription$ Whenever you roll Planeswalk, put this card on the bottom of its owner's planar deck face down, then move the top card of your planar deck off that planar deck and turn it face up SVar:RolledWalk:AB$ Planeswalk | Cost$ 0 A:AB$ RollPlanarDice | Cost$ X | SorcerySpeed$ True | ActivationZone$ Command | SpellDescription$ Roll the planar dice. diff --git a/src/main/java/forge/card/trigger/TriggerPlanarDice.java b/src/main/java/forge/card/trigger/TriggerPlanarDice.java index 63a50409826..3e284bbb735 100644 --- a/src/main/java/forge/card/trigger/TriggerPlanarDice.java +++ b/src/main/java/forge/card/trigger/TriggerPlanarDice.java @@ -27,7 +27,7 @@ public class TriggerPlanarDice extends Trigger { public TriggerPlanarDice(final java.util.Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } - + /* (non-Javadoc) * @see forge.card.trigger.Trigger#performTest(java.util.Map) */ @@ -39,10 +39,10 @@ public class TriggerPlanarDice extends Trigger { return false; } } - + if (this.getMapParams().containsKey("Result")) { PlanarDice cond = PlanarDice.smartValueOf(this.getMapParams().get("Result")); - if(cond != ((PlanarDice)runParams2.get("Result"))) { + if (cond != ((PlanarDice) runParams2.get("Result"))) { return false; } } @@ -69,7 +69,7 @@ public class TriggerPlanarDice extends Trigger { */ @Override public void setTriggeringObjects(SpellAbility sa) { - //THE BLACKEST TRIGGERINGOBJECT FOR THE MOST BRUTAL OF ALL TRIGGERS! NOOOOOTHIIIIIING! + sa.setTriggeringObject("Player", this.getRunParams().get("Player")); } }