- Reorganized Conditions of static abilities (WIP).

res/cardsfolder/a/angry_mob.txt

@@ -4,9 +4,9 @@ Types:Creature Human
 Text:no text
 PT:2+*/2+*
 K:Trample
-S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | PlayerTurn$ True | Description$ As long as it's your turn, CARDNAME's power and toughness are each equal to 2 plus the number of Swamps your opponents control. As long as it's not your turn, CARDNAME's power and toughness are each 2.
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME's power and toughness are each equal to 2 plus the number of Swamps your opponents control. As long as it's not your turn, CARDNAME's power and toughness are each 2.
 SVar:X:Count$Valid Swamp.OppCtrl/Plus.2
-S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ 2 | SetToughness$ 2 | OpponentTurn$ True
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ 2 | SetToughness$ 2 | Condition$ NotPlayerTurn
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/angry_mob.jpg

res/cardsfolder/a/ashen_ghoul.txt

@@ -4,7 +4,7 @@ Types:Creature Zombie
 Text:no text
 PT:3/1
 K:Haste
-A:AB$ChangeZone | Cost$ B | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | ActivationPhases$ Upkeep | PlayerTurn$ True | IsPresent$ Creature.YouOwn+Above | PresentZone$ Graveyard | PresentCompare$ GE3 | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate this ability only during your upkeep and only if three or more creature cards are above CARDNAME.
+A:AB$ ChangeZone | Cost$ B | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | ActivationPhases$ Upkeep | PlayerTurn$ True | IsPresent$ Creature.YouOwn+Above | PresentZone$ Graveyard | PresentCompare$ GE3 | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate this ability only during your upkeep and only if three or more creature cards are above CARDNAME.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ashen_ghoul.jpg
 SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/2.jpg

res/cardsfolder/b/blood_speaker.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:3/2
 A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Demon | ChangeNum$ 1 | ActivationZone$ Battlefield | ActivationPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ At the beginning of your upkeep, you may sacrifice CARDNAME. If you do, search your library for a Demon card, reveal that card, and put it into your hand. Then shuffle your library.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Demon.YouCtrl | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever a Demon enters the battlefield under your control, you may return CARDNAME from your graveyard to your Hand.
-SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Hand
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_speaker.jpg
 SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/103.jpg

res/cardsfolder/c/city_of_solitude.txt

@@ -2,10 +2,10 @@ Name:City of Solitude
 ManaCost:2 G
 Types:Enchantment
 Text:no text
-S:Mode$ CantBeCast | ValidCard$ Card | PlayerTurn$ True | Caster$ Opponent | Description$ Players can cast spells and activate abilities only during their own turns.
+S:Mode$ CantBeCast | ValidCard$ Card | Condition$ PlayerTurn | Caster$ Opponent | Description$ Players can cast spells and activate abilities only during their own turns.
-S:Mode$ CantBeCast | ValidCard$ Card | OpponentTurn$ True | Caster$ You
+S:Mode$ CantBeCast | ValidCard$ Card | Condition$ NotPlayerTurn | Caster$ You
-S:Mode$ CantBeActivated | ValidCard$ Card | PlayerTurn$ True | Activator$ Opponent
+S:Mode$ CantBeActivated | ValidCard$ Card | Condition$ PlayerTurn | Activator$ Opponent
-S:Mode$ CantBeActivated | ValidCard$ Card | OpponentTurn$ True | Activator$ You
+S:Mode$ CantBeActivated | ValidCard$ Card | Condition$ NotPlayerTurn | Activator$ You
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://wizards.com/global/images/magic/general/city_of_solitude.jpg

res/cardsfolder/d/defense_grid.txt

@@ -2,8 +2,8 @@ Name:Defense Grid
 ManaCost:2
 Types:Artifact
 Text:no text
-S:Mode$ RaiseCost | Activator$ You | Type$ Spell | Amount$ 3  | OpponentTurn$ True | Description$ Each spell costs 3 more to cast except during its controller's turn.
+S:Mode$ RaiseCost | Activator$ You | Type$ Spell | Amount$ 3  | Condition$ NotPlayerTurn | Description$ Each spell costs 3 more to cast except during its controller's turn.
-S:Mode$ RaiseCost | Activator$ Opponent | Type$ Spell | Amount$ 3 | PlayerTurn$ True 
+S:Mode$ RaiseCost | Activator$ Opponent | Type$ Spell | Amount$ 3 | Condition$ PlayerTurn
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/defense_grid.jpg

res/cardsfolder/d/delirium.txt

@@ -3,8 +3,8 @@ ManaCost:1 B R
 Types:Instant
 Text:no text
 A:SP$ Tap | Cost$ 1 B R | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | OpponentTurn$ True | SubAbility$ DBDamage | SpellDescription$ Cast CARDNAME only during an opponent's turn. Tap target creature that player controls. That creature deals damage equal to its power to the player. Prevent all combat damage that would be dealt to and dealt by the creature this turn.
-SVar:DBDamage:DB$DealDamage | Defined$ Opponent | NumDmg$ X | DamageSource$ Targeted | SubAbility$ DBPump | References$ X
+SVar:DBDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ X | DamageSource$ Targeted | SubAbility$ DBPump | References$ X
-SVar:DBPump:DB$Pump | Defined$ Targeted | KW$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME.
 SVar:X:Targeted$CardPower
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/delirium.jpg

res/cardsfolder/d/dosan_the_falling_leaf.txt

@@ -3,8 +3,8 @@ ManaCost:1 G G
 Types:Legendary Creature Human Monk
 Text:no text
 PT:2/2
-S:Mode$ CantBeCast | ValidCard$ Card | PlayerTurn$ True | Caster$ Opponent | Description$ Players can cast spells only during their own turns.
+S:Mode$ CantBeCast | ValidCard$ Card | Condition$ PlayerTurn | Caster$ Opponent | Description$ Players can cast spells only during their own turns.
-S:Mode$ CantBeCast | ValidCard$ Card | OpponentTurn$ True | Caster$ You
+S:Mode$ CantBeCast | ValidCard$ Card | Condition$ NotPlayerTurn | Caster$ You
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dosan_the_falling_leaf.jpg
 SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/205.jpg

res/cardsfolder/d/dreamspoiler_witches.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:2/2
 K:Flying
 T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OpponentTurn$ True | Execute$ TrigPump | OptionalDecider$ You | TriggerDescription$ Whenever you cast a spell during an opponent's turn, you may have target creature get -1/-1 until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True
+SVar:TrigPump:AB$ Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dreamspoiler_witches.jpg
 SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/108.jpg

res/cardsfolder/e/ebon_praetor.txt

@@ -6,9 +6,9 @@ PT:5/5
 K:First Strike
 K:Trample
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a -2/-2 counter on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ M2M2 | CounterNum$ 1 | SpellDescription$ Put a -2/-2 counter on CARDNAME.
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ M2M2 | CounterNum$ 1 | SpellDescription$ Put a -2/-2 counter on CARDNAME.
 A:AB$ RemoveCounter | Cost$ Sac<1/Creature> | CounterType$ M2M2 | CounterNum$ 1 | ActivationPhases$ Upkeep | PlayerTurn$ True | ActivationLimit$ 1 | SubAbility$ DBPutCounter | SpellDescription$ Remove a -2/-2 counter from CARDNAME. If the sacrificed creature was a Thrull, put a +1/+0 counter on CARDNAME. Activate this ability only during your upkeep and only once each turn.
-SVar:DBPutCounter:DB$PutCounter | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | CounterNum$ 1 | CounterType$ P1P0 | References$ X
+SVar:DBPutCounter:DB$ PutCounter | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | CounterNum$ 1 | CounterType$ P1P0 | References$ X
 SVar:X:Sacrificed$Valid Thrull
 SVar:RemAIDeck:True
 SVar:Rarity:Rare

res/cardsfolder/e/eyes_of_the_wisent.txt

@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Tribal Enchantment Elemental
 Text:no text
 T:Mode$ SpellCast | ValidCard$ Card.Blue | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | PlayerTurn$ True | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ Whenever an opponent casts a blue spell during your turn, you may put a 4/4 green Elemental creature token onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eyes_of_the_wisent.jpg

res/cardsfolder/f/faerie_tauntings.txt

@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Tribal Enchantment Faerie
 Text:no text
 T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OpponentTurn$ True | Execute$ TrigLoseLife | OptionalDecider$ You | TriggerDescription$ Whenever you cast a spell during an opponent's turn, you may have each opponent lose 1 life.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1
+SVar:TrigLoseLife:AB$ LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/faerie_tauntings.jpg
 SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/112.jpg

res/cardsfolder/f/firemane_angel.txt

@@ -7,7 +7,7 @@ K:Flying
 K:First Strike
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield,Graveyard | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard or on the battlefield, you may gain 1 life.
 A:AB$ ChangeZone | Cost$ 6 R R W W | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | PlayerTurn$ True | ActivationPhases$ Upkeep | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate this ability only during your upkeep.
-SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
+SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/firemane_angel.jpg
 SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/205.jpg

res/cardsfolder/f/forgotten_ancient.txt

@@ -4,7 +4,7 @@ Types:Creature Elemental
 Text:no text
 PT:0/3
 T:Mode$ SpellCast | ValidCard$ Card | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever a player casts a spell, you may put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ PutCounter | Cost$ SubCounter<1/P1P1> | ValidTgts$ Creature.Other | TgtPrompt$ Select target creature |  CounterType$ P1P1 | CounterNum$ 1 | PlayerTurn$ True | ActivationPhases$ Upkeep | SpellDescription$ At the beginning of your upkeep, you may move any number of +1/+1 counters from CARDNAME onto other creatures.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forgotten_ancient.jpg

res/cardsfolder/g/glen_elendra_pranksters.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:1/3
 K:Flying
 T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OpponentTurn$ True | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ Whenever you cast a spell during an opponent's turn, you may return target creature you control to its owner's hand.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Origin$ Battlefield | Destination$ Hand
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Origin$ Battlefield | Destination$ Hand
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glen_elendra_pranksters.jpg

res/cardsfolder/g/glory_of_warfare.txt

@@ -2,8 +2,8 @@ Name:Glory of Warfare
 ManaCost:2 R W
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 2 | PlayerTurn$ True | Description$ As long as it's your turn, creatures you control get +2/+0.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 2 | Condition$ PlayerTurn | Description$ As long as it's your turn, creatures you control get +2/+0.
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddToughness$ 2 | OpponentTurn$ True | Description$ As long as it's not your turn, creatures you control get +0/+2.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddToughness$ 2 | Condition$ NotPlayerTurn | Description$ As long as it's not your turn, creatures you control get +0/+2.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glory_of_warfare.jpg

res/cardsfolder/g/grand_abolisher.txt

@@ -3,8 +3,8 @@ ManaCost:W W
 Types:Creature Human Cleric
 Text:no text
 PT:2/2
-S:Mode$ CantBeCast | ValidCard$ Card | PlayerTurn$ True | Caster$ Opponent | Description$ During your turn, your opponents can't cast spells or activate abilities of artifacts, creatures, or enchantments.
+S:Mode$ CantBeCast | ValidCard$ Card | Condition$ PlayerTurn | Caster$ Opponent | Description$ During your turn, your opponents can't cast spells or activate abilities of artifacts, creatures, or enchantments.
-S:Mode$ CantBeActivated | ValidCard$ Artifact,Creature,Enchantment | PlayerTurn$ True | Activator$ Opponent 
+S:Mode$ CantBeActivated | ValidCard$ Artifact,Creature,Enchantment | Condition$ PlayerTurn | Activator$ Opponent 
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grand_abolisher.jpg
 SetInfo:M12|Rare|http://magiccards.info/scans/en/m12/19.jpg

res/cardsfolder/h/hoofprints_of_the_stag.txt

@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Tribal Enchantment Elemental
 Text:no text
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever you draw a card, you may put a hoofprint counter on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ HOOFPRINT | CounterNum$ 1
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ HOOFPRINT | CounterNum$ 1
 A:AB$ Token | Cost$ 2 W SubCounter<4/HOOFPRINT> | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | PlayerTurn$ True | SpellDescription$ Put a 4/4 white Elemental creature token with flying onto the battlefield. Activate this ability only during your turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hoofprints_of_the_stag.jpg

res/cardsfolder/j/jabaris_influence.txt

@@ -3,7 +3,7 @@ ManaCost:3 W W
 Types:Instant
 Text:no text
 A:SP$ GainControl | Cost$ 3 W W | ValidTgts$ Creature.nonBlack+nonArtifact+attackedThisTurn | TgtPrompt$Select target nonartifact, nonblack creature that attacked you this turn | OpponentTurn$ True | ActivationPhases$Main2->End of Turn | SubAbility$ DBPutCounter | SpellDescription$ Gain control of target nonartifact, nonblack creature that attacked you this turn and put a -1/-0 counter on it.
-SVar:DBPutCounter:DB$PutCounter | Defined$ Targeted | CounterType$ M1M0 | CounterNum$ 1
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ M1M0 | CounterNum$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jabaris_influence.jpg
 SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/228.jpg

res/cardsfolder/m/marjhan.txt

@@ -9,7 +9,7 @@ T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Island.YouCtrl | Present
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
 A:AB$ Untap | Cost$ U U Sac<1/Creature> | ActivationPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Untap CARDNAME. Activate this ability only during your upkeep.
 A:AB$ DealDamage | Cost$ U U | NumDmg$ 1 | ValidTgts$ Creature.attacking+withoutFlying | TgtPrompt$ Select target attacking creature without flying | SubAbility$ DBPump | SpellDescription$ CARDNAME gets -1/-0 until end of turn and deals 1 damage to target attacking creature without flying.
-SVar:DBPump:DB$Pump | NumAtt$ -1| Defined$ Self
+SVar:DBPump:DB$ Pump | NumAtt$ -1| Defined$ Self
 SVar:NeedsToPlay:Island.YouCtrl
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare

res/cardsfolder/m/mtenda_griffin.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:2/2
 K:Flying
 A:AB$ ChangeZone | Cost$ W T | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBBounce | ActivationPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return CARDNAME to its owner's hand and return target Griffin card from your graveyard to your hand. Activate this ability only during your upkeep.
-SVar:DBBounce:DB$ChangeZone | ValidTgts$ Griffin.YouCtrl | TgtPrompt$ Select target Griffin from your graveyard | Origin$ Graveyard | Destination$ Hand
+SVar:DBBounce:DB$ ChangeZone | ValidTgts$ Griffin.YouCtrl | TgtPrompt$ Select target Griffin from your graveyard | Origin$ Graveyard | Destination$ Hand
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mtenda_griffin.jpg
 SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/232.jpg

res/cardsfolder/n/nettling_imp.txt

@@ -5,8 +5,8 @@ Text:no text
 PT:1/1
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature.nonWall+ActivePlayerCtrl+notFirstTurnControlled | TgtPrompt$ Select target non-Wall creature the active player has controlled continuously since the beginning of the turn. | ActivationPhases$ Upkeep->BeginCombat | OpponentTurn$ True | KW$ HIDDEN CARDNAME attacks each turn if able. | RememberTargets$ True | SubAbility$ DestroyPacifist | SpellDescription$ Choose target non-Wall creature the active player has controlled continuously since the beginning of the turn. That creature attacks this turn if able. If it doesn't, destroy it at the beginning of the next end step. Activate this ability only before attackers are declared.
 SVar:DestroyPacifist:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigDestroy | IsPresent$ Creature.IsRemembered+notAttackedThisTurn | TriggerDescription$ At the beginning of the end step, destroy that creature if it didn't attack this turn.
-SVar:TrigDestroy:DB$Destroy | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:TrigDestroy:DB$ Destroy | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nettling_imp.jpg

res/cardsfolder/n/nim_devourer.txt

@@ -6,7 +6,7 @@ PT:4/1
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | References$ X | Description$ CARDNAME gets +1/+0 for each artifact you control.
 SVar:X:Count$Valid Artifact.YouCtrl
 A:AB$ ChangeZone | Cost$ B B | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | PlayerTurn$ True | ActivationPhases$ Upkeep | SubAbility$ DBSac  | SpellDescription$ Return CARDNAME from your graveyard to the battlefield, then sacrifice a creature. Activate this ability only during your upkeep.
-SVar:DBSac:DB$Sacrifice | Defined$ You | SacValid$ Creature
+SVar:DBSac:DB$ Sacrifice | Defined$ You | SacValid$ Creature
 SVar:BuffedBy:Artifact
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare

res/cardsfolder/o/oak_street_innkeeper.txt

@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Elf
 Text:no text
 PT:1/2
-S:Mode$ Continuous | Affected$ Creature.tapped+YouCtrl | AddKeyword$ Hexproof | OpponentTurn$ True | Description$ As long as it's not your turn, tapped creatures you control have hexproof.
+S:Mode$ Continuous | Affected$ Creature.tapped+YouCtrl | AddKeyword$ Hexproof | Condition$ NotPlayerTurn | Description$ As long as it's not your turn, tapped creatures you control have hexproof.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oak_street_innkeeper.jpg
 SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/131.jpg

res/cardsfolder/p/paladin_of_prahv.txt

@@ -4,7 +4,7 @@ Types:Creature Human Knight
 Text:no text
 PT:3/4
 T:Mode$ DamageDone | 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:TrigGain:AB$ GainLife | Cost$ 0 | 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.

res/cardsfolder/p/personal_sanctuary.txt

@@ -2,7 +2,7 @@ Name:Personal Sanctuary
 ManaCost:2 W
 Types:Enchantment
 Text:no text
-S:Mode$ PreventDamage | Target$ You | PlayerTurn$ True | Description$ During your turn, prevent all damage that would be dealt to you.
+S:Mode$ PreventDamage | Target$ You | Condition$ PlayerTurn | Description$ During your turn, prevent all damage that would be dealt to you.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/personal_sanctuary.jpg
 SetInfo:M12|Rare|http://magiccards.info/scans/en/m12/30.jpg

res/cardsfolder/r/remove.txt

@@ -3,7 +3,6 @@ ManaCost:U
 Types:Instant
 Text:no text
 A:SP$ ChangeZone | Cost$ U | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Hand | OpponentTurn$ True | ActivationPhases$ Declare Attackers - Play Instants and Abilities | SpellDescription$ Cast CARDNAME only during the declare attackers step and only if you've been attacked this step. Return target attacking creature to its owner's hand.
-SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/p2/en-us/card6541.jpg
 SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/43.jpg

res/cardsfolder/s/scorching_winds.txt

@@ -3,7 +3,6 @@ ManaCost:R
 Types:Instant
 Text:Cast CARDNAME only during the declare attackers step and only if you've been attacked this step.\r\n
 A:SP$ DamageAll | Cost$ R | NumDmg$ 1 | ValidCards$ Creature.attacking | ValidDescription$ each attacking creature. | OpponentTurn$ True | ActivationPhases$ Declare Attackers - Play Instants and Abilities | SpellDescription$ CARDNAME deals 1 damage to each attacking creature.
-SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://serv3.tcgimages.eu/img/cards/Portal/scorching_winds.jpg
 SetInfo:POR|Uncommon|http://magiccards.info/scans/en/po/155.jpg

res/cardsfolder/s/sirens_call.txt

@@ -5,8 +5,8 @@ Text:no text
 A:SP$ Effect | Cost$ U | Name$ Siren's Call Effect | StaticAbilities$ KWPump | ActivationPhases$ Upkeep->BeginCombat | OpponentTurn$ True | SpellDescription$ Cast CARDNAME only during an opponent's turn, before attackers are declared. Creatures the active player controls attack this turn if able. At the beginning of the next end step, destroy all non-Wall creatures that player controls that didn't attack this turn. Ignore this effect for each creature the player didn't control continuously since the beginning of the turn. | SubAbility$ DestroyPacifist
 SVar:KWPump:Mode$ Continuous | Affected$ Creature.ActivePlayerCtrl | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ Creatures the active player controls attack this turn if able. 
 SVar:DestroyPacifist:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigDestroy | TriggerDescription$ At the beginning of the next end step, destroy all non-Wall creatures that player controls that didn't attack this turn.
-SVar:TrigDestroy:DB$DestroyAll | ValidCards$ Creature.ActivePlayerCtrl+notAttackedThisTurn+nonWall+notFirstTurnControlled | SubAbility$ DBCleanup
+SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Creature.ActivePlayerCtrl+notAttackedThisTurn+nonWall+notFirstTurnControlled | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon

res/cardsfolder/s/sky_hussar.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:4/3
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUntapAll | TriggerDescription$ When CARDNAME enters the battlefield, untap all creatures you control.
-SVar:TrigUntapAll:AB$UntapAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | SpellDescription$ untap all creatures you control.
+SVar:TrigUntapAll:AB$ UntapAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | SpellDescription$ untap all creatures you control.
 A:AB$ Draw | Cost$ tapXType<2/Creature.White;Creature.Blue> | NumCards$ 1 | ActivationZone$ Hand | ActivationLimit$ 1 | PlayerTurn$ True | ActivationPhases$ Upkeep | PrecostDesc$ Forecast - | CostDesc$ Tap two untapped white and/or blue creatures you control, Reveal CARDNAME from your hand: | SpellDescription$ Draw a card. (Activate this ability only during your upkeep and only once each turn.)
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sky_hussar.jpg

res/cardsfolder/s/sundial_of_the_infinite.txt

@@ -2,7 +2,7 @@ Name:Sundial of the Infinite
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$EndTurn | Cost$ 1 T | PlayerTurn$ True | SpellDescription$ End the turn. Activate this ability only during your turn. (Exile all spells and abilities on the stack. Discard down to your maximum hand size. Damage wears off, and "this turn" and "until end of turn" effects end.)
+A:AB$ EndTurn | Cost$ 1 T | PlayerTurn$ True | SpellDescription$ End the turn. Activate this ability only during your turn. (Exile all spells and abilities on the stack. Discard down to your maximum hand size. Damage wears off, and "this turn" and "until end of turn" effects end.)
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sundial_of_the_infinite.jpg
 Oracle:{1}, {T}: End the turn. Activate this ability only during your turn. (Exile all spells and abilities on the stack. Discard down to your maximum hand size. Damage wears off, and "this turn" and "until end of turn" effects end.)

res/cardsfolder/t/trade_caravan.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:1/1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a currency counter on CARDNAME.
 A:AB$ Untap | Cost$ SubCounter<2/CURRENCY> | ValidTgts$ Land.Basic | TgtPrompt$ Select target basic land | ActivationPhases$ Upkeep | OpponentTurn$ True | SpellDescription$ Untap target basic land. Activate this ability only during an opponent's upkeep.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CURRENCY | CounterNum$ 1
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CURRENCY | CounterNum$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/trade_caravan.jpg
 SetInfo:HML|Common|http://magiccards.info/scans/en/hl/123.jpg|2

res/cardsfolder/v/vibrating_sphere.txt

@@ -2,8 +2,8 @@ Name:Vibrating Sphere
 ManaCost:4
 Types:Artifact
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 2 | PlayerTurn$ True | Description$ As long as it's your turn, creatures you control get +2/+0.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 2 | Condition$ PlayerTurn | Description$ As long as it's your turn, creatures you control get +2/+0.
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddToughness$ -2 | OpponentTurn$ True | Description$ As long as it's not your turn, creatures you control get -0/-2.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddToughness$ -2 | Condition$ NotPlayerTurn | Description$ As long as it's not your turn, creatures you control get -0/-2.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vibrating_sphere.jpg

res/cardsfolder/w/warden_of_the_wall.txt

@@ -4,7 +4,7 @@ Types:Artifact
 Text:no text
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-S:Mode$ Continuous | OpponentTurn$ True | EffectZone$ All | CharacteristicDefining$ True | SetPower$ 2 | SetToughness$ 3 | AddType$ Creature & Gargoyle | AddKeyword$ Flying | Description$ As long as it's not your turn, CARDNAME is a 2/3 Gargoyle artifact creature with flying.
+S:Mode$ Continuous | Condition$ NotPlayerTurn | EffectZone$ All | SetPower$ 2 | SetToughness$ 3 | AddType$ Creature & Gargoyle | AddKeyword$ Flying | Description$ As long as it's not your turn, CARDNAME is a 2/3 Gargoyle artifact creature with flying.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warden_of_the_wall.jpg
 SetInfo:DKA|Uncommon|http://magiccards.info/scans/en/dka/153.jpg

res/cardsfolder/w/wildwood_geist.txt

@@ -3,7 +3,7 @@ ManaCost:4 G
 Types:Creature Spirit
 Text:no text
 PT:3/3
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | PlayerTurn$ True | Description$ CARDNAME gets +2/+2 as long as it's your turn.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ PlayerTurn | Description$ CARDNAME gets +2/+2 as long as it's your turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wildwood_geist.jpg
 SetInfo:AVR|Common|http://magiccards.info/scans/en/avr/204.jpg

src/main/java/forge/card/staticability/StaticAbility.java

@@ -508,6 +508,14 @@ public class StaticAbility {
                 if (!controller.hasMetalcraft()) {
                     return false;
                 }
+            } else if (params.get("Condition").equals("PlayerTurn")) {
+                if (!Singletons.getModel().getGame().getPhaseHandler().isPlayerTurn(controller)) {
+                    return false;
+                }
+            } else if (params.get("Condition").equals("NotPlayerTurn")) {
+                if (Singletons.getModel().getGame().getPhaseHandler().isPlayerTurn(controller)) {
+                    return false;
+                }
             } else if (params.get("Condition").equals("PermanentOfEachColor")) {
                 if ((controller.getColoredCardsInPlay(Constant.Color.BLACK).isEmpty()
                         || controller.getColoredCardsInPlay(Constant.Color.BLUE).isEmpty()
@@ -523,14 +531,6 @@ public class StaticAbility {
             }
         }
 
-        if (this.params.containsKey("PlayerTurn") && !Singletons.getModel().getGame().getPhaseHandler().isPlayerTurn(controller)) {
-            return false;
-        }
-
-        if (this.params.containsKey("OpponentTurn") && !Singletons.getModel().getGame().getPhaseHandler().isPlayerTurn(controller.getOpponent())) {
-            return false;
-        }
-
         if (this.params.containsKey("OpponentAttackedWithCreatureThisTurn")
                 && !controller.getOpponent().getAttackedWithCreatureThisTurn()) {
             return false;
@@ -553,17 +553,6 @@ public class StaticAbility {
             }
         }
 
-        /*
-         * if(mapParams.containsKey("isPresent")) { String isPresent =
-         * mapParams.get("isPresent"); List<Card> list =
-         * AllZoneUtil.getCardsInPlay();
-         * 
-         * list = list.getValidCards(isPresent.split(","), controller,
-         * hostCard);
-         * 
-         * }
-         */
-
         if (this.params.containsKey("CheckSVar")) {
             final int sVar = AbilityFactory.calculateAmount(this.hostCard, this.params.get("CheckSVar"), null);
             String comparator = "GE1";
@@ -576,6 +565,8 @@ public class StaticAbility {
             if (!Expressions.compare(sVar, svarOperator, operandValue)) {
                 return false;
             }
+        } else { //no need to check the others
+            return true;
         }
 
         if (this.params.containsKey("CheckSecondSVar")) {
@@ -590,6 +581,8 @@ public class StaticAbility {
             if (!Expressions.compare(sVar, svarOperator, operandValue)) {
                 return false;
             }
+        } else { //no need to check the others
+            return true;
         }
 
         if (this.params.containsKey("CheckThirdSVar")) {
@@ -604,6 +597,8 @@ public class StaticAbility {
             if (!Expressions.compare(sVar, svarOperator, operandValue)) {
                 return false;
             }
+        } else { //no need to check the others
+            return true;
         }
 
         if (this.params.containsKey("CheckFourthSVar")) {