From af87194664ed2ccf1090cd241c6670e3cd28b1af Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 17:42:39 +0000 Subject: [PATCH] *Fixed cards you start with in certain fantasy quests having their triggers registered. *Fixed Escaped Null text. --- res/cardsfolder/escaped_null.txt | 2 +- src/forge/GameAction.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/res/cardsfolder/escaped_null.txt b/res/cardsfolder/escaped_null.txt index 83a5fe510cf..d5eae801201 100644 --- a/res/cardsfolder/escaped_null.txt +++ b/res/cardsfolder/escaped_null.txt @@ -5,7 +5,7 @@ Text:no text PT:1/2 K:Lifelink T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, it gets +5/+0 until end of turn. -T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, it gets +5/+0 until end of turn. +T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, it gets +5/+0 until end of turn. SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ +5 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/escaped_null.jpg diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java index 6839476b57c..405e53c8029 100644 --- a/src/forge/GameAction.java +++ b/src/forge/GameAction.java @@ -2248,12 +2248,22 @@ public class GameAction { for (Card c : human) { + for(Trigger trig : c.getTriggers()) + { + AllZone.TriggerHandler.registerTrigger(trig); + } + AllZone.Human_Battlefield.add(c); c.setSickness(true); } for (Card c: computer) { + for(Trigger trig : c.getTriggers()) + { + AllZone.TriggerHandler.registerTrigger(trig); + } + AllZone.Computer_Battlefield.add(c); c.setSickness(true); }