From aad13e4eaba0b957963fda91aede82c82dfaced5 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 16:03:10 +0000 Subject: [PATCH] *Realized there was a way to do triggering on cycling properly. *Updated to triggers Angelic Chorus --- res/cardsfolder/angelic_chorus.txt | 4 +++- src/forge/Card.java | 5 ----- src/forge/MagicStack.java | 6 ++++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/res/cardsfolder/angelic_chorus.txt b/res/cardsfolder/angelic_chorus.txt index ac39e64c19b..2a62a605c6a 100644 --- a/res/cardsfolder/angelic_chorus.txt +++ b/res/cardsfolder/angelic_chorus.txt @@ -2,7 +2,9 @@ Name:Angelic Chorus ManaCost:3 W W Types:Enchantment Text:no text -K:WheneverKeyword:EntersBattleField:Type/Creature:Play:ModifyLife/Toughness:ControllingPlayer_Self:ASAP:No_Condition:Initiator - OwnedByController:Whenever a creature enters the battlefield under your control, you gain life equal to its toughness. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature enters the battlefield under your control, you gain life equal to its toughness. +SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X +SVar:X:Triggered$CardToughness SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_chorus.jpg SetInfo:USG|Rare|http://magiccards.info/scans/en/us/3.jpg diff --git a/src/forge/Card.java b/src/forge/Card.java index 2f6d85876ee..fa734a591b0 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -1442,11 +1442,6 @@ public class Card extends MyObservable { public void cycle() { for(Command var:cycleCommandList) var.execute(); - - //Run triggers - HashMap runParams = new HashMap(); - runParams.put("Card", this); - AllZone.TriggerHandler.runTrigger("Cycled", runParams); } public void setSickness(boolean b) { diff --git a/src/forge/MagicStack.java b/src/forge/MagicStack.java index 8ae96fa18ec..0c649b73ff2 100644 --- a/src/forge/MagicStack.java +++ b/src/forge/MagicStack.java @@ -387,6 +387,12 @@ public class MagicStack extends MyObservable { { AllZone.TriggerHandler.runTrigger("AbilityCast", runParams); } + if(sp.isCycling()) + { + runParams.clear(); + runParams.put("Card", sp.getSourceCard()); + AllZone.TriggerHandler.runTrigger("Cycled", runParams); + } } if(sp instanceof Spell_Permanent && sp.getSourceCard().getName().equals("Mana Vortex")) {