diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java
index da31863f00d..a0034fc689b 100644
--- a/forge-game/src/main/java/forge/game/combat/Combat.java
+++ b/forge-game/src/main/java/forge/game/combat/Combat.java
@@ -818,6 +818,12 @@ public class Combat {
runParams.put("DamageAmount", totalDmg);
runParams.put("DamageTarget", ge);
ge.getGame().getTriggerHandler().runTrigger(TriggerType.CombatDamageDoneOnce, runParams, false);
+
+ // also fire DamageDone with the same runParams but with OnlyOnce applied
+ // for triggers that are interested in such triggers
+ runParams.put("IsCombatDamage", true);
+ runParams.put("CombatDamageOnce", true);
+ ge.getGame().getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, false);
}
preventMap.triggerPreventDamage(true);
@@ -841,7 +847,15 @@ public class Combat {
runParams.put("DamageTargets", row.keySet());
runParams.put("DamageAmount", dealtDamage);
damageSource.getGame().getTriggerHandler().runTrigger(TriggerType.DealtCombatDamageOnce, runParams, false);
+
+ // also fire DamageDone with the same runParams but with OnlyOnce applied
+ // for triggers that are interested in such triggers
+ runParams.put("IsCombatDamage", true);
+ runParams.put("CombatDamageOnce", true);
+
+ damageSource.getGame().getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, false);
}
+
dealtDamageTo.clear();
}
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
index 2300bcd0fa1..11cbff34b78 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
@@ -23,6 +23,8 @@ import forge.game.spellability.SpellAbility;
import forge.game.spellability.SpellAbilityStackInstance;
import forge.util.Expressions;
+import java.util.Set;
+
/**
*
* Trigger_DamageDone class.
@@ -55,16 +57,63 @@ public class TriggerDamageDone extends Trigger {
final Card src = (Card) runParams2.get("DamageSource");
final Object tgt = runParams2.get("DamageTarget");
- if (this.mapParams.containsKey("ValidSource")) {
- if (!src.isValid(this.mapParams.get("ValidSource").split(","), this.getHostCard().getController(),
- this.getHostCard(), null)) {
+ // DamageDone with OnlyOnce$ True is interested in counting the damage only once, e.g. for all creatures in
+ // combat.
+ if (runParams2.containsKey("CombatDamageOnce")) {
+ if (!this.mapParams.containsKey("OnlyOnce")) {
+ // We're not interested in additional OnlyOnce triggers, only in standard DamageDone
return false;
}
}
+ if (this.mapParams.containsKey("OnlyOnce")) {
+ // This currently only works for combat damage. Feel free to improve.
+ if (runParams2.containsKey("IsCombatDamage") && ((Boolean) runParams2.get("IsCombatDamage")) && !runParams2.containsKey("CombatDamageOnce")) {
+ return false;
+ }
+ // Ensure that the trigger doesn't run twice if we're only interested from damage from a ValidSource or to
+ // a ValidTarget but not both (since otherwise the trigger will fire twice: once when testing the trigger
+ // from source to target(s), and once when testing it from source(s) to target
+ if (!(this.mapParams.containsKey("ValidSource") && this.mapParams.containsKey("ValidTarget"))) {
+ if (this.mapParams.containsKey("ValidSource") && src == null) {
+ return false;
+ }
+ if (this.mapParams.containsKey("ValidTarget") && tgt == null) {
+ return false;
+ }
+ }
+ }
+
+ if (this.mapParams.containsKey("ValidSource")) {
+ if (src != null) {
+ if (!src.isValid(this.mapParams.get("ValidSource").split(","), this.getHostCard().getController(),
+ this.getHostCard(), null)) {
+ return false;
+ }
+ } else if (runParams2.containsKey("DamageSources")) { // OnlyOnce$ True
+ boolean hasValidSrc = false;
+ for (Card srcs : (Set)runParams2.get("DamageSources")) {
+ if (srcs.isValid(this.mapParams.get("ValidSource").split(","), this.getHostCard().getController(),
+ this.getHostCard(), null)) {
+ hasValidSrc = true;
+ }
+ }
+ if (!hasValidSrc) { return false; }
+ }
+ }
if (this.mapParams.containsKey("ValidTarget")) {
- if (!matchesValid(tgt, this.mapParams.get("ValidTarget").split(","), this.getHostCard())) {
- return false;
+ if (tgt != null) {
+ if (!matchesValid(tgt, this.mapParams.get("ValidTarget").split(","), this.getHostCard())) {
+ return false;
+ }
+ } else if (runParams2.containsKey("DamageTargets")) { // OnlyOnce$ True
+ boolean hasValidTgt = false;
+ for (Object tgts : (Set)runParams2.get("DamageTargets")) {
+ if (matchesValid(tgt, this.mapParams.get("ValidTarget").split(","), this.getHostCard())) {
+ hasValidTgt = true;
+ }
+ }
+ if (!hasValidTgt) { return false; }
}
}
@@ -118,8 +167,12 @@ public class TriggerDamageDone extends Trigger {
/** {@inheritDoc} */
@Override
public final void setTriggeringObjects(final SpellAbility sa) {
- sa.setTriggeringObject("Source", CardUtil.getLKICopy((Card)this.getRunParams().get("DamageSource")));
- sa.setTriggeringObject("Target", this.getRunParams().get("DamageTarget"));
+ if (this.getRunParams().containsKey("DamageSource")) {
+ sa.setTriggeringObject("Source", CardUtil.getLKICopy((Card) this.getRunParams().get("DamageSource")));
+ }
+ if (this.getRunParams().containsKey("DamageTarget")) {
+ sa.setTriggeringObject("Target", this.getRunParams().get("DamageTarget"));
+ }
sa.setTriggeringObject("DamageAmount", this.getRunParams().get("DamageAmount"));
// This parameter is here because LKI information related to combat doesn't work properly
sa.setTriggeringObject("DefendingPlayer", this.getRunParams().get("DefendingPlayer"));
@@ -128,8 +181,12 @@ public class TriggerDamageDone extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
- sb.append("Damage Source: ").append(sa.getTriggeringObject("Source")).append(", ");
- sb.append("Damaged: ").append(sa.getTriggeringObject("Target")).append(", ");
+ if (sa.getTriggeringObject("Source") != null) {
+ sb.append("Damage Source: ").append(sa.getTriggeringObject("Source")).append(", ");
+ }
+ if (sa.getTriggeringObject("Target") != null) {
+ sb.append("Damaged: ").append(sa.getTriggeringObject("Target")).append(", ");
+ }
sb.append("Amount: ").append(sa.getTriggeringObject("DamageAmount"));
return sb.toString();
}
diff --git a/forge-gui/res/cardsfolder/a/angel_of_deliverance.txt b/forge-gui/res/cardsfolder/a/angel_of_deliverance.txt
index 00498385a3a..f03bddff719 100644
--- a/forge-gui/res/cardsfolder/a/angel_of_deliverance.txt
+++ b/forge-gui/res/cardsfolder/a/angel_of_deliverance.txt
@@ -3,9 +3,8 @@ ManaCost:6 W W
Types:Creature Angel
PT:6/6
K:Flying
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigChange | Delirium$ True | TriggerZones$ Battlefield | TriggerDescription$ Delirium — Whenever CARDNAME deals damage, if there are four or more card types among cards in your graveyard, exile target creature an opponent controls.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigChange | Delirium$ True | TriggerZones$ Battlefield | TriggerDescription$ Delirium — Whenever CARDNAME deals damage, if there are four or more card types among cards in your graveyard, exile target creature an opponent controls.
-SVar:TrigChange:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | Origin$ Battlefield | Destination$ Exile
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigChange | Delirium$ True | TriggerZones$ Battlefield | TriggerDescription$ Delirium — Whenever CARDNAME deals damage, if there are four or more card types among cards in your graveyard, exile target creature an opponent controls.
+SVar:TrigChange:DB$ ChangeZone | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | Origin$ Battlefield | Destination$ Exile
SVar:HasCombatEffect:TRUE
DeckHints:Ability$Graveyard & Ability$Discard
DeckHas:Ability$Delirium
diff --git a/forge-gui/res/cardsfolder/a/angelheart_vial.txt b/forge-gui/res/cardsfolder/a/angelheart_vial.txt
index 28d74446d09..18046a2ab3e 100644
--- a/forge-gui/res/cardsfolder/a/angelheart_vial.txt
+++ b/forge-gui/res/cardsfolder/a/angelheart_vial.txt
@@ -2,8 +2,7 @@ Name:Angelheart Vial
ManaCost:5
Types:Artifact
A:AB$ GainLife | Cost$ 2 T SubCounter<4/CHARGE> | Defined$ You | LifeAmount$ 2 | SubAbility$ DBDraw | SpellDescription$ You gain 2 life and draw a card.
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ Whenever you're dealt damage, you may put that many charge counters on CARDNAME.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ Whenever you're dealt damage, you may put that many charge counters on CARDNAME.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ Whenever you're dealt damage, you may put that many charge counters on CARDNAME.
SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CHARGE | CounterNum$ X | References$ X
SVar:X:TriggerCount$DamageAmount
diff --git a/forge-gui/res/cardsfolder/a/arcbond.txt b/forge-gui/res/cardsfolder/a/arcbond.txt
index c4349940105..47b338322cc 100644
--- a/forge-gui/res/cardsfolder/a/arcbond.txt
+++ b/forge-gui/res/cardsfolder/a/arcbond.txt
@@ -1,9 +1,8 @@
Name:Arcbond
ManaCost:2 R
Types:Instant
-A:SP$ Effect | Cost$ 2 R | Name$ Arcbond Effect | ValidTgts$ Creature | Triggers$ TrigDealtDmg,TrigDealtDmgCombat,OutOfSight | SVars$ ExileSelf,DmgOther,X | RememberObjects$ Targeted | SpellDescription$ Choose target creature. Whenever that creature is dealt damage this turn, it deals that much damage to each other creature and each player.
-SVar:TrigDealtDmg:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.IsRemembered | Execute$ DmgOther | TriggerDescription$ Whenever that creature is dealt damage this turn, it deals that much damage to each other creature and each player.
-SVar:TrigDealtDmgCombat:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.IsRemembered | Execute$ DmgOther | TriggerDescription$ Whenever that creature is dealt damage this turn, it deals that much damage to each other creature and each player.
+A:SP$ Effect | Cost$ 2 R | Name$ Arcbond Effect | ValidTgts$ Creature | Triggers$ TrigDealtDmg,OutOfSight | SVars$ ExileSelf,DmgOther,X | RememberObjects$ Targeted | SpellDescription$ Choose target creature. Whenever that creature is dealt damage this turn, it deals that much damage to each other creature and each player.
+SVar:TrigDealtDmg:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.IsRemembered | Execute$ DmgOther | TriggerDescription$ Whenever that creature is dealt damage this turn, it deals that much damage to each other creature and each player.
SVar:DmgOther:DB$ DamageAll | ValidCards$ Creature.IsNotRemembered | ValidPlayers$ Player | NumDmg$ X | DamageSource$ Remembered | References$ X
SVar:OutOfSight:Mode$ ChangesZone | TriggerZones$ Command | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsRemembered | Execute$ ExileSelf | Static$ True
SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
diff --git a/forge-gui/res/cardsfolder/a/armadillo_cloak.txt b/forge-gui/res/cardsfolder/a/armadillo_cloak.txt
index 2ab87efcd27..62b9a016eeb 100644
--- a/forge-gui/res/cardsfolder/a/armadillo_cloak.txt
+++ b/forge-gui/res/cardsfolder/a/armadillo_cloak.txt
@@ -4,9 +4,8 @@ Types:Enchantment Aura
K:Enchant creature
A:SP$ Attach | Cost$ 1 G W | ValidTgts$ Creature | AILogic$ Pump
S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Trample | Description$ Enchanted creature gets +2/+2 and has trample.
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
-SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
+SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/armadillo_cloak.jpg
Oracle:Enchant creature\nEnchanted creature gets +2/+2 and has trample.\nWhenever enchanted creature deals damage, you gain that much life.
diff --git a/forge-gui/res/cardsfolder/b/binding_agony.txt b/forge-gui/res/cardsfolder/b/binding_agony.txt
index bc0a031d6f1..588b76209e9 100644
--- a/forge-gui/res/cardsfolder/b/binding_agony.txt
+++ b/forge-gui/res/cardsfolder/b/binding_agony.txt
@@ -3,8 +3,7 @@ ManaCost:1 B
Types:Enchantment Aura
K:Enchant creature
A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Curse
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever enchanted creature is dealt damage, CARDNAME deals that much damage to that creature's controller.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever enchanted creature is dealt damage, CARDNAME deals that much damage to that creature's controller.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever enchanted creature is dealt damage, CARDNAME deals that much damage to that creature's controller.
SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredTargetController | NumDmg$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/binding_agony.jpg
diff --git a/forge-gui/res/cardsfolder/b/boros_reckoner.txt b/forge-gui/res/cardsfolder/b/boros_reckoner.txt
index 66aeb51e60c..115050a18f8 100644
--- a/forge-gui/res/cardsfolder/b/boros_reckoner.txt
+++ b/forge-gui/res/cardsfolder/b/boros_reckoner.txt
@@ -2,8 +2,7 @@ Name:Boros Reckoner
ManaCost:RW RW RW
Types:Creature Minotaur Wizard
PT:3/3
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to target creature or player.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to target creature or player.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to target creature or player.
SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | References$ X | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player
A:AB$ Pump | Cost$ RW | KW$ First Strike | Defined$ Self | SpellDescription$ CARDNAME gains first strike until end of turn.
SVar:X:TriggerCount$DamageAmount
diff --git a/forge-gui/res/cardsfolder/b/broodhatch_nantuko.txt b/forge-gui/res/cardsfolder/b/broodhatch_nantuko.txt
index cb4daccc534..47b8bc9c289 100644
--- a/forge-gui/res/cardsfolder/b/broodhatch_nantuko.txt
+++ b/forge-gui/res/cardsfolder/b/broodhatch_nantuko.txt
@@ -3,8 +3,7 @@ ManaCost:1 G
Types:Creature Insect Druid
PT:1/1
K:Morph:2 G
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME is dealt damage, you may create that many 1/1 green Insect creature tokens.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME is dealt damage, you may create that many 1/1 green Insect creature tokens.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME is dealt damage, you may create that many 1/1 green Insect creature tokens.
SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/c/coalhauler_swine.txt b/forge-gui/res/cardsfolder/c/coalhauler_swine.txt
index fc8df08c9f8..37b42e3407c 100644
--- a/forge-gui/res/cardsfolder/c/coalhauler_swine.txt
+++ b/forge-gui/res/cardsfolder/c/coalhauler_swine.txt
@@ -2,8 +2,7 @@ Name:Coalhauler Swine
ManaCost:4 R R
Types:Creature Boar Beast
PT:4/4
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to each player.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to each player.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to each player.
SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | NumDmg$ X | Defined$ Player | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/d/darien_king_of_kjeldor.txt b/forge-gui/res/cardsfolder/d/darien_king_of_kjeldor.txt
index f14111c13b0..3de056ad7fb 100644
--- a/forge-gui/res/cardsfolder/d/darien_king_of_kjeldor.txt
+++ b/forge-gui/res/cardsfolder/d/darien_king_of_kjeldor.txt
@@ -2,8 +2,7 @@ Name:Darien, King of Kjeldor
ManaCost:4 W W
Types:Legendary Creature Human Soldier
PT:3/3
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigToken | ValidTarget$ You | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you're dealt damage, you may create that many 1/1 white Soldier creature tokens.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigToken | ValidTarget$ You | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you're dealt damage, you may create that many 1/1 white Soldier creature tokens.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigToken | ValidTarget$ You | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you're dealt damage, you may create that many 1/1 white Soldier creature tokens.
SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ w 1 1 soldier CSP | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/darien_king_of_kjeldor.jpg
diff --git a/forge-gui/res/cardsfolder/d/death_pits_of_rath.txt b/forge-gui/res/cardsfolder/d/death_pits_of_rath.txt
index ac1db4cb9c1..cebd20a6a37 100644
--- a/forge-gui/res/cardsfolder/d/death_pits_of_rath.txt
+++ b/forge-gui/res/cardsfolder/d/death_pits_of_rath.txt
@@ -3,8 +3,7 @@ ManaCost:3 B B
Types:Enchantment
S:Mode$ Continuous | Affected$ Creature | AddSVar$ DeathDestroy
SVar:DeathDestroy:SVar:DestroyWhenDamaged:True
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Creature | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature is dealt damage, destroy it. It can't be regenerated.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Creature | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature is dealt damage, destroy it. It can't be regenerated.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Creature | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature is dealt damage, destroy it. It can't be regenerated.
SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTarget | NoRegen$ True
SVar:RemRandomDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/death_pits_of_rath.jpg
diff --git a/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt b/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt
index b870564ae87..34f499d82d2 100644
--- a/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt
+++ b/forge-gui/res/cardsfolder/d/deep_slumber_titan.txt
@@ -4,8 +4,7 @@ Types:Creature Giant Warrior
PT:7/7
K:CARDNAME enters the battlefield tapped.
K:CARDNAME doesn't untap during your untap step.
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME is dealt damage, untap it.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME is dealt damage, untap it.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME is dealt damage, untap it.
SVar:TrigUntap:DB$ Untap | Defined$ Self
SVar:RemRandomDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/deep_slumber_titan.jpg
diff --git a/forge-gui/res/cardsfolder/d/doubtless_one.txt b/forge-gui/res/cardsfolder/d/doubtless_one.txt
index 4ea99698c07..db7393ae2b3 100644
--- a/forge-gui/res/cardsfolder/d/doubtless_one.txt
+++ b/forge-gui/res/cardsfolder/d/doubtless_one.txt
@@ -4,9 +4,8 @@ Types:Creature Cleric Avatar
PT:*/*
S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of Clerics on the battlefield.
SVar:X:Count$Valid Cleric
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ Y | References$ Y
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ Y | References$ Y
SVar:Y:TriggerCount$DamageAmount
SVar:BuffedBy:Cleric
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/d/dromad_purebred.txt b/forge-gui/res/cardsfolder/d/dromad_purebred.txt
index e57da1d572d..9d01b566d2d 100644
--- a/forge-gui/res/cardsfolder/d/dromad_purebred.txt
+++ b/forge-gui/res/cardsfolder/d/dromad_purebred.txt
@@ -2,8 +2,7 @@ Name:Dromad Purebred
ManaCost:4 W
Types:Creature Camel Beast
PT:1/5
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you gain 1 life.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you gain 1 life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you gain 1 life.
SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/dromad_purebred.jpg
diff --git a/forge-gui/res/cardsfolder/d/druids_call.txt b/forge-gui/res/cardsfolder/d/druids_call.txt
index 3e6f812a155..21cd49e5e3f 100644
--- a/forge-gui/res/cardsfolder/d/druids_call.txt
+++ b/forge-gui/res/cardsfolder/d/druids_call.txt
@@ -3,8 +3,7 @@ ManaCost:1 G
Types:Enchantment Aura
K:Enchant creature
A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever enchanted creature is dealt damage, its controller creates that many 1/1 green Squirrel creature tokens.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever enchanted creature is dealt damage, its controller creates that many 1/1 green Squirrel creature tokens.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever enchanted creature is dealt damage, its controller creates that many 1/1 green Squirrel creature tokens.
SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ TriggeredTargetController | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/druids_call.jpg
diff --git a/forge-gui/res/cardsfolder/e/el_hajjaj.txt b/forge-gui/res/cardsfolder/e/el_hajjaj.txt
index 3830ae547e1..45b84191327 100644
--- a/forge-gui/res/cardsfolder/e/el_hajjaj.txt
+++ b/forge-gui/res/cardsfolder/e/el_hajjaj.txt
@@ -2,8 +2,7 @@ Name:El-Hajjaj
ManaCost:1 B B
Types:Creature Human Wizard
PT:1/1
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/e/emberwilde_caliph.txt b/forge-gui/res/cardsfolder/e/emberwilde_caliph.txt
index d60fa8491ae..cdfb05bc65e 100644
--- a/forge-gui/res/cardsfolder/e/emberwilde_caliph.txt
+++ b/forge-gui/res/cardsfolder/e/emberwilde_caliph.txt
@@ -5,9 +5,8 @@ PT:4/4
K:Flying
K:Trample
K:CARDNAME attacks each turn if able.
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME deals damage, you lose that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME deals damage, you lose that much life.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME deals damage, you lose that much life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:RemAIDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/emberwilde_caliph.jpg
diff --git a/forge-gui/res/cardsfolder/e/essence_sliver.txt b/forge-gui/res/cardsfolder/e/essence_sliver.txt
index b054ad401a9..d7b397f7148 100644
--- a/forge-gui/res/cardsfolder/e/essence_sliver.txt
+++ b/forge-gui/res/cardsfolder/e/essence_sliver.txt
@@ -2,8 +2,7 @@ Name:Essence Sliver
ManaCost:3 W
Types:Creature Sliver
PT:3/3
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Sliver | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Sliver deals damage, its controller gains that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Sliver | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Sliver deals damage, its controller gains that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Sliver | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Sliver deals damage, its controller gains that much life.
SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ TriggeredSourceController | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/e/exalted_angel.txt b/forge-gui/res/cardsfolder/e/exalted_angel.txt
index 6d19b54c5f2..d3d97608f8b 100644
--- a/forge-gui/res/cardsfolder/e/exalted_angel.txt
+++ b/forge-gui/res/cardsfolder/e/exalted_angel.txt
@@ -3,9 +3,8 @@ ManaCost:4 W W
Types:Creature Angel
PT:4/5
K:Flying
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
K:Morph:2 W W
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/f/filthy_cur.txt b/forge-gui/res/cardsfolder/f/filthy_cur.txt
index 811381a5320..057c8395c46 100644
--- a/forge-gui/res/cardsfolder/f/filthy_cur.txt
+++ b/forge-gui/res/cardsfolder/f/filthy_cur.txt
@@ -2,9 +2,8 @@ Name:Filthy Cur
ManaCost:1 B
Types:Creature Hound
PT:2/2
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you lose that much life.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you lose that much life.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you lose that much life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/filthy_cur.jpg
Oracle:Whenever Filthy Cur is dealt damage, you lose that much life.
diff --git a/forge-gui/res/cardsfolder/f/firedrinker_satyr.txt b/forge-gui/res/cardsfolder/f/firedrinker_satyr.txt
index b2bb6b39645..9d9f5f4ab9b 100644
--- a/forge-gui/res/cardsfolder/f/firedrinker_satyr.txt
+++ b/forge-gui/res/cardsfolder/f/firedrinker_satyr.txt
@@ -2,8 +2,7 @@ Name:Firedrinker Satyr
ManaCost:R
Types:Creature Satyr Shaman
PT:2/1
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you.
SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | Defined$ You | References$ X
SVar:X:TriggerCount$DamageAmount
A:AB$ Pump | Cost$ 1 R | NumAtt$ 1 | SubAbility$ DBDmg | SpellDescription$ CARDNAME gets +1/+0 until end of turn and deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/f/flash_conscription.txt b/forge-gui/res/cardsfolder/f/flash_conscription.txt
index e22a7b1d6b1..9fdde579826 100644
--- a/forge-gui/res/cardsfolder/f/flash_conscription.txt
+++ b/forge-gui/res/cardsfolder/f/flash_conscription.txt
@@ -3,7 +3,7 @@ ManaCost:5 R
Types:Instant
A:SP$ GainControl | Cost$ 5 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | AddKWs$ Haste | LoseControl$ EOT | Untap$ True | SubAbility$ DBAnimate | SpellDescription$ Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn. If {W} was spent to cast CARDNAME, the creature gains "Whenever this creature deals combat damage, you gain that much life" until end of turn.
SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Triggers$ TrigDamage | sVars$ GainLife,X | ConditionManaSpent$ W
-SVar:TrigDamage:Mode$ DealtCombatDamageOnce | ValidSource$ Card.Self | Execute$ GainLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature deals combat damage, you gain that much life.
+SVar:TrigDamage:Mode$ DamageDone | OnlyOnce$ True | CombatDamage$ True | ValidSource$ Card.Self | Execute$ GainLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature deals combat damage, you gain that much life.
SVar:GainLife:AB$ GainLife | Cost$ 0 | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/f/frozen_solid.txt b/forge-gui/res/cardsfolder/f/frozen_solid.txt
index bfbde152606..4fd013ff733 100644
--- a/forge-gui/res/cardsfolder/f/frozen_solid.txt
+++ b/forge-gui/res/cardsfolder/f/frozen_solid.txt
@@ -5,8 +5,7 @@ K:Enchant creature
A:SP$ Attach | Cost$ 1 U U | ValidTgts$ Creature | AILogic$ KeepTapped
S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | AddSVar$ FrozenSolidDestroy | Description$ Enchanted creature doesn't untap during its controller's untap step.
SVar:FrozenSolidDestroy:SVar:DestroyWhenDamaged:True
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTarget
SVar:Picture:http://www.wizards.com/global/images/magic/general/frozen_solid.jpg
Oracle:Enchant creature\nEnchanted creature doesn't untap during its controller's untap step.\nWhen enchanted creature is dealt damage, destroy it.
diff --git a/forge-gui/res/cardsfolder/f/fungus_sliver.txt b/forge-gui/res/cardsfolder/f/fungus_sliver.txt
index 36402747176..aae123ae6d6 100644
--- a/forge-gui/res/cardsfolder/f/fungus_sliver.txt
+++ b/forge-gui/res/cardsfolder/f/fungus_sliver.txt
@@ -2,9 +2,8 @@ Name:Fungus Sliver
ManaCost:3 G
Types:Creature Fungus Sliver
PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Sliver | AddTrigger$ OnDmg & OnDmgCombat | AddSVar$ FungusSliverCounters | Description$ All Sliver creatures have "Whenever this creature is dealt damage, put a +1/+1 counter on it." (The damage is dealt before the counter is put on.)
-SVar:OnDmg:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | Execute$ FungusSliverCounters | TriggerDescription$ Whenever CARDNAME is dealt damage, put a +1/+1 counter on it.
-SVar:OnDmgCombat:Mode$ DamageDone | Secondary$ True | ValidTarget$ Card.Self | Execute$ FungusSliverCounters | TriggerDescription$ Whenever CARDNAME is dealt damage, put a +1/+1 counter on it.
+S:Mode$ Continuous | Affected$ Creature.Sliver | AddTrigger$ OnDmg | AddSVar$ FungusSliverCounters | Description$ All Sliver creatures have "Whenever this creature is dealt damage, put a +1/+1 counter on it." (The damage is dealt before the counter is put on.)
+SVar:OnDmg:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | Execute$ FungusSliverCounters | TriggerDescription$ Whenever CARDNAME is dealt damage, put a +1/+1 counter on it.
SVar:FungusSliverCounters:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
SVar:PlayMain1:TRUE
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/f/fungusaur.txt b/forge-gui/res/cardsfolder/f/fungusaur.txt
index 137764a173a..e8f18c694ca 100644
--- a/forge-gui/res/cardsfolder/f/fungusaur.txt
+++ b/forge-gui/res/cardsfolder/f/fungusaur.txt
@@ -2,8 +2,7 @@ Name:Fungusaur
ManaCost:3 G
Types:Creature Fungus Dinosaur
PT:2/2
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME is dealt damage, put a +1/+1 counter on it.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME is dealt damage, put a +1/+1 counter on it.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME is dealt damage, put a +1/+1 counter on it.
SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/fungusaur.jpg
diff --git a/forge-gui/res/cardsfolder/g/genju_of_the_fields.txt b/forge-gui/res/cardsfolder/g/genju_of_the_fields.txt
index f2f8205baeb..c7a3b5061cb 100644
--- a/forge-gui/res/cardsfolder/g/genju_of_the_fields.txt
+++ b/forge-gui/res/cardsfolder/g/genju_of_the_fields.txt
@@ -3,12 +3,11 @@ ManaCost:W
Types:Enchantment Aura
K:Enchant Plains
A:SP$ Attach | Cost$ W | ValidTgts$ Plains | AILogic$ Pump
-A:AB$ Animate | Cost$ 2 | Defined$ Enchanted | Power$ 2 | Toughness$ 5 | Types$ Creature,Spirit | Colors$ White | Triggers$ PseudoLifelink,PseudoLifelinkCombat | sVars$ GenjuTrigGain,GenjuX | SpellDescription$ Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature with "Whenever this creature deals damage, its controller gains that much life." It's still a land.
+A:AB$ Animate | Cost$ 2 | Defined$ Enchanted | Power$ 2 | Toughness$ 5 | Types$ Creature,Spirit | Colors$ White | Triggers$ PseudoLifelink | sVars$ GenjuTrigGain,GenjuX | SpellDescription$ Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature with "Whenever this creature deals damage, its controller gains that much life." It's still a land.
T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted Plains is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
-SVar:TrigReturnOwner:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Hand
-SVar:PseudoLifelink:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ GenjuTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-SVar:PseudoLifelinkCombat:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ GenjuTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-SVar:GenjuTrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ GenjuX | References$ GenjuX
+SVar:TrigReturnOwner:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+SVar:PseudoLifelink:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ GenjuTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+SVar:GenjuTrigGain:DB$ GainLife | Defined$ You | LifeAmount$ GenjuX | References$ GenjuX
SVar:NonStackingAttachEffect:True
SVar:AIPaymentPreference:AvoidPayingWithAttachTarget
SVar:GenjuX:TriggerCount$DamageAmount
diff --git a/forge-gui/res/cardsfolder/g/grollub.txt b/forge-gui/res/cardsfolder/g/grollub.txt
index 27782ab800c..67c704daba7 100644
--- a/forge-gui/res/cardsfolder/g/grollub.txt
+++ b/forge-gui/res/cardsfolder/g/grollub.txt
@@ -2,8 +2,7 @@ Name:Grollub
ManaCost:2 B
Types:Creature Beast
PT:3/3
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, each opponent gains that much life.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, each opponent gains that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, each opponent gains that much life.
SVar:TrigGain:AB$ GainLife | Cost$ 0 | Defined$ Player.Opponent | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/g/guilty_conscience.txt b/forge-gui/res/cardsfolder/g/guilty_conscience.txt
index 5c727c0a390..59a6537abc7 100644
--- a/forge-gui/res/cardsfolder/g/guilty_conscience.txt
+++ b/forge-gui/res/cardsfolder/g/guilty_conscience.txt
@@ -3,8 +3,7 @@ ManaCost:W
Types:Enchantment Aura
K:Enchant creature
A:SP$ Attach | Cost$ W | ValidTgts$ Creature | AILogic$ SpecificCard
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.AttachedBy | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, CARDNAME deals that much damage to that creature.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.AttachedBy | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, CARDNAME deals that much damage to that creature.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.AttachedBy | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, CARDNAME deals that much damage to that creature.
SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredSource | NumDmg$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/guilty_conscience.jpg
diff --git a/forge-gui/res/cardsfolder/h/high_priest_of_penance.txt b/forge-gui/res/cardsfolder/h/high_priest_of_penance.txt
index 0617f9b2078..091350b4fe9 100644
--- a/forge-gui/res/cardsfolder/h/high_priest_of_penance.txt
+++ b/forge-gui/res/cardsfolder/h/high_priest_of_penance.txt
@@ -2,8 +2,7 @@ Name:High Priest of Penance
ManaCost:W B
Types:Creature Human Cleric
PT:1/1
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | OptionalDecider$ You | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME is dealt damage, you may destroy target nonland permanent.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | OptionalDecider$ You | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME is dealt damage, you may destroy target nonland permanent.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | OptionalDecider$ You | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME is dealt damage, you may destroy target nonland permanent.
SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/high_priest_of_penance.jpg
diff --git a/forge-gui/res/cardsfolder/h/horned_cheetah.txt b/forge-gui/res/cardsfolder/h/horned_cheetah.txt
index d13f901df51..8690072eee5 100644
--- a/forge-gui/res/cardsfolder/h/horned_cheetah.txt
+++ b/forge-gui/res/cardsfolder/h/horned_cheetah.txt
@@ -2,9 +2,8 @@ Name:Horned Cheetah
ManaCost:2 G W
Types:Creature Cat
PT:2/2
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/horned_cheetah.jpg
diff --git a/forge-gui/res/cardsfolder/h/hornet_nest.txt b/forge-gui/res/cardsfolder/h/hornet_nest.txt
index 5fe60b84956..dd6a27d17fd 100644
--- a/forge-gui/res/cardsfolder/h/hornet_nest.txt
+++ b/forge-gui/res/cardsfolder/h/hornet_nest.txt
@@ -3,8 +3,7 @@ ManaCost:2 G
Types:Creature Insect
PT:0/2
K:Defender
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, create that many 1/1 green Insect creature tokens with flying and deathtouch.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, create that many 1/1 green Insect creature tokens with flying and deathtouch.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, create that many 1/1 green Insect creature tokens with flying and deathtouch.
SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ g 1 1 insect M15 | TokenKeywords$ Flying<>Deathtouch | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/h/hot_soup.txt b/forge-gui/res/cardsfolder/h/hot_soup.txt
index c974948c76a..6a223b7769a 100644
--- a/forge-gui/res/cardsfolder/h/hot_soup.txt
+++ b/forge-gui/res/cardsfolder/h/hot_soup.txt
@@ -4,8 +4,7 @@ Types:Artifact Equipment
K:Equip 3
S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddSVar$ HotSoupDestroy | AddHiddenKeyword$ Unblockable | Description$ Equipped creature can't be blocked.
SVar:HotSoupDestroy:SVar:DestroyWhenDamaged:True
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Creature.EquippedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When equipped creature is dealt damage, destroy it.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Creature.EquippedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When equipped creature is dealt damage, destroy it.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Creature.EquippedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When equipped creature is dealt damage, destroy it.
SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ TriggeredTarget
SVar:NonStackingAttachEffect:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/hot_soup.jpg
diff --git a/forge-gui/res/cardsfolder/i/illusory_ambusher.txt b/forge-gui/res/cardsfolder/i/illusory_ambusher.txt
index 9d3c2353910..6834184ec21 100644
--- a/forge-gui/res/cardsfolder/i/illusory_ambusher.txt
+++ b/forge-gui/res/cardsfolder/i/illusory_ambusher.txt
@@ -3,8 +3,7 @@ ManaCost:4 U
Types:Creature Cat Illusion
PT:4/1
K:Flash
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigDraw | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, draw that many cards.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigDraw | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, draw that many cards.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigDraw | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, draw that many cards.
SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/j/jackal_pup.txt b/forge-gui/res/cardsfolder/j/jackal_pup.txt
index a1e2bf09103..fd98b8e4a64 100644
--- a/forge-gui/res/cardsfolder/j/jackal_pup.txt
+++ b/forge-gui/res/cardsfolder/j/jackal_pup.txt
@@ -2,8 +2,7 @@ Name:Jackal Pup
ManaCost:R
Types:Creature Jackal
PT:2/1
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you.
SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | Defined$ You | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/jackal_pup.jpg
diff --git a/forge-gui/res/cardsfolder/j/jagged_poppet.txt b/forge-gui/res/cardsfolder/j/jagged_poppet.txt
index 120066ff1da..2a9fdf84245 100644
--- a/forge-gui/res/cardsfolder/j/jagged_poppet.txt
+++ b/forge-gui/res/cardsfolder/j/jagged_poppet.txt
@@ -2,9 +2,8 @@ Name:Jagged Poppet
ManaCost:1 B R
Types:Creature Ogre Warrior
PT:3/4
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | Execute$ TrigYouDiscard | TriggerDescription$ Whenever CARDNAME is dealt damage, discard that many cards.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | Execute$ TrigYouDiscard | TriggerDescription$ Whenever CARDNAME is dealt damage, discard that many cards.
-T:Mode$ DealtCombatDamageOnce | ValidSource$ Card.Self | ValidTarget$ Player | Hellbent$ True | Execute$ TrigOppDiscard | TriggerDescription$ Hellbent — Whenever CARDNAME deals combat damage to a player, if you have no cards in hand, that player discards cards equal to the damage.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | Execute$ TrigYouDiscard | TriggerDescription$ Whenever CARDNAME is dealt damage, discard that many cards.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Hellbent$ True | Execute$ TrigOppDiscard | TriggerDescription$ Hellbent — Whenever CARDNAME deals combat damage to a player, if you have no cards in hand, that player discards cards equal to the damage.
SVar:TrigYouDiscard:DB$ Discard | Defined$ You | NumCards$ X | Mode$ TgtChoose | References$ X
SVar:TrigOppDiscard:DB$ Discard | Defined$ TriggeredTarget | NumCards$ X | Mode$ TgtChoose | References$ X
SVar:X:TriggerCount$DamageAmount
diff --git a/forge-gui/res/cardsfolder/j/justice.txt b/forge-gui/res/cardsfolder/j/justice.txt
index e53539ef84a..ac122e6ecfd 100644
--- a/forge-gui/res/cardsfolder/j/justice.txt
+++ b/forge-gui/res/cardsfolder/j/justice.txt
@@ -2,8 +2,7 @@ Name:Justice
ManaCost:2 W W
Types:Enchantment
K:UpkeepCost:W W
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Red | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever a red creature or spell deals damage, CARDNAME deals that much damage to that creature's or spell's controller.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Red | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever a red creature or spell deals damage, CARDNAME deals that much damage to that creature's or spell's controller.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Red | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever a red creature or spell deals damage, CARDNAME deals that much damage to that creature's or spell's controller.
SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredSourceController | NumDmg$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/k/kami_of_the_honored_dead.txt b/forge-gui/res/cardsfolder/k/kami_of_the_honored_dead.txt
index 1d1c956f6d8..c343a039764 100644
--- a/forge-gui/res/cardsfolder/k/kami_of_the_honored_dead.txt
+++ b/forge-gui/res/cardsfolder/k/kami_of_the_honored_dead.txt
@@ -4,8 +4,7 @@ Types:Creature Spirit
PT:3/5
K:Flying
K:Soulshift:6
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigGain | TriggerDescription$ Whenever CARDNAME is dealt damage, you gain that much life.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigGain | TriggerDescription$ Whenever CARDNAME is dealt damage, you gain that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigGain | TriggerDescription$ Whenever CARDNAME is dealt damage, you gain that much life.
SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/k/kiyomaro_first_to_stand.txt b/forge-gui/res/cardsfolder/k/kiyomaro_first_to_stand.txt
index 7343f8074e8..7515f2b21fc 100644
--- a/forge-gui/res/cardsfolder/k/kiyomaro_first_to_stand.txt
+++ b/forge-gui/res/cardsfolder/k/kiyomaro_first_to_stand.txt
@@ -4,8 +4,7 @@ Types:Legendary Creature Spirit
PT:*/*
S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of cards in your hand.
S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Vigilance | CheckSVar$ X | SVarCompare$ GE4 | Description$ As long as you have four or more cards in hand, CARDNAME has vigilance.
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | CheckSVar$ X | SVarCompare$ GE7 | TriggerZones$ Battlefield | Execute$ TrigGain | TriggerDescription$ Whenever CARDNAME deals damage, if you have seven or more cards in hand, you gain 7 life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | CheckSVar$ X | SVarCompare$ GE7 | TriggerZones$ Battlefield | Execute$ TrigGain | TriggerDescription$ Whenever CARDNAME deals damage, if you have seven or more cards in hand, you gain 7 life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | CheckSVar$ X | SVarCompare$ GE7 | TriggerZones$ Battlefield | Execute$ TrigGain | TriggerDescription$ Whenever CARDNAME deals damage, if you have seven or more cards in hand, you gain 7 life.
SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ 7
SVar:X:Count$InYourHand
SVar:NeedsToPlayVar:X GE3
diff --git a/forge-gui/res/cardsfolder/k/kjeldoran_gargoyle.txt b/forge-gui/res/cardsfolder/k/kjeldoran_gargoyle.txt
index be7a33d7c2e..f459298c543 100644
--- a/forge-gui/res/cardsfolder/k/kjeldoran_gargoyle.txt
+++ b/forge-gui/res/cardsfolder/k/kjeldoran_gargoyle.txt
@@ -4,8 +4,7 @@ Types:Creature Gargoyle
PT:3/3
K:Flying
K:First Strike
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/l/lich.txt b/forge-gui/res/cardsfolder/l/lich.txt
index d6db71727bb..35ffb4dc069 100644
--- a/forge-gui/res/cardsfolder/l/lich.txt
+++ b/forge-gui/res/cardsfolder/l/lich.txt
@@ -9,8 +9,7 @@ S:Mode$ Continuous | Affected$ You | AddKeyword$ You don't lose the game for hav
R:Event$ GainLife | ActiveZones$ Battlefield | ValidPlayer$ You | AiLogic$ LichDraw | ReplaceWith$ Draw | Description$ If you would gain life, draw that many cards instead.
SVar:Draw:DB$ Draw | Defined$ You | NumCards$ X | References$ X
SVar:X:ReplaceCount$LifeGained
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigLoseOrSac | TriggerDescription$ Whenever you're dealt damage, sacrifice that many nontoken permanents. If you can't, you lose the game.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigLoseOrSac | TriggerDescription$ Whenever you're dealt damage, sacrifice that many nontoken permanents. If you can't, you lose the game.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigLoseOrSac | TriggerDescription$ Whenever you're dealt damage, sacrifice that many nontoken permanents. If you can't, you lose the game.
SVar:TrigLoseOrSac:DB$ LosesGame | Defined$ You | ConditionCheckSVar$ PermanentsToSac | ConditionSVarCompare$ GTY | SubAbility$ DBSacrificePerm
SVar:DBSacrificePerm:DB$Sacrifice | Amount$ PermanentsToSac | SacValid$ Permanent.nontoken | References$ PermanentsToSac | ConditionCheckSVar$ PermanentsToSac | ConditionSVarCompare$ LEY
SVar:PermanentsToSac:TriggerCount$DamageAmount
diff --git a/forge-gui/res/cardsfolder/l/living_artifact.txt b/forge-gui/res/cardsfolder/l/living_artifact.txt
index bc15a228d9f..84c772d9c45 100644
--- a/forge-gui/res/cardsfolder/l/living_artifact.txt
+++ b/forge-gui/res/cardsfolder/l/living_artifact.txt
@@ -3,11 +3,10 @@ ManaCost:G
Types:Enchantment Aura
K:Enchant artifact
A:SP$ Attach | Cost$ G | ValidTgts$ Artifact | AILogic$ Pump
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you're dealt damage, put that many vitality counters on CARDNAME.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you're dealt damage, put that many vitality counters on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ VITALITY | CounterNum$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you're dealt damage, put that many vitality counters on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ VITALITY | CounterNum$ X | References$ X
SVar:X:TriggerCount$DamageAmount
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGainLife | IsPresent$ Card.Self+counters_GE1_VITALITY | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may remove a vitality counter from CARDNAME. If you do, you gain 1 life.
-SVar:TrigGainLife:AB$GainLife | Cost$ SubCounter<1/VITALITY> | Defined$ You | LifeAmount$ 1
+SVar:TrigGainLife:AB$ GainLife | Cost$ SubCounter<1/VITALITY> | Defined$ You | LifeAmount$ 1
SVar:Picture:http://www.wizards.com/global/images/magic/general/living_artifact.jpg
Oracle:Enchant artifact\nWhenever you're dealt damage, put that many vitality counters on Living Artifact.\nAt the beginning of your upkeep, you may remove a vitality counter from Living Artifact. If you do, you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/m/mire_blight.txt b/forge-gui/res/cardsfolder/m/mire_blight.txt
index 9ed4134b7a2..449b28f5499 100644
--- a/forge-gui/res/cardsfolder/m/mire_blight.txt
+++ b/forge-gui/res/cardsfolder/m/mire_blight.txt
@@ -5,9 +5,8 @@ K:Enchant creature
A:SP$ Attach | Cost$ B | ValidTgts$ Creature | AILogic$ Curse
S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddSVar$ MireDestroy
SVar:MireDestroy:SVar:DestroyWhenDamaged:True
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
-SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ TriggeredTarget
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
+SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTarget
SVar:NonStackingAttachEffect:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/mire_blight.jpg
Oracle:Enchant creature\nWhen enchanted creature is dealt damage, destroy it.
diff --git a/forge-gui/res/cardsfolder/m/mogg_maniac.txt b/forge-gui/res/cardsfolder/m/mogg_maniac.txt
index fcfc6cba857..6856f07ed1c 100644
--- a/forge-gui/res/cardsfolder/m/mogg_maniac.txt
+++ b/forge-gui/res/cardsfolder/m/mogg_maniac.txt
@@ -2,8 +2,7 @@ Name:Mogg Maniac
ManaCost:1 R
Types:Creature Goblin
PT:1/1
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to target opponent.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to target opponent.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to target opponent.
SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/m/mortal_wound.txt b/forge-gui/res/cardsfolder/m/mortal_wound.txt
index 878474b44f0..655daaa377a 100644
--- a/forge-gui/res/cardsfolder/m/mortal_wound.txt
+++ b/forge-gui/res/cardsfolder/m/mortal_wound.txt
@@ -5,8 +5,7 @@ K:Enchant creature
A:SP$ Attach | Cost$ G | ValidTgts$ Creature | AILogic$ Curse
S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddSVar$ MortalDestroy
SVar:MortalDestroy:SVar:DestroyWhenDamaged:True
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.
SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTarget
SVar:NonStackingAttachEffect:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/mortal_wound.jpg
diff --git a/forge-gui/res/cardsfolder/m/mourning_thrull.txt b/forge-gui/res/cardsfolder/m/mourning_thrull.txt
index 6869f96f431..124a2bb5edb 100644
--- a/forge-gui/res/cardsfolder/m/mourning_thrull.txt
+++ b/forge-gui/res/cardsfolder/m/mourning_thrull.txt
@@ -3,9 +3,8 @@ ManaCost:1 WB
Types:Creature Thrull
PT:1/1
K:Flying
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/mourning_thrull.jpg
diff --git a/forge-gui/res/cardsfolder/n/necravolver.txt b/forge-gui/res/cardsfolder/n/necravolver.txt
index a53afde47cf..e3d01d46f0b 100644
--- a/forge-gui/res/cardsfolder/n/necravolver.txt
+++ b/forge-gui/res/cardsfolder/n/necravolver.txt
@@ -8,9 +8,8 @@ SVar:VolverPumped:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 |
SVar:VolverStomp:DB$ Pump | Defined$ Self | KW$ Trample | Permanent$ True
T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked 2 | Origin$ Any | Destination$ Battlefield | Execute$ VolverPumped2 | Static$ True | TriggerDescription$ If CARDNAME was kicked with its {W} kicker, it enters the battlefield with a +1/+1 counter on it and with "Whenever CARDNAME deals damage, you gain that much life."
SVar:VolverPumped2:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ VolverLife
-SVar:VolverLife:DB$ Animate | Defined$ Self | Triggers$ PseudoLifelink,PseudoLifelinkCombat | sVars$ VolverTrigGain,VolverX | Permanent$ True
-SVar:PseudoLifelink:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ VolverTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-SVar:PseudoLifelinkCombat:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ VolverTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+SVar:VolverLife:DB$ Animate | Defined$ Self | Triggers$ PseudoLifelink | sVars$ VolverTrigGain,VolverX | Permanent$ True
+SVar:PseudoLifelink:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ VolverTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
SVar:VolverTrigGain:DB$ GainLife | Defined$ You | LifeAmount$ VolverX | References$ VolverX
SVar:VolverX:TriggerCount$DamageAmount
SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/p/paladin_of_prahv.txt b/forge-gui/res/cardsfolder/p/paladin_of_prahv.txt
index 99bba57bb16..cba1a1302c4 100644
--- a/forge-gui/res/cardsfolder/p/paladin_of_prahv.txt
+++ b/forge-gui/res/cardsfolder/p/paladin_of_prahv.txt
@@ -2,9 +2,8 @@ Name:Paladin of Prahv
ManaCost:4 W W
Types:Creature Human Knight
PT:3/4
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-SVar:TrigGain:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
A:AB$ Effect | Cost$ 1 W | Name$ Paladin of Prahv Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature | Triggers$ TrigDamage | SVars$ TrigGain,X | RememberObjects$ Targeted | ActivationZone$ Hand | ActivationLimit$ 1 | PlayerTurn$ True | ActivationPhases$ Upkeep | PrecostDesc$ Forecast — | CostDesc$ {1}{W}, Reveal CARDNAME from your hand: | SpellDescription$ Whenever target creature deals damage this turn, you gain that much life. (Activate this ability only during your upkeep and only once each turn.)
SVar:TrigDamage:Mode$ DamageDone | ValidSource$ Creature.IsRemembered | Execute$ TrigGain | TriggerDescription$ Whenever the targeted creature deals damage, you gain that much life.
diff --git a/forge-gui/res/cardsfolder/p/phantom_nishoba.txt b/forge-gui/res/cardsfolder/p/phantom_nishoba.txt
index 466127ca3cc..bfaf6b5654e 100644
--- a/forge-gui/res/cardsfolder/p/phantom_nishoba.txt
+++ b/forge-gui/res/cardsfolder/p/phantom_nishoba.txt
@@ -4,8 +4,7 @@ Types:Creature Cat Beast Spirit
PT:0/0
K:etbCounter:P1P1:7
K:Trample
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Card.Self | ReplaceWith$ DBRemoveCounters | PreventionEffect$ True | Description$ If damage would be dealt to CARDNAME, prevent that damage. Remove a +1/+1 counter from CARDNAME.
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_negator.txt b/forge-gui/res/cardsfolder/p/phyrexian_negator.txt
index 4f168ce352b..1139bbe568b 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_negator.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_negator.txt
@@ -3,8 +3,7 @@ ManaCost:2 B
Types:Creature Horror
PT:5/5
K:Trample
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, sacrifice that many permanents.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, sacrifice that many permanents.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, sacrifice that many permanents.
SVar:TrigSac:DB$ Sacrifice | Amount$ X | SacValid$ Permanent | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_totem.txt b/forge-gui/res/cardsfolder/p/phyrexian_totem.txt
index 02fcd0ee0da..daebb366e7d 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_totem.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_totem.txt
@@ -3,8 +3,7 @@ ManaCost:3
Types:Artifact
A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SpellDescription$ Add {B} to your mana pool.
A:AB$ Animate | Cost$ 2 B | Defined$ Self | Power$ 5 | Toughness$ 5 | Types$ Creature,Artifact,Horror | Colors$ Black | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 5/5 black Horror artifact creature with trample until end of turn.
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Creature.Self | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME is dealt damage, if it's a creature, sacrifice that many permanents.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Creature.Self | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME is dealt damage, if it's a creature, sacrifice that many permanents.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Creature.Self | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME is dealt damage, if it's a creature, sacrifice that many permanents.
SVar:TrigSac:AB$Sacrifice | Cost$ 0 | SacValid$ Permanent | Amount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/p/putrid_warrior.txt b/forge-gui/res/cardsfolder/p/putrid_warrior.txt
index aeb99bc7073..5d175cb06e8 100644
--- a/forge-gui/res/cardsfolder/p/putrid_warrior.txt
+++ b/forge-gui/res/cardsfolder/p/putrid_warrior.txt
@@ -2,8 +2,7 @@ Name:Putrid Warrior
ManaCost:W B
Types:Creature Zombie Soldier Warrior
PT:2/2
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, ABILITY
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, ABILITY
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, ABILITY
SVar:TrigCharm:DB$ Charm | Choices$ SVar1,SVar2
SVar:SVar1:DB$ LoseLife | Defined$ Player | LifeAmount$ 1 | SpellDescription$ Each player loses 1 life.
SVar:SVar2:DB$ GainLife | Defined$ Player | LifeAmount$ 1 | SpellDescription$ Each player gains 1 life.
diff --git a/forge-gui/res/cardsfolder/r/ragged_veins.txt b/forge-gui/res/cardsfolder/r/ragged_veins.txt
index 8502288036a..f3b2f3ff31d 100644
--- a/forge-gui/res/cardsfolder/r/ragged_veins.txt
+++ b/forge-gui/res/cardsfolder/r/ragged_veins.txt
@@ -4,9 +4,8 @@ Types:Enchantment Aura
K:Flash
K:Enchant creature
A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Curse
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever enchanted creature is dealt damage, its controller loses that much life.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever enchanted creature is dealt damage, its controller loses that much life.
-SVar:TrigLoseLife:AB$ LoseLife | Cost$ 0 | Defined$ TriggeredTargetController | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever enchanted creature is dealt damage, its controller loses that much life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredTargetController | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/ragged_veins.jpg
Oracle:Flash\nEnchant creature\nWhenever enchanted creature is dealt damage, its controller loses that much life.
diff --git a/forge-gui/res/cardsfolder/r/rakavolver.txt b/forge-gui/res/cardsfolder/r/rakavolver.txt
index 3523acf6567..7a55c7fb9a7 100644
--- a/forge-gui/res/cardsfolder/r/rakavolver.txt
+++ b/forge-gui/res/cardsfolder/r/rakavolver.txt
@@ -5,9 +5,8 @@ PT:2/2
K:Kicker:1 W:U
T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked 1 | Origin$ Any | Destination$ Battlefield | Execute$ VolverStrength | Static$ True | TriggerDescription$ If CARDNAME was kicked with its {1}{W} kicker, it enters the battlefield with two +1/+1 counters on it and with "Whenever CARDNAME deals damage, you gain that much life."
SVar:VolverStrength:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ VolverLife
-SVar:VolverLife:DB$ Animate | Defined$ Self | Triggers$ PseudoLifelink,PseudoLifelinkCombat | sVars$ VolverTrigGain,VolverX | Permanent$ True
-SVar:PseudoLifelink:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ VolverTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-SVar:PseudoLifelinkCombat:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ VolverTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+SVar:VolverLife:DB$ Animate | Defined$ Self | Triggers$ PseudoLifelink | sVars$ VolverTrigGain,VolverX | Permanent$ True
+SVar:PseudoLifelink:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ VolverTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
SVar:VolverTrigGain:DB$ GainLife | Defined$ You | LifeAmount$ VolverX | References$ VolverX
SVar:VolverX:TriggerCount$DamageAmount
T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked 2 | Origin$ Any | Destination$ Battlefield | Execute$ VolverPumped | Static$ True | TriggerDescription$ If CARDNAME was kicked with its {U} kicker, it enters the battlefield with a +1/+1 counter on it and with flying.
diff --git a/forge-gui/res/cardsfolder/r/repercussion.txt b/forge-gui/res/cardsfolder/r/repercussion.txt
index f43cc67ddba..5001c4b7eed 100644
--- a/forge-gui/res/cardsfolder/r/repercussion.txt
+++ b/forge-gui/res/cardsfolder/r/repercussion.txt
@@ -1,9 +1,8 @@
Name:Repercussion
ManaCost:1 R R
Types:Enchantment
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Creature | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature is dealt damage, CARDNAME deals that much damage to that creature's controller.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Creature | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature is dealt damage, CARDNAME deals that much damage to that creature's controller.
-SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredTargetController | NumDmg$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Creature | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature is dealt damage, CARDNAME deals that much damage to that creature's controller.
+SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredTargetController | NumDmg$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:RemRandomDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/repercussion.jpg
diff --git a/forge-gui/res/cardsfolder/r/rite_of_passage.txt b/forge-gui/res/cardsfolder/r/rite_of_passage.txt
index 1c672e7b1e9..fe3c8b6684c 100644
--- a/forge-gui/res/cardsfolder/r/rite_of_passage.txt
+++ b/forge-gui/res/cardsfolder/r/rite_of_passage.txt
@@ -1,8 +1,7 @@
Name:Rite of Passage
ManaCost:2 G
Types:Enchantment
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control is dealt damage, put a +1/+1 counter on it. (The damage is dealt before the counter is put on.)
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control is dealt damage, put a +1/+1 counter on it. (The damage is dealt before the counter is put on.)
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ TriggeredTarget | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control is dealt damage, put a +1/+1 counter on it. (The damage is dealt before the counter is put on.)
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredTarget | CounterType$ P1P1 | CounterNum$ 1
SVar:Picture:http://www.wizards.com/global/images/magic/general/rite_of_passage.jpg
Oracle:Whenever a creature you control is dealt damage, put a +1/+1 counter on it. (The damage is dealt before the counter is put on.)
diff --git a/forge-gui/res/cardsfolder/s/saber_ants.txt b/forge-gui/res/cardsfolder/s/saber_ants.txt
index 49724a0f732..68e913d4275 100644
--- a/forge-gui/res/cardsfolder/s/saber_ants.txt
+++ b/forge-gui/res/cardsfolder/s/saber_ants.txt
@@ -2,9 +2,8 @@ Name:Saber Ants
ManaCost:3 G
Types:Creature Insect
PT:2/3
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME is dealt damage, you may create that many 1/1 green Insect creature tokens.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME is dealt damage, you may create that many 1/1 green Insect creature tokens.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME is dealt damage, you may create that many 1/1 green Insect creature tokens.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/saber_ants.jpg
diff --git a/forge-gui/res/cardsfolder/s/shinka_gatekeeper.txt b/forge-gui/res/cardsfolder/s/shinka_gatekeeper.txt
index d34221f083a..a168056fee3 100644
--- a/forge-gui/res/cardsfolder/s/shinka_gatekeeper.txt
+++ b/forge-gui/res/cardsfolder/s/shinka_gatekeeper.txt
@@ -2,8 +2,7 @@ Name:Shinka Gatekeeper
ManaCost:2 R
Types:Creature Ogre Warrior
PT:3/2
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you.
SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | Defined$ You | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/shinka_gatekeeper.jpg
diff --git a/forge-gui/res/cardsfolder/s/shriveling_rot.txt b/forge-gui/res/cardsfolder/s/shriveling_rot.txt
index 90c8dcc5d02..e07605eb9d3 100644
--- a/forge-gui/res/cardsfolder/s/shriveling_rot.txt
+++ b/forge-gui/res/cardsfolder/s/shriveling_rot.txt
@@ -3,10 +3,9 @@ ManaCost:2 B B
Types:Instant
K:Entwine:2 B
A:SP$ Charm | Cost$ 2 B B | Choices$ DBEffect,DBEffect2 | CharmNum$ 1
-SVar:DBEffect:DB$ Effect | Name$ Shriveling Rot Effect | Triggers$ Trig1,Trig1A | SVars$ SVar1 | SpellDescription$ Until end of turn, whenever a creature is dealt damage, destroy it.
+SVar:DBEffect:DB$ Effect | Name$ Shriveling Rot Effect | Triggers$ Trig1 | SVars$ SVar1 | SpellDescription$ Until end of turn, whenever a creature is dealt damage, destroy it.
SVar:DBEffect2:DB$ Effect | Name$ Shriveling Rot Effect 2 | Triggers$ Trig2 | SVars$ SVar2,X | SpellDescription$ Until end of turn, whenever a creature dies, that creature's controller loses life equal to its toughness.
-SVar:Trig1:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Creature | Execute$ SVar1 | TriggerDescription$ Whenever a creature is dealt damage, destroy it.
-SVar:Trig1A:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Creature | Execute$ SVar1 | TriggerDescription$ Whenever a creature is dealt damage, destroy it.
+SVar:Trig1:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Creature | Execute$ SVar1 | TriggerDescription$ Whenever a creature is dealt damage, destroy it.
SVar:SVar1:DB$ Destroy | Defined$ TriggeredTarget
SVar:Trig2:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | Execute$ SVar2 | TriggerDescription$ Whenever a creature dies, that creature's controller loses life equal to its toughness.
SVar:SVar2:DB$ LoseLife | Defined$ TriggeredCardController | LifeAmount$ X | References$ X
diff --git a/forge-gui/res/cardsfolder/s/soul_link.txt b/forge-gui/res/cardsfolder/s/soul_link.txt
index 8f9faec34d2..fa4b032bc13 100644
--- a/forge-gui/res/cardsfolder/s/soul_link.txt
+++ b/forge-gui/res/cardsfolder/s/soul_link.txt
@@ -3,11 +3,9 @@ ManaCost:1 W B
Types:Enchantment Aura
K:Enchant creature
A:SP$ Attach | Cost$ 1 W B | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature is dealt damage, you gain that much life.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature is dealt damage, you gain that much life.
-SVar:TrigGain:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature is dealt damage, you gain that much life.
+SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_link.jpg
Oracle:Enchant creature\nWhenever enchanted creature deals damage, you gain that much life.\nWhenever enchanted creature is dealt damage, you gain that much life.
diff --git a/forge-gui/res/cardsfolder/s/spirit_link.txt b/forge-gui/res/cardsfolder/s/spirit_link.txt
index 5797352bb0f..a35c19b0b83 100644
--- a/forge-gui/res/cardsfolder/s/spirit_link.txt
+++ b/forge-gui/res/cardsfolder/s/spirit_link.txt
@@ -3,8 +3,7 @@ ManaCost:W
Types:Enchantment Aura
K:Enchant creature
A:SP$ Attach | Cost$ W | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_link.jpg
diff --git a/forge-gui/res/cardsfolder/s/spirit_loop.txt b/forge-gui/res/cardsfolder/s/spirit_loop.txt
index 97604fc765e..a43baa21981 100644
--- a/forge-gui/res/cardsfolder/s/spirit_loop.txt
+++ b/forge-gui/res/cardsfolder/s/spirit_loop.txt
@@ -3,12 +3,11 @@ ManaCost:1 W
Types:Enchantment Aura
K:Enchant creature you control
A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
-SVar:TrigGain:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
+SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ TriggeredCard
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ TriggeredCard
SVar:SacMe:2
SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_loop.jpg
Oracle:Enchant creature you control\nWhenever enchanted creature deals damage, you gain that much life.\nWhen Spirit Loop is put into a graveyard from the battlefield, return Spirit Loop to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/s/spiritualize.txt b/forge-gui/res/cardsfolder/s/spiritualize.txt
index d463cd40aac..4d5d834d95e 100644
--- a/forge-gui/res/cardsfolder/s/spiritualize.txt
+++ b/forge-gui/res/cardsfolder/s/spiritualize.txt
@@ -1,9 +1,8 @@
Name:Spiritualize
ManaCost:2 W
Types:Instant
-A:SP$ Effect | Cost$ 2 W | Name$ Spiritualize Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature | Triggers$ TrigDamage,TrigDamageCombat | SVars$ TrigGainLife,X | References$ TrigGainLife,X | RememberObjects$ Targeted | SubAbility$ DBDraw | SpellDescription$ Until end of turn, whenever target creature deals damage, you gain that much life. Draw a card.
-SVar:TrigDamage:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Creature.IsRemembered | Execute$ TrigGainLife | TriggerDescription$ Whenever the targeted creature of Spiritualize deals damage, you gain that much life.
-SVar:TrigDamageCombat:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Creature.IsRemembered | Execute$ TrigGainLife | TriggerDescription$ Whenever the targeted creature of Spiritualize deals damage, you gain that much life.
+A:SP$ Effect | Cost$ 2 W | Name$ Spiritualize Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature | Triggers$ TrigDamage | SVars$ TrigGainLife,X | References$ TrigGainLife,X | RememberObjects$ Targeted | SubAbility$ DBDraw | SpellDescription$ Until end of turn, whenever target creature deals damage, you gain that much life. Draw a card.
+SVar:TrigDamage:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Creature.IsRemembered | Execute$ TrigGainLife | TriggerDescription$ Whenever the targeted creature of Spiritualize deals damage, you gain that much life.
SVar:TrigGainLife:DB$ GainLife | LifeAmount$ X | References$ X | Defined$ You
SVar:DBDraw:DB$ Draw | NumCards$ 1
SVar:X:TriggerCount$DamageAmount
diff --git a/forge-gui/res/cardsfolder/s/spiteful_shadows.txt b/forge-gui/res/cardsfolder/s/spiteful_shadows.txt
index 116804c16ea..e57f45b0899 100644
--- a/forge-gui/res/cardsfolder/s/spiteful_shadows.txt
+++ b/forge-gui/res/cardsfolder/s/spiteful_shadows.txt
@@ -3,8 +3,7 @@ ManaCost:1 B
Types:Enchantment Aura
K:Enchant creature
A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Curse
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever enchanted creature is dealt damage, it deals that much damage to its controller.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever enchanted creature is dealt damage, it deals that much damage to its controller.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever enchanted creature is dealt damage, it deals that much damage to its controller.
SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredTargetController | NumDmg$ X | References$ X | DamageSource$ TriggeredTarget
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/spiteful_shadows.jpg
diff --git a/forge-gui/res/cardsfolder/s/spitemare.txt b/forge-gui/res/cardsfolder/s/spitemare.txt
index d9b2aa90406..84aed49f0b7 100644
--- a/forge-gui/res/cardsfolder/s/spitemare.txt
+++ b/forge-gui/res/cardsfolder/s/spitemare.txt
@@ -2,8 +2,7 @@ Name:Spitemare
ManaCost:2 RW RW
Types:Creature Elemental
PT:3/3
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to target creature or player.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to target creature or player.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to target creature or player.
SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | References$ X | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/s/sprouting_phytohydra.txt b/forge-gui/res/cardsfolder/s/sprouting_phytohydra.txt
index 20478e135de..0d75b420114 100644
--- a/forge-gui/res/cardsfolder/s/sprouting_phytohydra.txt
+++ b/forge-gui/res/cardsfolder/s/sprouting_phytohydra.txt
@@ -3,8 +3,7 @@ ManaCost:4 G
Types:Creature Plant Hydra
PT:0/2
K:Defender
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME is dealt damage, you may create a token that's a copy of Sprouting CARDNAME.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME is dealt damage, you may create a token that's a copy of Sprouting CARDNAME.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME is dealt damage, you may create a token that's a copy of Sprouting CARDNAME.
SVar:TrigCopy:DB$ CopyPermanent | Defined$ Self
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/sprouting_phytohydra.jpg
diff --git a/forge-gui/res/cardsfolder/s/stir_the_pride.txt b/forge-gui/res/cardsfolder/s/stir_the_pride.txt
index 3c2ca0debb0..388ebb1ed7d 100644
--- a/forge-gui/res/cardsfolder/s/stir_the_pride.txt
+++ b/forge-gui/res/cardsfolder/s/stir_the_pride.txt
@@ -4,9 +4,8 @@ Types:Instant
K:Entwine:1 W
A:SP$ Charm | Cost$ 4 W | Choices$ DBPumpAll,DBAnimateAll | CharmNum$ 1
SVar:DBPumpAll:DB$ PumpAll | NumAtt$ 2 | NumDef$ 2 | ValidCards$ Creature.YouCtrl | SpellDescription$ Creatures you control get +2/+2 until end of turn.
-SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.YouCtrl | Triggers$ TrigPrideDamage,TrigPrideDamageCombat | sVars$ GainLife,GainLifeX | References$ GainLife,GainLifeX | SpellDescription$ Until end of turn, creatures you control gain "Whenever this creature deals damage, you gain that much life."
-SVar:TrigPrideDamage:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ GainLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-SVar:TrigPrideDamageCombat:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ GainLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.YouCtrl | Triggers$ TrigPrideDamage | sVars$ GainLife,GainLifeX | References$ GainLife,GainLifeX | SpellDescription$ Until end of turn, creatures you control gain "Whenever this creature deals damage, you gain that much life."
+SVar:TrigPrideDamage:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ GainLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
SVar:GainLife:DB$ GainLife | LifeAmount$ GainLifeX | References$ GainLifeX
SVar:GainLifeX:TriggerCount$DamageAmount
SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/s/stuffy_doll.txt b/forge-gui/res/cardsfolder/s/stuffy_doll.txt
index 71f33f4c55c..6663ba76965 100644
--- a/forge-gui/res/cardsfolder/s/stuffy_doll.txt
+++ b/forge-gui/res/cardsfolder/s/stuffy_doll.txt
@@ -6,8 +6,7 @@ K:Indestructible
K:ETBReplacement:Other:ChooseP
SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player | AILogic$ Curse | SpellDescription$ As CARDNAME enters the battlefield, choose a player.
A:AB$ DealDamage | Cost$ T | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to itself.
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to the chosen player.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to the chosen player.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to the chosen player.
SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | References$ X | Defined$ ChosenPlayer
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/s/sun_droplet.txt b/forge-gui/res/cardsfolder/s/sun_droplet.txt
index 16d22a9e702..891e93aba1e 100644
--- a/forge-gui/res/cardsfolder/s/sun_droplet.txt
+++ b/forge-gui/res/cardsfolder/s/sun_droplet.txt
@@ -1,8 +1,7 @@
Name:Sun Droplet
ManaCost:2
Types:Artifact
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you're dealt damage, put that many charge counters on CARDNAME.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you're dealt damage, put that many charge counters on CARDNAME.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you're dealt damage, put that many charge counters on CARDNAME.
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | IsPresent$ Card.Self+counters_GE1_CHARGE | Execute$ TrigGainLife | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of each upkeep, you may remove a charge counter from CARDNAME. If you do, you gain 1 life.
SVar:TrigPutCounter:DB$ PutCounter | CounterType$ CHARGE | CounterNum$ X | References$ X | Defined$ Self
SVar:TrigGainLife:AB$ GainLife | Cost$ SubCounter<1/CHARGE> | LifeAmount$ 1 | Defined$ You
diff --git a/forge-gui/res/cardsfolder/t/tamanoa.txt b/forge-gui/res/cardsfolder/t/tamanoa.txt
index 401ef4f8c05..fe1083bf5d3 100644
--- a/forge-gui/res/cardsfolder/t/tamanoa.txt
+++ b/forge-gui/res/cardsfolder/t/tamanoa.txt
@@ -2,8 +2,7 @@ Name:Tamanoa
ManaCost:R G W
Types:Creature Spirit
PT:2/4
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.nonCreature+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a noncreature source you control deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.nonCreature+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a noncreature source you control deals damage, you gain that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.nonCreature+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a noncreature source you control deals damage, you gain that much life.
SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
Svar:Rarity:Rare
diff --git a/forge-gui/res/cardsfolder/t/thrashing_mudspawn.txt b/forge-gui/res/cardsfolder/t/thrashing_mudspawn.txt
index e82c09945bd..53ed4d8f6eb 100644
--- a/forge-gui/res/cardsfolder/t/thrashing_mudspawn.txt
+++ b/forge-gui/res/cardsfolder/t/thrashing_mudspawn.txt
@@ -2,8 +2,7 @@ Name:Thrashing Mudspawn
ManaCost:3 B B
Types:Creature Beast
PT:4/4
-T:Mode$ DamageDone | CombatDamage$ False | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you lose that much life.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you lose that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you lose that much life.
SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
K:Morph:1 B B
diff --git a/forge-gui/res/cardsfolder/upcoming/bellowing_aegisaur.txt b/forge-gui/res/cardsfolder/upcoming/bellowing_aegisaur.txt
index 1293e44c311..59819b77413 100644
--- a/forge-gui/res/cardsfolder/upcoming/bellowing_aegisaur.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bellowing_aegisaur.txt
@@ -2,8 +2,7 @@ Name:Bellowing Aegisaur
ManaCost:5 W
Types:Creature Dinosaur
PT:3/5
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ PutCounterAll | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, put a +1/+1 counter on each other creature you control.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ PutCounterAll | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, put a +1/+1 counter on each other creature you control.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ PutCounterAll | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, put a +1/+1 counter on each other creature you control.
SVar:PutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.Other+YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each other creature you control.
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/bellowing_aegisaur.jpg
diff --git a/forge-gui/res/cardsfolder/upcoming/ranging_raptors.txt b/forge-gui/res/cardsfolder/upcoming/ranging_raptors.txt
index 529d5a52282..23d26619eb5 100644
--- a/forge-gui/res/cardsfolder/upcoming/ranging_raptors.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ranging_raptors.txt
@@ -2,8 +2,7 @@ Name:Ranging Raptors
ManaCost:2 G
Types:Creature Dinosaur
PT:2/3
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigSearchLand | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, you may search your library for a basic land card, put it onto the battlefield, then shuffle your library.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigSearchLand | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, you may search your library for a basic land card, put it onto the battlefield, then shuffle your library.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigSearchLand | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, you may search your library for a basic land card, put it onto the battlefield, then shuffle your library.
SVar:TrigSearchLand:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ TrueS
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/ranging_raptors.jpg
diff --git a/forge-gui/res/cardsfolder/upcoming/raptor_hatchling.txt b/forge-gui/res/cardsfolder/upcoming/raptor_hatchling.txt
index 4f60f39d4c7..ea8768d4f20 100644
--- a/forge-gui/res/cardsfolder/upcoming/raptor_hatchling.txt
+++ b/forge-gui/res/cardsfolder/upcoming/raptor_hatchling.txt
@@ -2,8 +2,7 @@ Name:Raptor Hatchling
ManaCost:1 R
Types:Creature Dinosaur
PT:1/1
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever Raptor Hatchling is dealt damage, create a 3/3 green Dinosaur creature token with trample.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever Raptor Hatchling is dealt damage, create a 3/3 green Dinosaur creature token with trample.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever Raptor Hatchling is dealt damage, create a 3/3 green Dinosaur creature token with trample.
SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenName$ Dinosaur | TokenColors$ Green | TokenTypes$ Creature,Dinosaur | TokenPower$ 3 | TokenToughness$ 3 | TokenKeywords$ Trample | TokenImage$ g 3 3 dinosaur | TokenAmount$ 1
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/raptor_hatchling.jpg
diff --git a/forge-gui/res/cardsfolder/upcoming/ravenous_daggertooth.txt b/forge-gui/res/cardsfolder/upcoming/ravenous_daggertooth.txt
index b38b7a4ab50..b069a090a6c 100644
--- a/forge-gui/res/cardsfolder/upcoming/ravenous_daggertooth.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ravenous_daggertooth.txt
@@ -2,8 +2,7 @@ Name:Ravenous Daggertooth
ManaCost:2 G
Types:Creature Dinosaur
PT:3/2
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigGainLife | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, you gain 2 life.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigGainLife | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, you gain 2 life.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigGainLife | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, you gain 2 life.
SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 2
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/ravenous_daggertooth.jpg
diff --git a/forge-gui/res/cardsfolder/upcoming/ripjaw_raptor.txt b/forge-gui/res/cardsfolder/upcoming/ripjaw_raptor.txt
index 6e363da7d4e..e43241da19d 100644
--- a/forge-gui/res/cardsfolder/upcoming/ripjaw_raptor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ripjaw_raptor.txt
@@ -2,8 +2,7 @@ Name:Ripjaw Raptor
ManaCost:2 G G
Types:Creature Dinosaur
PT:4/5
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigDraw | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, draw a card.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigDraw | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, draw a card.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigDraw | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, draw a card.
SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/ripjaw_raptor.jpg
diff --git a/forge-gui/res/cardsfolder/upcoming/sun_crowned_hunters.txt b/forge-gui/res/cardsfolder/upcoming/sun_crowned_hunters.txt
index f8eb6ed33f8..93d948b70a6 100644
--- a/forge-gui/res/cardsfolder/upcoming/sun_crowned_hunters.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sun_crowned_hunters.txt
@@ -2,8 +2,7 @@ Name:Sun-Crowned Hunters
ManaCost:4 R R
Types:Creature Dinosaur
PT:5/4
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ DealDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, it deals 3 damage to target opponent.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ DealDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, it deals 3 damage to target opponent.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ DealDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, it deals 3 damage to target opponent.
SVar:DealDamage:DB$ DealDamage | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ 3
SVar:HasCombatEffect:TRUE
SVar:Picture:http://mythicspoiler.com/ixa/cards/suncrownedhunters.jpg
diff --git a/forge-gui/res/cardsfolder/v/vampiric_link.txt b/forge-gui/res/cardsfolder/v/vampiric_link.txt
index 9659efc1be7..8fa0806b992 100644
--- a/forge-gui/res/cardsfolder/v/vampiric_link.txt
+++ b/forge-gui/res/cardsfolder/v/vampiric_link.txt
@@ -3,9 +3,8 @@ ManaCost:B
Types:Enchantment Aura
K:Enchant creature
A:SP$ Attach | Cost$ B | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
-SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.AttachedBy | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, you gain that much life.
+SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/vampiric_link.jpg
Oracle:Enchant creature\nWhenever enchanted creature deals damage, you gain that much life.
diff --git a/forge-gui/res/cardsfolder/v/vigorous_charge.txt b/forge-gui/res/cardsfolder/v/vigorous_charge.txt
index 706ded03221..167782f89d4 100644
--- a/forge-gui/res/cardsfolder/v/vigorous_charge.txt
+++ b/forge-gui/res/cardsfolder/v/vigorous_charge.txt
@@ -5,7 +5,7 @@ K:Kicker:W
A:SP$ Pump | Cost$ G | ValidTgts$ Creature | KW$ Trample | SubAbility$ VigorousPumping | SpellDescription$ Target creature gains trample until end of turn. Whenever that creature deals combat damage this turn, if CARDNAME was kicked, you gain life equal to that damage.
SVar:VigorousPumping:DB$ Effect | TgtPrompt$ Select target creature | Triggers$ TrigDamage,EndTrackingEffect | SVars$ VigorousLife,X,ExileEffect | RememberObjects$ Targeted | Condition$ Kicked | ConditionDescription$ If Vigorous Charge was kicked,
SVar:TrigDamage:Mode$ DealtCombatDamageOnce | ValidSource$ Creature.IsRemembered | Execute$ VigorousLife | TriggerDescription$ Whenever the targeted creature deals combat damage this turn, you gain life equal to that damage.
-SVar:VigorousLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+SVar:VigorousLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:EndTrackingEffect:Mode$ ChangesZone | ValidCard$ Card.IsRemembered | Origin$ Battlefield | Destination$ Any | Execute$ ExileEffect | Static$ True
SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
diff --git a/forge-gui/res/cardsfolder/v/visions_of_brutality.txt b/forge-gui/res/cardsfolder/v/visions_of_brutality.txt
index 4010ca11e1c..118a06e6e01 100644
--- a/forge-gui/res/cardsfolder/v/visions_of_brutality.txt
+++ b/forge-gui/res/cardsfolder/v/visions_of_brutality.txt
@@ -5,9 +5,8 @@ K:Devoid
K:Enchant creature
A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Curse
S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't block. | Description$ Enchanted creature can't block.
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.AttachedBy | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, its controller loses that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.AttachedBy | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, its controller loses that much life.
-SVar:TrigLoseLife:AB$ LoseLife | Cost$ 0 | Defined$ TriggeredSourceController | LifeAmount$ X | References$ X
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.AttachedBy | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature deals damage, its controller loses that much life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredSourceController | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:Picture:http://www.wizards.com/global/images/magic/general/visions_of_brutality.jpg
Oracle:Devoid (This card has no color.)\nEnchant creature\nEnchanted creature can't block.\nWhenever enchanted creature deals damage, its controller loses that much life.
diff --git a/forge-gui/res/cardsfolder/v/volatile_rig.txt b/forge-gui/res/cardsfolder/v/volatile_rig.txt
index af64c8188fa..a9be9b1b0e8 100644
--- a/forge-gui/res/cardsfolder/v/volatile_rig.txt
+++ b/forge-gui/res/cardsfolder/v/volatile_rig.txt
@@ -4,8 +4,7 @@ Types:Artifact Creature Construct
PT:4/4
K:Trample
K:CARDNAME attacks each turn if able.
-T:Mode$ DamageDone | CombatDamage$ False | Execute$ TrigFlipSac | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, flip a coin. If you lose the flip, sacrifice CARDNAME.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | Execute$ TrigFlipSac | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, flip a coin. If you lose the flip, sacrifice CARDNAME.
+T:Mode$ DamageDone | OnlyOnce$ True | Execute$ TrigFlipSac | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, flip a coin. If you lose the flip, sacrifice CARDNAME.
SVar:TrigFlipSac:DB$ FlipACoin | LoseSubAbility$ DBSacrifice
SVar:DBSacrifice:DB$ Sacrifice | Defined$ Self
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigFlipDamage | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, flip a coin. If you lose the flip, it deals 4 damage to each creature and each player.
diff --git a/forge-gui/res/cardsfolder/w/wall_of_hope.txt b/forge-gui/res/cardsfolder/w/wall_of_hope.txt
index f9c83d24e3a..9c7e3221e2d 100644
--- a/forge-gui/res/cardsfolder/w/wall_of_hope.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_hope.txt
@@ -3,8 +3,7 @@ ManaCost:W
Types:Creature Wall
PT:0/3
K:Defender
-T:Mode$ DamageDone | CombatDamage$ False | DamageSource$ Any | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you gain that much life.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | DamageSource$ Any | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you gain that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | DamageSource$ Any | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME is dealt damage, you gain that much life.
SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/w/wall_of_souls.txt b/forge-gui/res/cardsfolder/w/wall_of_souls.txt
index 734c06620f9..ceacf23b947 100644
--- a/forge-gui/res/cardsfolder/w/wall_of_souls.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_souls.txt
@@ -4,7 +4,7 @@ Types:Creature Wall
PT:0/4
K:Defender
T:Mode$ CombatDamageDoneOnce | ValidTarget$ Card.Self | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME is dealt combat damage, it deals that much damage to target opponent.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ X | References$ X
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_souls.jpg
diff --git a/forge-gui/res/cardsfolder/w/war_elemental.txt b/forge-gui/res/cardsfolder/w/war_elemental.txt
index 87824b7f343..c60d66c99d5 100644
--- a/forge-gui/res/cardsfolder/w/war_elemental.txt
+++ b/forge-gui/res/cardsfolder/w/war_elemental.txt
@@ -5,8 +5,7 @@ PT:1/1
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless an opponent was dealt damage this turn.
SVar:TrigSac:DB$ Sacrifice | Defined$ Self | ConditionCheckSVar$ WarElementalX | ConditionSVarCompare$ EQ0 | References$ WarElementalX
SVar:WarElementalX:Count$TotalOppDamageThisTurn
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent is dealt damage, put that many +1/+1 counters on CARDNAME.
-T:Mode$ CombatDamageDoneOnce | Secondary$ True | ValidSource$ Card | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent is dealt damage, put that many +1/+1 counters on CARDNAME.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent is dealt damage, put that many +1/+1 counters on CARDNAME.
SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ WarElementalY | References$ WarElementalY
SVar:WarElementalY:TriggerCount$DamageAmount
SVar:NeedsToPlayVar:WarElementalX GE1
diff --git a/forge-gui/res/cardsfolder/w/warrior_angel.txt b/forge-gui/res/cardsfolder/w/warrior_angel.txt
index 2df09395bb9..91d44ace2d1 100644
--- a/forge-gui/res/cardsfolder/w/warrior_angel.txt
+++ b/forge-gui/res/cardsfolder/w/warrior_angel.txt
@@ -3,8 +3,7 @@ ManaCost:4 W W
Types:Creature Angel Warrior
PT:3/4
K:Flying
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/z/zebra_unicorn.txt b/forge-gui/res/cardsfolder/z/zebra_unicorn.txt
index 34599d3238a..9466e1e3235 100644
--- a/forge-gui/res/cardsfolder/z/zebra_unicorn.txt
+++ b/forge-gui/res/cardsfolder/z/zebra_unicorn.txt
@@ -2,8 +2,7 @@ Name:Zebra Unicorn
ManaCost:2 G W
Types:Creature Unicorn
PT:2/2
-T:Mode$ DamageDone | CombatDamage$ False | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-T:Mode$ DealtCombatDamageOnce | Secondary$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
+T:Mode$ DamageDone | OnlyOnce$ True | ValidSource$ Card.Self | Execute$ TrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount
SVar:HasCombatEffect:TRUE