diff --git a/forge-gui/res/cardsfolder/d/draconic_roar.txt b/forge-gui/res/cardsfolder/d/draconic_roar.txt
index dea4a6bf20c..bd11ee66645 100644
--- a/forge-gui/res/cardsfolder/d/draconic_roar.txt
+++ b/forge-gui/res/cardsfolder/d/draconic_roar.txt
@@ -4,8 +4,11 @@ Types:Instant
 Text:As an additional cost to cast Draconic Roar, you may reveal a Dragon card from your hand.\n
 K:Kicker Reveal<1/Dragon> : Generic
 A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SubAbility$ DBDamageController | SpellDescription$ CARDNAME deals 3 damage to target creature. If you revealed a Dragon card or controlled a Dragon as you cast CARDNAME, CARDNAME deals 3 damage to that creature's controller. | StackDescription$ SpellDescription
-SVar:DBDamageController:DB$ DealDamage | Defined$ TargetedController | NumDmg$ 3 | ConditionDragonPresence$ True | StackDescription$ None
+SVar:DBDamageController:DB$ DealDamage | Defined$ TargetedController | NumDmg$ 3 | ConditionCheckSVar$ TotalDragonPresence | ConditionSVarCompare$ GE1 | StackDescription$ None
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ StoreDragons | Static$ True
+SVar:DragonPresence:Number$0
+SVar:WasDragonRevealed:Count$ValidStack Card.Self+pseudokicked+wasCast
+SVar:TotalDragonPresence:SVar$DragonPresence/Plus.WasDragonRevealed
 SVar:StoreDragons:DB$ StoreSVar | SVar$ DragonPresence | Type$ Number | Expression$ 1 | ConditionPresent$ Dragon.YouCtrl | SubAbility$ StoreNoDragons
 SVar:StoreNoDragons:DB$ StoreSVar | SVar$ DragonPresence | Type$ Number | Expression$ 0 | ConditionPresent$ Dragon.YouCtrl | ConditionCompare$ EQ0
 SVar:Picture:http://www.wizards.com/global/images/magic/general/draconic_roar.jpg
diff --git a/forge-gui/res/cardsfolder/f/foul_tongue_invocation.txt b/forge-gui/res/cardsfolder/f/foul_tongue_invocation.txt
index 47739cf5ceb..e5cecfb4cf1 100644
--- a/forge-gui/res/cardsfolder/f/foul_tongue_invocation.txt
+++ b/forge-gui/res/cardsfolder/f/foul_tongue_invocation.txt
@@ -4,8 +4,11 @@ Types:Instant
 Text:As an additional cost to cast Foul-Tongue Invocation, you may reveal a Dragon card from your hand.\n
 K:Kicker Reveal<1/Dragon> : Generic
 A:SP$ Sacrifice | Cost$ 2 B | ValidTgts$ Player | SacValid$ Creature | SacMessage$ Creature | SubAbility$ DBGainLife | SpellDescription$ Target player sacrifices a creature. If you revealed a Dragon card or controlled a Dragon as you cast CARDNAME, you gain 4 life. | StackDescription$ SpellDescription
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4 | ConditionDragonPresence$ True
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4 | ConditionCheckSVar$ TotalDragonPresence | ConditionSVarCompare$ GE1
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ StoreDragons | Static$ True
+SVar:DragonPresence:Number$0
+SVar:WasDragonRevealed:Count$ValidStack Card.Self+pseudokicked+wasCast
+SVar:TotalDragonPresence:SVar$DragonPresence/Plus.WasDragonRevealed
 SVar:StoreDragons:DB$ StoreSVar | SVar$ DragonPresence | Type$ Number | Expression$ 1 | ConditionPresent$ Dragon.YouCtrl | SubAbility$ StoreNoDragons
 SVar:StoreNoDragons:DB$ StoreSVar | SVar$ DragonPresence | Type$ Number | Expression$ 0 | ConditionPresent$ Dragon.YouCtrl | ConditionCompare$ EQ0
 SVar:Picture:http://www.wizards.com/global/images/magic/general/foul_tongue_invocation.jpg
diff --git a/forge-gui/res/cardsfolder/s/scaleguard_sentinels.txt b/forge-gui/res/cardsfolder/s/scaleguard_sentinels.txt
index 90f225c07ce..26f4ebc4631 100644
--- a/forge-gui/res/cardsfolder/s/scaleguard_sentinels.txt
+++ b/forge-gui/res/cardsfolder/s/scaleguard_sentinels.txt
@@ -4,10 +4,10 @@ Types:Creature Human Soldier
 PT:2/3
 Text:As an additional cost to cast Scaleguard Sentinels, you may reveal a Dragon card from your hand.
 K:Kicker Reveal<1/Dragon> : Generic
-K:etbCounter:P1P1:1:CheckSVar$ X:CARDNAME enters the battlefield with a +1/+1 counter on it if you revealed a Dragon card or controlled a Dragon as you cast CARDNAME.
+K:etbCounter:P1P1:1:CheckSVar$ TotalDragonPresence:CARDNAME enters the battlefield with a +1/+1 counter on it if you revealed a Dragon card or controlled a Dragon as you cast CARDNAME.
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ StoreDragons | Static$ True
-SVar:Y:Count$ValidStack Permanent.Self+pseudokicked+wasCast
-SVar:X:SVar$DragonPresence/Plus.Y
+SVar:WasDragonRevealed:Count$ValidStack Permanent.Self+pseudokicked+wasCast
+SVar:TotalDragonPresence:SVar$DragonPresence/Plus.WasDragonRevealed
 SVar:DragonPresence:Number$0
 SVar:StoreDragons:DB$ StoreSVar | SVar$ DragonPresence | Type$ Number | Expression$ 1 | ConditionPresent$ Dragon.YouCtrl | SubAbility$ StoreNoDragons
 SVar:StoreNoDragons:DB$ StoreSVar | SVar$ DragonPresence | Type$ Number | Expression$ 0 | ConditionPresent$ Dragon.YouCtrl | ConditionCompare$ EQ0
diff --git a/forge-gui/res/cardsfolder/s/silumgars_scorn.txt b/forge-gui/res/cardsfolder/s/silumgars_scorn.txt
index f033c03ea1c..b7d615c2032 100644
--- a/forge-gui/res/cardsfolder/s/silumgars_scorn.txt
+++ b/forge-gui/res/cardsfolder/s/silumgars_scorn.txt
@@ -3,10 +3,10 @@ ManaCost:U U
 Types:Instant
 K:Kicker Reveal<1/Dragon> : Generic
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ StoreDragons | Static$ True
-A:SP$ Counter | Cost$ U U | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Select target spell | UnlessCost$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | StackDescription$ SpellDescription | SubAbility$ DBCounter | SpellDescription$ Counter target spell unless its controller pays {1}. If you revealed a Dragon card or controlled a Dragon as you cast CARDNAME, counter that spell instead.
-SVar:DBCounter:DB$ Counter | Defined$ Targeted | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | StackDescription$ None
-SVar:Y:Count$ValidStack Card.Self+pseudokicked+wasCast
-SVar:X:SVar$DragonPresence/Plus.Y
+A:SP$ Counter | Cost$ U U | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Select target spell | UnlessCost$ 1 | ConditionCheckSVar$ TotalDragonPresence | ConditionSVarCompare$ EQ0 | StackDescription$ SpellDescription | SubAbility$ DBCounter | SpellDescription$ Counter target spell unless its controller pays {1}. If you revealed a Dragon card or controlled a Dragon as you cast CARDNAME, counter that spell instead.
+SVar:DBCounter:DB$ Counter | Defined$ Targeted | ConditionCheckSVar$ TotalDragonPresence | ConditionSVarCompare$ GE1 | StackDescription$ None
+SVar:WasDragonRevealed:Count$ValidStack Card.Self+pseudokicked+wasCast
+SVar:TotalDragonPresence:SVar$DragonPresence/Plus.WasDragonRevealed
 SVar:DragonPresence:Number$0
 SVar:StoreDragons:DB$ StoreSVar | SVar$ DragonPresence | Type$ Number | Expression$ 1 | ConditionPresent$ Dragon.YouCtrl | SubAbility$ StoreNoDragons
 SVar:StoreNoDragons:DB$ StoreSVar | SVar$ DragonPresence | Type$ Number | Expression$ 0 | ConditionPresent$ Dragon.YouCtrl | ConditionCompare$ EQ0