From 174ff15c997b473caa668522dbc7c7f7de7127bf Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 15:40:51 +0000 Subject: [PATCH] *Renamed parameters for DamageDone trigger mode to be more uniform with other trigger modes. (Fixes Dune-Brood Nephilim and Fungal Shambler) *Fixed Discarded trigger mode's ValidCause parameter. --- res/cardsfolder/blazing_specter.txt | 2 +- res/cardsfolder/screeching_silcaw.txt | 2 +- src/forge/Trigger_DamageDone.java | 8 ++++---- src/forge/Trigger_Discarded.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/res/cardsfolder/blazing_specter.txt b/res/cardsfolder/blazing_specter.txt index 8cfae583d37..472181474e8 100644 --- a/res/cardsfolder/blazing_specter.txt +++ b/res/cardsfolder/blazing_specter.txt @@ -5,7 +5,7 @@ Text:no text PT:2/2 K:Flying K:Haste -T:Mode$ DamageDone | SourceValid$ Card.Self | TargetValid$ Opponent | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card. +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card. SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/blazing_specter.jpg diff --git a/res/cardsfolder/screeching_silcaw.txt b/res/cardsfolder/screeching_silcaw.txt index 85f365f8498..c7ec1a89591 100644 --- a/res/cardsfolder/screeching_silcaw.txt +++ b/res/cardsfolder/screeching_silcaw.txt @@ -3,7 +3,7 @@ ManaCost:1 U Types:creature Bird Text:no text PT:1/2 -T:Mode$ DamageDone | SourceValid$ Card.Self | TargetValid$ Opponent | CombatDamage$ True | Metalcraft$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Metalcraft — Whenever CARDNAME deals combat damage to a player, if you control three or more artifacts, that player puts the top four cards of his or her library into his or her graveyard. +T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Metalcraft$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Metalcraft — Whenever CARDNAME deals combat damage to a player, if you control three or more artifacts, that player puts the top four cards of his or her library into his or her graveyard. SVar:TrigMill:AB$Mill | Cost$ 0 | Defined$ Opponent | NumCards$ 4 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/screeching_silcaw.jpg diff --git a/src/forge/Trigger_DamageDone.java b/src/forge/Trigger_DamageDone.java index 71e90085df1..3df9b115aed 100644 --- a/src/forge/Trigger_DamageDone.java +++ b/src/forge/Trigger_DamageDone.java @@ -14,17 +14,17 @@ public class Trigger_DamageDone extends Trigger { Card src = (Card)runParams.get("DamageSource"); Object tgt = runParams.get("DamageTarget"); - if(mapParams.containsKey("SourceValid")) + if(mapParams.containsKey("ValidSource")) { - if(!src.isValidCard(mapParams.get("SourceValid").split(" "), hostCard.getController(), hostCard)) + if(!src.isValidCard(mapParams.get("ValidSource").split(" "), hostCard.getController(), hostCard)) { return false; } } - if(mapParams.containsKey("TargetValid")) + if(mapParams.containsKey("ValidTarget")) { - if(!matchesValid(tgt,mapParams.get("TargetValid").split(","),hostCard)) + if(!matchesValid(tgt,mapParams.get("ValidTarget").split(","),hostCard)) { return false; } diff --git a/src/forge/Trigger_Discarded.java b/src/forge/Trigger_Discarded.java index ad015a3c305..535f5c43e48 100644 --- a/src/forge/Trigger_Discarded.java +++ b/src/forge/Trigger_Discarded.java @@ -20,7 +20,7 @@ public class Trigger_Discarded extends Trigger { if(mapParams.containsKey("ValidCause")) { - if(!matchesValid(runParams.get("Cause"),mapParams.get("ValidSource").split(","),hostCard)) + if(!matchesValid(runParams.get("Cause"),mapParams.get("ValidCause").split(","),hostCard)) { return false; }