external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

*Realized there was a way to do triggering on cycling properly.

Browse Source 
*Updated to triggers
	Angelic Chorus
This commit is contained in:
jendave
2011-08-06 16:03:10 +00:00
parent e4ca2ca505
commit aad13e4eab
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/cardsfolder/angelic_chorus.txt
View File

@@ -2,7 +2,9 @@ Name:Angelic Chorus
ManaCost:3 W W ManaCost:3 W W
Types:Enchantment Types:Enchantment
Text:no text 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:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_chorus.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_chorus.jpg
SetInfo:USG|Rare|http://magiccards.info/scans/en/us/3.jpg SetInfo:USG|Rare|http://magiccards.info/scans/en/us/3.jpg

5
src/forge/Card.java
View File

@@ -1442,11 +1442,6 @@ public class Card extends MyObservable {
public void cycle() { public void cycle() {
for(Command var:cycleCommandList) for(Command var:cycleCommandList)
var.execute(); var.execute();
//Run triggers
HashMap<String,Object> runParams = new HashMap<String,Object>();
runParams.put("Card", this);
AllZone.TriggerHandler.runTrigger("Cycled", runParams);
} }
public void setSickness(boolean b) { public void setSickness(boolean b) {

6
src/forge/MagicStack.java
View File

@@ -387,6 +387,12 @@ public class MagicStack extends MyObservable {
{ {
AllZone.TriggerHandler.runTrigger("AbilityCast", runParams); 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")) { if(sp instanceof Spell_Permanent && sp.getSourceCard().getName().equals("Mana Vortex")) {