- Updated some scripts to avoid overwriting the original Svars

res/cardsfolder/a/apathy.txt

@@ -3,8 +3,8 @@ ManaCost:U
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | AddTrigger$ TrigUpkeep | AddSVar$ TrigUntap | Description$ Enchanted creature doesn't untap during its controller's untap step. At the beginning of the upkeep of enchanted creature's controller, that player may discard a card at random. If he or she does, untap that creature.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | AddTrigger$ TrigUpkeep | AddSVar$ ApathyUntap | Description$ Enchanted creature doesn't untap during its controller's untap step. At the beginning of the upkeep of enchanted creature's controller, that player may discard a card at random. If he or she does, untap that creature.
-SVar:TrigUpkeep:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigUntap | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of the upkeep of enchanted creature's controller, that player may discard a card at random. If he or she does, untap that creature.
+SVar:TrigUpkeep:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ ApathyUntap | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of the upkeep of enchanted creature's controller, that player may discard a card at random. If he or she does, untap that creature.
-SVar:TrigUntap:AB$ Untap | Cost$ Discard<1/Random> | Defined$ Self | SpellDescription$ Untap enchanted creature
+SVar:ApathyUntap:AB$ Untap | Cost$ Discard<1/Random> | Defined$ Self | SpellDescription$ Untap enchanted creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/apathy.jpg
 Oracle:Enchant creature\nEnchanted creature doesn't untap during its controller's untap step.\nAt the beginning of the upkeep of enchanted creature's controller, that player may discard a card at random. If he or she does, untap that creature.

res/cardsfolder/c/cloak_of_confusion.txt

@@ -3,10 +3,10 @@ ManaCost:1 B
 Types:Enchantment Aura
 K:Enchant creature you control
 A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ TrigPump | AddSVar$ Pump & DBDiscard | Description$ Whenever enchanted creature attacks and isn't blocked, you may have it assign no combat damage this turn. If you do, defending player discards a card at random.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ TrigPump | AddSVar$ CloakofConfusionPump & CloakofConfusionDiscard | Description$ Whenever enchanted creature attacks and isn't blocked, you may have it assign no combat damage this turn. If you do, defending player discards a card at random.
-SVar:TrigPump:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ Pump | OptionalDecider$ You | TriggerDescription$ Whenever enchanted creature attacks and isn't blocked, you may have it assign no combat damage this turn. If you do, defending player discards a card at random.
+SVar:TrigPump:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ CloakofConfusionPump | OptionalDecider$ You | TriggerDescription$ Whenever enchanted creature attacks and isn't blocked, you may have it assign no combat damage this turn. If you do, defending player discards a card at random.
-SVar:Pump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. | SubAbility$ DBDiscard
+SVar:CloakofConfusionPump:AB$ Pump | Cost$ 0 | Defined$ Self | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. | SubAbility$ CloakofConfusionDiscard
-SVar:DBDiscard:DB$ Discard | Defined$ DefendingPlayer | Mode$ Random | NumCards$ 1
+SVar:CloakofConfusionDiscard:DB$ Discard | Defined$ DefendingPlayer | Mode$ Random | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cloak_of_confusion.jpg
 Oracle:Enchant creature you control\nWhenever enchanted creature attacks and isn't blocked, you may have it assign no combat damage this turn. If you do, defending player discards a card at random.

res/cardsfolder/d/descendant_of_kiyomaro.txt

@@ -2,9 +2,9 @@ Name:Descendant of Kiyomaro
 ManaCost:1 W W
 Types:Creature Human Soldier
 PT:2/3
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 2 | AddTrigger$ TriggerGainLife | AddSVar$ TrigGainLife | CheckSVar$ X | SVarCompare$ GTY | Description$ As long as you have more cards in hand than each opponent, CARDNAME gets +1/+2 and has "Whenever this creature deals combat damage, you gain 3 life."
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 2 | AddTrigger$ TriggerGainLife | AddSVar$ KiyomaroGainLife | CheckSVar$ X | SVarCompare$ GTY | Description$ As long as you have more cards in hand than each opponent, CARDNAME gets +1/+2 and has "Whenever this creature deals combat damage, you gain 3 life."
-SVar:TriggerGainLife:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ TrigGainLife | CombatDamage$ True | TriggerDescription$ Whenever this creature deals combat damage, you gain 3 life.
+SVar:TriggerGainLife:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ KiyomaroGainLife | CombatDamage$ True | TriggerDescription$ Whenever this creature deals combat damage, you gain 3 life.
-SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | LifeAmount$ 3
+SVar:KiyomaroGainLife:AB$ GainLife | Cost$ 0 | LifeAmount$ 3
 SVar:X:Count$InYourHand
 SVar:Y:PlayerCountOpponents$HighestCardsInHand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/descendant_of_kiyomaro.jpg

res/cardsfolder/d/disruption_aura.txt

@@ -3,9 +3,9 @@ ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant artifact
 A:SP$ Attach | Cost$ 2 U | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | AITgts$ Card.cmcGE1 | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Artifact.EnchantedBy | AddTrigger$ TrigPhase | AddSVar$ TrigPendrellFlux | Description$ Enchanted artifact has "At the beginning of your upkeep, sacrifice this artifact unless you pay its mana cost."
+S:Mode$ Continuous | Affected$ Artifact.EnchantedBy | AddTrigger$ TrigPhase | AddSVar$ TrigDisruptionAura | Description$ Enchanted artifact has "At the beginning of your upkeep, sacrifice this artifact unless you pay its mana cost."
-SVar:TrigPhase:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPendrellFlux | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, sacrifice this artifact unless you pay its mana cost.
+SVar:TrigPhase:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigDisruptionAura | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, sacrifice this artifact unless you pay its mana cost.
-SVar:TrigPendrellFlux:DB$ Sacrifice | Defined$ Self | UnlessCost$ CardManaCost | UnlessPayer$ You
+SVar:TrigDisruptionAura:DB$ Sacrifice | Defined$ Self | UnlessCost$ CardManaCost | UnlessPayer$ You
 SVar:NonStackingAttachEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/disruption_aura.jpg
 Oracle:Enchant artifact\nEnchanted artifact has "At the beginning of your upkeep, sacrifice this artifact unless you pay its mana cost."

res/cardsfolder/f/farmstead.txt

@@ -3,8 +3,8 @@ ManaCost:W W W
 Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ W W W | ValidTgts$ Land | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddTrigger$ TriggerGainLife | AddSVar$ TrigGainLife | Description$ Enchanted land has "At the beginning of your upkeep, you may pay W W. If you do, you gain 1 life."
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddTrigger$ TriggerGainLife | AddSVar$ FarmsteadGainLife | Description$ Enchanted land has "At the beginning of your upkeep, you may pay W W. If you do, you gain 1 life."
-SVar:TriggerGainLife:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigGainLife | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Enchanted land has "At the beginning of your upkeep, you may pay W W. If you do, you gain 1 life."
+SVar:TriggerGainLife:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ FarmsteadGainLife | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Enchanted land has "At the beginning of your upkeep, you may pay W W. If you do, you gain 1 life."
-SVar:TrigGainLife:AB$GainLife | Cost$ W W | Defined$ You | LifeAmount$ 1
+SVar:FarmsteadGainLife:AB$GainLife | Cost$ W W | Defined$ You | LifeAmount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/farmstead.jpg
 Oracle:Enchant land\nEnchanted land has "At the beginning of your upkeep, you may pay {W}{W}. If you do, you gain 1 life."

res/cardsfolder/f/fungus_sliver.txt

@@ -2,9 +2,9 @@ Name:Fungus Sliver
 ManaCost:3 G
 Types:Creature Fungus Sliver
 PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Sliver | AddTrigger$ OnDmg | AddSVar$ TrigPutCounter | 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.)
+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 | ValidTarget$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME is dealt damage, put a +1/+1 counter on it.
+SVar:OnDmg:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ FungusSliverCounters | TriggerDescription$ Whenever CARDNAME is dealt damage, put a +1/+1 counter on it.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:FungusSliverCounters:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:PlayMain1:TRUE
 SVar:HasCombatEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fungus_sliver.jpg

res/cardsfolder/p/plague_sliver.txt

@@ -2,8 +2,8 @@ Name:Plague Sliver
 ManaCost:2 B B
 Types:Creature Sliver
 PT:5/5
-S:Mode$ Continuous | Affected$ Sliver | AddTrigger$ TrigPhase | AddSVar$ TrigDamage | Description$ All Slivers have "At the beginning of your upkeep, this permanent deals 1 damage to you."
+S:Mode$ Continuous | Affected$ Sliver | AddTrigger$ TrigPhase | AddSVar$ PlagueTrigDamage | Description$ All Slivers have "At the beginning of your upkeep, this permanent deals 1 damage to you."
-SVar:TrigPhase:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, this permanent deals 1 damage to you.
+SVar:TrigPhase:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ PlagueTrigDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, this permanent deals 1 damage to you.
-SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | NumDmg$ 1 | Defined$ You
+SVar:PlagueTrigDamage:AB$ DealDamage | Cost$ 0 | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/plague_sliver.jpg
 Oracle:All Slivers have "At the beginning of your upkeep, this permanent deals 1 damage to you."