diff --git a/.gitattributes b/.gitattributes index 9e8a1af9fab..113d16c1400 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7271,6 +7271,7 @@ res/cardsfolder/s/siege_gang_commander.txt svneol=native#text/plain res/cardsfolder/s/siege_mastodon.txt svneol=native#text/plain res/cardsfolder/s/siege_of_towers.txt svneol=native#text/plain res/cardsfolder/s/sift.txt svneol=native#text/plain +res/cardsfolder/s/sift_through_sands.txt -text res/cardsfolder/s/sighted_caste_sorcerer.txt svneol=native#text/plain res/cardsfolder/s/sigil_blessing.txt svneol=native#text/plain res/cardsfolder/s/sigil_captain.txt svneol=native#text/plain diff --git a/res/cardsfolder/a/arcane_laboratory.txt b/res/cardsfolder/a/arcane_laboratory.txt index 0f899ba4256..623cce571f3 100644 --- a/res/cardsfolder/a/arcane_laboratory.txt +++ b/res/cardsfolder/a/arcane_laboratory.txt @@ -4,8 +4,8 @@ Types:Enchantment Text:no text S:Mode$ CantBeCast | ValidCard$ Card | Caster$ You | CheckSVar$ X | Description$ Each player can't cast more than one spell each turn. S:Mode$ CantBeCast | ValidCard$ Card | Caster$ Opponent | CheckSVar$ Y -SVar:X:Count$ThisTurnCast Card.YouCtrl -SVar:Y:Count$ThisTurnCast Card.YouDontCtrl +SVar:X:Count$ThisTurnCast_Card.YouCtrl +SVar:Y:Count$ThisTurnCast_Card.YouDontCtrl SVar:RemRandomDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/arcane_laboratory.jpg diff --git a/res/cardsfolder/a/ashen_skin_zubera.txt b/res/cardsfolder/a/ashen_skin_zubera.txt index fd105e2c674..9ab3574fc31 100644 --- a/res/cardsfolder/a/ashen_skin_zubera.txt +++ b/res/cardsfolder/a/ashen_skin_zubera.txt @@ -4,7 +4,7 @@ Types:Creature Zubera Spirit Text:no text T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target opponent discards a card for each Zubera put into a graveyard from the battlefield this turn. SVar:TrigDiscard:AB$Discard | Cost$ 0 | ValidTgts$ Opponent | NumCards$ X | Mode$ TgtChoose -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Card.Zubera +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Card.Zubera PT:1/2 SVar:Rarity:Common SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80509.jpg diff --git a/res/cardsfolder/a/asmira_holy_avenger.txt b/res/cardsfolder/a/asmira_holy_avenger.txt index ee080ac4ad7..ec1ab7ba224 100644 --- a/res/cardsfolder/a/asmira_holy_avenger.txt +++ b/res/cardsfolder/a/asmira_holy_avenger.txt @@ -6,7 +6,7 @@ PT:2/3 K:Flying T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of each end step, put a +1/+1 counter on Asmira, Holy Avenger for each creature put into your graveyard from the battlefield this turn. SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ X -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature.YouCtrl +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/asmira_holy_avenger.jpg SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/316.jpg diff --git a/res/cardsfolder/b/baloth_cage_trap.txt b/res/cardsfolder/b/baloth_cage_trap.txt index 5da2f754981..d1a796dc04d 100644 --- a/res/cardsfolder/b/baloth_cage_trap.txt +++ b/res/cardsfolder/b/baloth_cage_trap.txt @@ -4,7 +4,7 @@ Types:Instant Trap Text:no text A:SP$Token | Cost$ 3 G G | TokenAmount$ 1 | TokenName$ Beast | TokenOwner$ You | TokenTypes$ Creature,Beast | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4 | SpellDescription$ Put a 4/4 green Beast creature token onto the battlefield. A:SP$Token | Cost$ 1 G | CheckSVar$ ArtifactsEntered | TokenAmount$ 1 | TokenName$ Beast | TokenOwner$ You | TokenTypes$ Creature,Beast | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4 | SpellDescription$ If an opponent had an artifact enter the battlefield under his or her control this turn, you may pay 1 G rather than pay Baloth Cage Trap's mana cost. -SVar:ArtifactsEntered:Count$ThisTurnEntered Battlefield Artifact.YouDontCtrl +SVar:ArtifactsEntered:Count$ThisTurnEntered_Battlefield_Artifact.YouDontCtrl SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/baloth_cage_trap.jpg SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/156.jpg diff --git a/res/cardsfolder/b/bitter_ordeal.txt b/res/cardsfolder/b/bitter_ordeal.txt index a33138855d5..8475ba8cb97 100644 --- a/res/cardsfolder/b/bitter_ordeal.txt +++ b/res/cardsfolder/b/bitter_ordeal.txt @@ -5,7 +5,7 @@ Text:no text A:SP$ ChangeZone | Cost$ 2 B | Origin$ Library | Destination$ Exile | ValidTgts$ Player | ChangeType$ Card | ChangeNum$ 1 | IsCurse$ True | SpellDescription$ Search target player's library for a card and exile it. Then that player shuffles his or her library. T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigGravestorm | TriggerDescription$ Gravestorm (When you cast this spell, copy it for each permanent put into a graveyard this turn. You may choose new targets for the copies.) SVar:TrigGravestorm:AB$CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ GravestormCount -SVar:GravestormCount:Count$ThisTurnEntered Graveyard Permanent +SVar:GravestormCount:Count$ThisTurnEntered_Graveyard_Permanent SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/bitter_ordeal.jpg SetInfo:FUT|Rare|http://magiccards.info/scans/en/fut/80.jpg diff --git a/res/cardsfolder/c/caller_of_the_claw.txt b/res/cardsfolder/c/caller_of_the_claw.txt index aeecae62e61..c3405ac1834 100644 --- a/res/cardsfolder/c/caller_of_the_claw.txt +++ b/res/cardsfolder/c/caller_of_the_claw.txt @@ -6,7 +6,7 @@ PT:2/2 K:Flash T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 2/2 green Bear creature token onto the battlefield for each nontoken creature put into your graveyard from the battlefield this turn. SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ X | TokenOwner$ You | TokenName$ Bear | TokenTypes$ Creature,Bear | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature.nonToken+YouCtrl +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.nonToken+YouCtrl SVar:Rarity:Uncommon SVar:Picture:http://resources.wizards.com/magic/cards/lgn/en-us/card42187.jpg SetInfo:LGN|Rare|http://magiccards.info/scans/en/le/121.jpg diff --git a/res/cardsfolder/d/dream_thief.txt b/res/cardsfolder/d/dream_thief.txt index 34f506d81c2..51e3ca85e8a 100644 --- a/res/cardsfolder/d/dream_thief.txt +++ b/res/cardsfolder/d/dream_thief.txt @@ -6,7 +6,7 @@ PT:2/1 K:Flying T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card if you've cast another blue spell this turn. SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | CheckSVar$ X -SVar:X:Count$ThisTurnCast Card.Other+Blue+YouCtrl +SVar:X:Count$ThisTurnCast_Card.Other+Blue+YouCtrl SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_thief.jpg SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/20.jpg diff --git a/res/cardsfolder/d/dripping_tongue_zubera.txt b/res/cardsfolder/d/dripping_tongue_zubera.txt index c72688bd4a1..0d08d71de92 100644 --- a/res/cardsfolder/d/dripping_tongue_zubera.txt +++ b/res/cardsfolder/d/dripping_tongue_zubera.txt @@ -4,7 +4,7 @@ Types:Creature Zubera Spirit Text:no text T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put a 1/1 colorless Spirit creature token onto the battlefield for each Zubera put into a graveyard from the battlefield this turn. SVar:TrigToken:AB$Token | Cost$ 0 | TokenOwner$ You | TokenPower$ 1 | TokenToughness$ 1 | TokenColors$ Colorless | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenAmount$ X -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Card.Zubera +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Card.Zubera PT:1/2 SVar:Rarity:Common SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80511.jpg diff --git a/res/cardsfolder/e/ember_fist_zubera.txt b/res/cardsfolder/e/ember_fist_zubera.txt index bdff0e8092b..9b09f36c21c 100644 --- a/res/cardsfolder/e/ember_fist_zubera.txt +++ b/res/cardsfolder/e/ember_fist_zubera.txt @@ -4,7 +4,7 @@ Types:Creature Zubera Spirit Text:no text T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, it deals damage to target creature or player equal to the number of Zubera put into all graveyards from the battlefield this turn. SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ X -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Card.Zubera +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Card.Zubera PT:1/2 SVar:Rarity:Common SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80508.jpg diff --git a/res/cardsfolder/e/erayo_soratami_ascendant_erayos_essence.txt b/res/cardsfolder/e/erayo_soratami_ascendant_erayos_essence.txt index 46744d5fdeb..b2596e023be 100644 --- a/res/cardsfolder/e/erayo_soratami_ascendant_erayos_essence.txt +++ b/res/cardsfolder/e/erayo_soratami_ascendant_erayos_essence.txt @@ -6,7 +6,7 @@ PT:1/1 K:Flying T:Mode$SpellCast | CheckSVar$NumCast | SVarCompare$ EQ4 | Execute$ TrigFlip | TriggerZones$ Battlefield | TriggerDescription$ Whenever the fourth spell of a turn is cast, flip CARDNAME. SVar:TrigFlip:AB$ChangeState | Cost$ 0 | Defined$ Self -SVar:NumCast:Count$ThisTurnCast Card +SVar:NumCast:Count$ThisTurnCast_Card SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/erayo_soratami_ascendant.jpg AlternateMode:Flip @@ -22,7 +22,7 @@ Types:Legendary Enchantment Text:no text T:Mode$SpellCast | ValidControllingPlayer$ Opponent | CheckSVar$ NumOppCast | SVarCompare$ EQ1 | Execute$ TrigCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent casts a spell for the first time in a turn, counter that spell. SVar:TrigCounter:AB$Counter | Cost$ 0 | Defined$ TriggeredSpellAbility | Destination$ Graveyard -SVar:NumOppCast:Count$ThisTurnCast Card.YouDontCtrl +SVar:NumOppCast:Count$ThisTurnCast_Card.YouDontCtrl SVar:Rarity:Rare # SVar:Picture:http://www.wizards.com/global/images/magic/general/erayos_essence.jpg # This link 404s diff --git a/res/cardsfolder/e/ethersworn_canonist.txt b/res/cardsfolder/e/ethersworn_canonist.txt index cf556f55c09..61a67fd1176 100644 --- a/res/cardsfolder/e/ethersworn_canonist.txt +++ b/res/cardsfolder/e/ethersworn_canonist.txt @@ -5,8 +5,8 @@ Text:no text PT:2/2 S:Mode$ CantBeCast | ValidCard$ Card.nonArtifact | Caster$ You | CheckSVar$ X | Description$ Each player who has cast a nonartifact spell this turn can't cast additional nonartifact spells. S:Mode$ CantBeCast | ValidCard$ Card.nonArtifact | Caster$ Opponent | CheckSVar$ Y -SVar:X:Count$ThisTurnCast Card.nonArtifact+YouCtrl -SVar:Y:Count$ThisTurnCast Card.nonArtifact+YouDontCtrl +SVar:X:Count$ThisTurnCast_Card.nonArtifact+YouCtrl +SVar:Y:Count$ThisTurnCast_Card.nonArtifact+YouDontCtrl SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/ethersworn_canonist.jpg diff --git a/res/cardsfolder/f/flesh_allergy.txt b/res/cardsfolder/f/flesh_allergy.txt index 07640be6d15..00179c7d9e9 100644 --- a/res/cardsfolder/f/flesh_allergy.txt +++ b/res/cardsfolder/f/flesh_allergy.txt @@ -4,7 +4,7 @@ Types:Sorcery Text:no text A:SP$ Destroy | Cost$ 2 B B Sac<1/Creature> | ValidTgts$ Creature | SubAbility$ SVar=DBLoseLife | SpellDescription$ Destroy target creature. Its controller loses life equal to the number of creatures put into all graveyards from the battlefield this turn. SVar:DBLoseLife:DB$LoseLife | Defined$ TargetedController | LifeAmount$ X -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/flesh_allergy.jpg SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/62.jpg diff --git a/res/cardsfolder/f/floating_dream_zubera.txt b/res/cardsfolder/f/floating_dream_zubera.txt index fae096efe54..7086fa584c8 100644 --- a/res/cardsfolder/f/floating_dream_zubera.txt +++ b/res/cardsfolder/f/floating_dream_zubera.txt @@ -4,7 +4,7 @@ Types:Creature Zubera Spirit Text:no text T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card for each Zubera put into a graveyard from the battlefield this turn. SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ X -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Card.Zubera +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Card.Zubera PT:1/2 SVar:Rarity:Common SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80507.jpg diff --git a/res/cardsfolder/f/fresh_meat.txt b/res/cardsfolder/f/fresh_meat.txt index 212e7cd0441..5c6ca1375b1 100644 --- a/res/cardsfolder/f/fresh_meat.txt +++ b/res/cardsfolder/f/fresh_meat.txt @@ -3,7 +3,7 @@ ManaCost:3 G Types:Instant Text:no text A:SP$ Token | Cost$ 3 G | TokenAmount$ X | TokenOwner$ You | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield for each creature put into your graveyard from the battlefield this turn. -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature.YouCtrl +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/fresh_meat.jpg diff --git a/res/cardsfolder/g/gleancrawler.txt b/res/cardsfolder/g/gleancrawler.txt index 732f3a69d77..95db73a93a0 100644 --- a/res/cardsfolder/g/gleancrawler.txt +++ b/res/cardsfolder/g/gleancrawler.txt @@ -5,7 +5,7 @@ Text:no text PT:6/6 K:Trample T:Mode$Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ At the beginning of your end step, return to your hand all creature cards in your graveyard that were put there from the battlefield this turn. -SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ ThisTurnEntered Graveyard from Battlefield Card.Creature+YouCtrl +SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ ThisTurnEntered_Graveyard_from_Battlefield_Card.Creature+YouCtrl SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/gleancrawler.jpg SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/247.jpg diff --git a/res/cardsfolder/g/goblin_cohort.txt b/res/cardsfolder/g/goblin_cohort.txt index 6b7ae1a976d..2b8d74f0fdb 100644 --- a/res/cardsfolder/g/goblin_cohort.txt +++ b/res/cardsfolder/g/goblin_cohort.txt @@ -4,7 +4,7 @@ Types:Creature Goblin Warrior Text:no text PT:2/2 S:Mode$ Continuous | AffectedCards$ Card.Self | AddKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't attack unless you've cast a creature spell this turn. -SVar:X:Count$ThisTurnCast Creature.YouCtrl +SVar:X:Count$ThisTurnCast_Creature.YouCtrl SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_cohort.jpg Oracle:Goblin Cohort can't attack unless you've cast a creature spell this turn. diff --git a/res/cardsfolder/h/hollowhenge_scavenger.txt b/res/cardsfolder/h/hollowhenge_scavenger.txt index 3a8fabdca87..4bf26a100ed 100644 --- a/res/cardsfolder/h/hollowhenge_scavenger.txt +++ b/res/cardsfolder/h/hollowhenge_scavenger.txt @@ -5,7 +5,7 @@ Text:no text PT:4/5 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ Morbid | SVarCompare$ GE1 | Execute$ TrigGainLife | TriggerDescription$ Morbid - When CARDNAME enters the battlefield, if a creature died this turn, you gain 5 life. SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 5 -SVar:Morbid:Count$ThisTurnEntered Graveyard from Battlefield Creature +SVar:Morbid:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/hollowhenge_scavenger.jpg SetInfo:ISD|Uncommon|http://magiccards.info/scans/en/isd/188.jpg diff --git a/res/cardsfolder/i/ichneumon_druid.txt b/res/cardsfolder/i/ichneumon_druid.txt index da340aa46ec..08c946e7575 100644 --- a/res/cardsfolder/i/ichneumon_druid.txt +++ b/res/cardsfolder/i/ichneumon_druid.txt @@ -5,7 +5,7 @@ Text:no text PT:1/1 T:Mode$ SpellCast | ValidCard$ Instant | ValidControllingPlayer$ Opponent | CheckSVar$ X | SVarCompare$ GT1 | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent casts an instant spell other than the first instant spell that player casts each turn, CARDNAME deals 4 damage to him or her. SVar:TrigDmg:AB$DealDamage | Cost$ 0 | Defined$ TriggeredPlayer | NumDmg$ 4 -SVar:X:Count$ThisTurnCast Instant +SVar:X:Count$ThisTurnCast_Instant SVar:RemRandomDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/ichneumon_druid.jpg diff --git a/res/cardsfolder/k/khabal_ghoul.txt b/res/cardsfolder/k/khabal_ghoul.txt index 4277c70161f..fae9fe81aab 100644 --- a/res/cardsfolder/k/khabal_ghoul.txt +++ b/res/cardsfolder/k/khabal_ghoul.txt @@ -5,7 +5,7 @@ Text:no text PT:1/1 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of each end step, put a +1/+1 counter on CARDNAME for each creature put into a graveyard from the battlefield this turn. SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ X -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/khabal_ghoul.jpg SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/10.jpg diff --git a/res/cardsfolder/k/kuon_ogre_ascendant_kuons_essence.txt b/res/cardsfolder/k/kuon_ogre_ascendant_kuons_essence.txt index 91b6916443c..69b506d6ee1 100644 --- a/res/cardsfolder/k/kuon_ogre_ascendant_kuons_essence.txt +++ b/res/cardsfolder/k/kuon_ogre_ascendant_kuons_essence.txt @@ -4,7 +4,7 @@ Types:Legendary Creature Ogre Monk Text:no text PT:2/4 T:Mode$Phase | Phase$ End of Turn | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigFlip | TriggerDescription$ At the beginning of the end step, if three or more creatures died this turn, flip CARDNAME. -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature SVar:TrigFlip:AB$ChangeState | Cost$ 0 | Defined$ Self SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/kuon_ogre_ascendant.jpg diff --git a/res/cardsfolder/l/lavaball_trap.txt b/res/cardsfolder/l/lavaball_trap.txt index 85ba615e929..2bf68616e9c 100644 --- a/res/cardsfolder/l/lavaball_trap.txt +++ b/res/cardsfolder/l/lavaball_trap.txt @@ -5,7 +5,7 @@ Text:no text A:SP$Destroy | Cost$ 6 R R | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBDamageAll | SpellDescription$ Destroy two target lands. CARDNAME deals 4 damage to each creature. A:SP$Destroy | Cost$ 3 R R | CheckSVar$ LandsEntered | SVarCompare$ GE2 | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBDamageAll | SpellDescription$ If an opponent had two or more lands enter the battlefield under his or her control this turn, you may pay 3 R R rather than pay CARDNAME's mana cost. SVar:DBDamageAll:DB$DamageAll | ValidCards$ Creature | NumDmg$ 4 | ValidDescription$ each creature. -SVar:LandsEntered:Count$ThisTurnEntered Battlefield Land.YouDontCtrl +SVar:LandsEntered:Count$ThisTurnEntered_Battlefield_Land.YouDontCtrl SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/lavaball_trap.jpg SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/135.jpg diff --git a/res/cardsfolder/l/lure_of_prey.txt b/res/cardsfolder/l/lure_of_prey.txt index 54564d061ae..af8a2408614 100644 --- a/res/cardsfolder/l/lure_of_prey.txt +++ b/res/cardsfolder/l/lure_of_prey.txt @@ -3,7 +3,7 @@ ManaCost:2 G G Types:Instant Text:no text S:Mode$ CantBeCast | ValidCard$ Card.Self | EffectZone$ Hand | CheckSVar$ X | SVarCompare$ LE0 | Description$ Cast CARDNAME only if an opponent cast a creature spell this turn. -SVar:X:Count$ThisTurnCast Creature.YouDontCtrl +SVar:X:Count$ThisTurnCast_Creature.YouDontCtrl A:SP$ ChangeZone | Cost$ 2 G G | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.Green | ChangeNum$ 1 | SpellDescription$ You may put a green creature card from your hand onto the battlefield. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/lure_of_prey.jpg diff --git a/res/cardsfolder/m/mogg_conscripts.txt b/res/cardsfolder/m/mogg_conscripts.txt index 652783d4ece..68b56f80d42 100644 --- a/res/cardsfolder/m/mogg_conscripts.txt +++ b/res/cardsfolder/m/mogg_conscripts.txt @@ -4,7 +4,7 @@ Types:Creature Goblin Text:no text PT:2/2 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't attack unless you've cast a creature spell this turn. -SVar:X:Count$ThisTurnCast Creature.YouCtrl +SVar:X:Count$ThisTurnCast_Creature.YouCtrl SVar:BuffedBy:Creature SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/mogg_conscripts.jpg diff --git a/res/cardsfolder/m/morkrut_banshee.txt b/res/cardsfolder/m/morkrut_banshee.txt index 5be9875e9b0..56a17a7ba79 100644 --- a/res/cardsfolder/m/morkrut_banshee.txt +++ b/res/cardsfolder/m/morkrut_banshee.txt @@ -5,7 +5,7 @@ Text:no text PT:4/4 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ Morbid | SVarCompare$ GE1 | Execute$ TrigPump | TriggerDescription$ Morbid - When CARDNAME enters the battlefield, if a creature died this turn, target creature gets -4/-4 until end of turn. SVar:TrigPump:AB$ Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -4 | NumDef$ -4 -SVar:Morbid:Count$ThisTurnEntered Graveyard from Battlefield Creature +SVar:Morbid:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/morkrut_banshee.jpg SetInfo:ISD|Uncommon|http://magiccards.info/scans/en/isd/110.jpg diff --git a/res/cardsfolder/n/no_rest_for_the_wicked.txt b/res/cardsfolder/n/no_rest_for_the_wicked.txt index 75fbc9582a9..c896c795679 100644 --- a/res/cardsfolder/n/no_rest_for_the_wicked.txt +++ b/res/cardsfolder/n/no_rest_for_the_wicked.txt @@ -2,7 +2,7 @@ Name:No Rest for the Wicked ManaCost:1 B Types:Enchantment Text:no text -A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Hand | Defined$ ThisTurnEntered Graveyard from Battlefield Card.Creature+YouCtrl | SpellDescription$ Return to your hand all creature cards in your graveyard that were put there from the battlefield this turn. +A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Hand | Defined$ ThisTurnEntered_Graveyard_from_Battlefield_Card.Creature+YouCtrl | SpellDescription$ Return to your hand all creature cards in your graveyard that were put there from the battlefield this turn. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/no_rest_for_the_wicked.jpg SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/142.jpg diff --git a/res/cardsfolder/o/osai_vultures.txt b/res/cardsfolder/o/osai_vultures.txt index 292576949a2..aeefc598fba 100644 --- a/res/cardsfolder/o/osai_vultures.txt +++ b/res/cardsfolder/o/osai_vultures.txt @@ -7,7 +7,7 @@ K:Flying T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of each end step, if a creature died this turn, put a carrion counter on CARDNAME. SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | CounterType$ CARRION | CounterNum$ 1 | Defined$ Self A:AB$ Pump | Cost$ SubCounter<2/CARRION> | NumAtt$ 1 | NumDef$ 1 | Defined$ Self | CostDesc$ Remove two carrion counters from Osai Vultures: | SpellDescription$ CARDNAME gets +1/+1 until end of turn. -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/osai_vultures.jpg SetInfo:4ED|Uncommon|http://magiccards.info/scans/en/4e/288.jpg diff --git a/res/cardsfolder/p/permafrost_trap.txt b/res/cardsfolder/p/permafrost_trap.txt index 4920f7386bb..6365d07ba6f 100644 --- a/res/cardsfolder/p/permafrost_trap.txt +++ b/res/cardsfolder/p/permafrost_trap.txt @@ -5,7 +5,7 @@ Text:no text A:SP$Tap | Cost$ 2 U U | TargetMin$ 0 | TargetMax$ 2 | Tgt$ TgtC | SubAbility$ DBPump | SpellDescription$ Tap up to two target creatures. Those creatures don't untap during their controller's next untap step. A:SP$Tap | Cost$ U | CheckSVar$ GreenCreats | TargetMin$ 0 | TargetMax$ 2 | Tgt$ TgtC | SubAbility$ DBPump | SpellDescription$ If an opponent had a green creature enter the battlefield under his or her control this turn, you may pay U rather than pay CARDNAME's mana cost. SVar:DBPump:DB$Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True -SVar:GreenCreats:Count$ThisTurnEntered Battlefield Creature.Green+YouDontCtrl +SVar:GreenCreats:Count$ThisTurnEntered_Battlefield_Creature.Green+YouDontCtrl SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/permafrost_trap.jpg SetInfo:WWK|Uncommon|http://magiccards.info/scans/en/wwk/34.jpg diff --git a/res/cardsfolder/p/predatory_advantage.txt b/res/cardsfolder/p/predatory_advantage.txt index 5894fa809cb..0e657e3da5e 100644 --- a/res/cardsfolder/p/predatory_advantage.txt +++ b/res/cardsfolder/p/predatory_advantage.txt @@ -4,7 +4,7 @@ Types:Enchantment Text:no text T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Opponent | CheckSVar$ X | SVarCompare$ EQ0 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of each opponent's end step, if that player didn't cast a creature spell this turn, put a 2/2 green Lizard creature token onto the battlefield. SVar:TrigToken:AB$Token | Cost$ 0 | TokenName$ Lizard | TokenTypes$ Creature,Lizard | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 | TokenAmount$ 1 | TokenOwner$ You -SVar:X:Count$ThisTurnCast Creature.YouDontCtrl +SVar:X:Count$ThisTurnCast_Creature.YouDontCtrl SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/predatory_advantage.jpg SetInfo:ARB|Rare|http://magiccards.info/scans/en/arb/58.jpg diff --git a/res/cardsfolder/r/ravenous_trap.txt b/res/cardsfolder/r/ravenous_trap.txt index cbec9aa370c..5e1e3d1719f 100644 --- a/res/cardsfolder/r/ravenous_trap.txt +++ b/res/cardsfolder/r/ravenous_trap.txt @@ -4,7 +4,7 @@ Types:Instant Trap Text:no text A:SP$ ChangeZoneAll | Cost$ 2 B B | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select target player | ChangeType$ Card | SpellDescription$ Exile all cards from target player's graveyard. A:SP$ ChangeZoneAll | Cost$ 0 | CheckSVar$ CardsToGraveyard | SVarCompare$ GE3 |Origin$ Graveyard | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select target player | ChangeType$ Card | SpellDescription$ If an opponent had three or more cards put into his or her graveyard from anywhere this turn, you may pay 0 rather than pay CARDNAME's mana cost. -SVar:CardsToGraveyard:Count$ThisTurnEntered Graveyard Card.YouDontCtrl +SVar:CardsToGraveyard:Count$ThisTurnEntered_Graveyard_Card.YouDontCtrl SVar:RemRandomDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/ravenous_trap.jpg diff --git a/res/cardsfolder/r/reaper_from_the_abyss.txt b/res/cardsfolder/r/reaper_from_the_abyss.txt index 69de6cd40bd..e06af4075e3 100644 --- a/res/cardsfolder/r/reaper_from_the_abyss.txt +++ b/res/cardsfolder/r/reaper_from_the_abyss.txt @@ -6,7 +6,7 @@ PT:6/6 K:Flying T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ Morbid | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Morbid - At the beginning of each end step, if a creature died this turn, destroy target non-demon creature. SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | ValidTgts$ Creature.nonDemon | TgtPrompt$ Select target non-demon creature -SVar:Morbid:Count$ThisTurnEntered Graveyard from Battlefield Creature +SVar:Morbid:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/reaper_from_the_abyss.jpg SetInfo:ISD|Mythic|http://magiccards.info/scans/en/isd/112.jpg diff --git a/res/cardsfolder/r/rule_of_law.txt b/res/cardsfolder/r/rule_of_law.txt index 3b0792ad503..1a7bd18f417 100644 --- a/res/cardsfolder/r/rule_of_law.txt +++ b/res/cardsfolder/r/rule_of_law.txt @@ -4,8 +4,8 @@ Types:Enchantment Text:no text S:Mode$ CantBeCast | ValidCard$ Card | Caster$ You | CheckSVar$ X | Description$ Each player can't cast more than one spell each turn. S:Mode$ CantBeCast | ValidCard$ Card | Caster$ Opponent | CheckSVar$ Y -SVar:X:Count$ThisTurnCast Card.YouCtrl -SVar:Y:Count$ThisTurnCast Card.YouDontCtrl +SVar:X:Count$ThisTurnCast_Card.YouCtrl +SVar:Y:Count$ThisTurnCast_Card.YouDontCtrl SVar:RemRandomDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/rule_of_law.jpg diff --git a/res/cardsfolder/s/scavenging_ghoul.txt b/res/cardsfolder/s/scavenging_ghoul.txt index fbac0f4df7f..0c265145594 100644 --- a/res/cardsfolder/s/scavenging_ghoul.txt +++ b/res/cardsfolder/s/scavenging_ghoul.txt @@ -6,7 +6,7 @@ PT:2/2 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of each end step, put a corpse counter on CARDNAME for each creature put into a graveyard from the battlefield this turn. A:AB$ Regenerate | Cost$ SubCounter<1/CORPSE> | SpellDescription$ Regenerate CARDNAME. SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CORPSE | CounterNum$ X -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/scavenging_ghoul.jpg SetInfo:LEA|Uncommon|http://magiccards.info/scans/en/al/35.jpg diff --git a/res/cardsfolder/s/second_sunrise.txt b/res/cardsfolder/s/second_sunrise.txt index 7ae0485dec9..b6e3a185470 100644 --- a/res/cardsfolder/s/second_sunrise.txt +++ b/res/cardsfolder/s/second_sunrise.txt @@ -2,7 +2,7 @@ Name:Second Sunrise ManaCost:1 W W Types:Instant Text:no text -A:SP$ChangeZone | Cost$ 1 W W | Origin$ Graveyard | Destination$ Battlefield | Defined$ ThisTurnEntered Graveyard from Battlefield Card.Artifact,Card.Creature,Card.Enchantment,Card.Land | SpellDescription$ Each player returns to the battlefield all artifact, creature, enchantment, and land cards in his or her graveyard that were put there from the battlefield this turn. +A:SP$ChangeZone | Cost$ 1 W W | Origin$ Graveyard | Destination$ Battlefield | Defined$ ThisTurnEntered_Graveyard_from_Battlefield_Card.Artifact,Card.Creature,Card.Enchantment,Card.Land | SpellDescription$ Each player returns to the battlefield all artifact, creature, enchantment, and land cards in his or her graveyard that were put there from the battlefield this turn. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/second_sunrise.jpg SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/20.jpg diff --git a/res/cardsfolder/s/sift_through_sands.txt b/res/cardsfolder/s/sift_through_sands.txt new file mode 100644 index 00000000000..a763e9da3fd --- /dev/null +++ b/res/cardsfolder/s/sift_through_sands.txt @@ -0,0 +1,17 @@ +Name:Sift Through Sands +ManaCost:1 U U +Types:Instant Arcane +Text:no text +A:SP$Draw | Cost$ 1 U U | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard | SpellDescription$ Draw two cards, then discard a card. +If you've cast a spell named Peer Through Depths and a spell named Reach Through Mists this turn, you may search your library for a card named The Unspeakable, put it onto the battlefield, then shuffle your library. +SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DBUnspeakable +SVar:DBUnspeakable:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.namedThe Unspeakable | ChangeNum$ 1 | ConditionCheckSVar$ PeerReachTotal | ConditionSVarCompare$ EQ2 +SVar:PeerReachTotal:SVar$Peer/Plus.Reach +#Max returns any number lower than or equally to the number following the period. +SVar:Peer:Count$ThisTurnCast_Card.YouCtrl+namedPeer Through Depths/LimitMax.1 +SVar:Reach:Count$ThisTurnCast_Card.YouCtrl+namedReach Through Mists/LimitMax.1 +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/sift_through_sands.jpg +SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/84.jpg +Oracle:Draw two cards, then discard a card.\nIf you've cast a spell named Peer Through Depths and a spell named Reach Through Mists this turn, you may search your library for a card named The Unspeakable, put it onto the battlefield, then shuffle your library. +End \ No newline at end of file diff --git a/res/cardsfolder/s/silent_chant_zubera.txt b/res/cardsfolder/s/silent_chant_zubera.txt index dd4b619bd31..d712af1a7b7 100644 --- a/res/cardsfolder/s/silent_chant_zubera.txt +++ b/res/cardsfolder/s/silent_chant_zubera.txt @@ -4,7 +4,7 @@ Types:Creature Zubera Spirit Text:no text T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you gain 2 life for each Zubera put into a graveyard from the battlefield this turn. SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Card.Zubera/Double +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Card.Zubera/Double PT:1/2 SVar:Rarity:Common SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80510.jpg diff --git a/res/cardsfolder/s/skirsdag_high_priest.txt b/res/cardsfolder/s/skirsdag_high_priest.txt index ef19a0af46a..7349376336a 100644 --- a/res/cardsfolder/s/skirsdag_high_priest.txt +++ b/res/cardsfolder/s/skirsdag_high_priest.txt @@ -4,7 +4,7 @@ Types:Creature Human Cleric Text:no text PT:1/2 A:AB$ Token | Cost$ T tapXType<2/Creature> | CheckSVar$ Morbid | SVarCompare$ GE1 | TokenImage$ B 5 5 Demon | TokenAmount$ 1 | TokenName$ Demon | TokenTypes$ Creature,Demon | TokenOwner$ You | TokenColors$ Black | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | CostDesc$ Morbid - Tap, Tap two untapped creatures you control: | SpellDescription$ Put a 5/5 black Demon creature token with flying onto the battlefield. Activate this ability only if a creature died this turn. -SVar:Morbid:Count$ThisTurnEntered Graveyard from Battlefield Creature +SVar:Morbid:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/skirsdag_high_priest.jpg SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/117.jpg diff --git a/res/cardsfolder/s/skyshroud_condor.txt b/res/cardsfolder/s/skyshroud_condor.txt index b938dc18a34..0198cf84344 100644 --- a/res/cardsfolder/s/skyshroud_condor.txt +++ b/res/cardsfolder/s/skyshroud_condor.txt @@ -5,7 +5,7 @@ Text:no text PT:2/2 K:Flying S:Mode$ CantBeCast | ValidCard$ Card.Self | EffectZone$ Hand | CheckSVar$ X | SVarCompare$ LE0 | Description$ Cast CARDNAME only if you've cast another spell this turn. -SVar:X:Count$ThisTurnCast Card.YouCtrl +SVar:X:Count$ThisTurnCast_Card.YouCtrl SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/skyshroud_condor.jpg SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/88.jpg diff --git a/res/cardsfolder/s/soul_reap.txt b/res/cardsfolder/s/soul_reap.txt index 1809e3dd700..cf7a55f7324 100644 --- a/res/cardsfolder/s/soul_reap.txt +++ b/res/cardsfolder/s/soul_reap.txt @@ -4,7 +4,7 @@ Types:Sorcery Text:no text A:SP$Destroy | Cost$ 1 B | ValidTgts$ Creature.nonGreen | TgtPrompt$ Select target nongreen creature. | SubAbility$ DBLoseLife | SpellDescription$ Destroy target nongreen creature. Its controller loses 3 life if you've cast another black spell this turn. SVar:DBLoseLife:DB$LoseLife | Defined$ TargetedController | LifeAmount$ 3 | ConditionCheckSVar$ X -SVar:X:Count$ThisTurnCast Card.Black+Other+YouCtrl +SVar:X:Count$ThisTurnCast_Card.Black+Other+YouCtrl SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_reap.jpg SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/44.jpg diff --git a/res/cardsfolder/s/storm_entity.txt b/res/cardsfolder/s/storm_entity.txt index f67ae91f0ca..cf2a9df359a 100644 --- a/res/cardsfolder/s/storm_entity.txt +++ b/res/cardsfolder/s/storm_entity.txt @@ -5,7 +5,7 @@ Text:no text PT:1/1 K:Haste K:etbCounter:P1P1:X -SVar:X:Count$ThisTurnCast Card.Other +SVar:X:Count$ThisTurnCast_Card.Other SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_entity.jpg SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/122.jpg diff --git a/res/cardsfolder/t/talaras_battalion.txt b/res/cardsfolder/t/talaras_battalion.txt index 8e7083b1369..168f6b1b184 100644 --- a/res/cardsfolder/t/talaras_battalion.txt +++ b/res/cardsfolder/t/talaras_battalion.txt @@ -5,7 +5,7 @@ Text:no text PT:4/3 K:Trample S:Mode$ CantBeCast | ValidCard$ Card.Self | EffectZone$ Hand | CheckSVar$ X | SVarCompare$ EQ0 | Description$ Cast CARDNAME only if you've cast another green spell this turn. -SVar:X:Count$ThisTurnCast Card.Green+Other+YouCtrl +SVar:X:Count$ThisTurnCast_Card.Green+Other+YouCtrl SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/talaras_battalion.jpg SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/77.jpg diff --git a/res/cardsfolder/t/twilight_shepherd.txt b/res/cardsfolder/t/twilight_shepherd.txt index 4fbbf4421c1..f04385bc5d6 100644 --- a/res/cardsfolder/t/twilight_shepherd.txt +++ b/res/cardsfolder/t/twilight_shepherd.txt @@ -7,7 +7,7 @@ K:Flying K:Vigilance K:Persist T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return to your hand all cards in your graveyard that were put there from the battlefield this turn. -SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ ThisTurnEntered Graveyard from Battlefield Card.Creature+YouCtrl +SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ ThisTurnEntered_Graveyard_from_Battlefield_Card.Creature+YouCtrl SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/twilight_shepherd.jpg SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/25.jpg diff --git a/res/cardsfolder/u/urborg_justice.txt b/res/cardsfolder/u/urborg_justice.txt index 924bae40d8b..fa43a0ac0af 100644 --- a/res/cardsfolder/u/urborg_justice.txt +++ b/res/cardsfolder/u/urborg_justice.txt @@ -3,7 +3,7 @@ ManaCost:B B Types:Instant Text:no text A:SP$Sacrifice | Cost$ B B | ValidTgts$ Opponent | Amount$ X | SacValid$ Creature | SacMessage$ Creature | SpellDescription$ Target opponent sacrifices a creature for each creature put into your graveyard from the battlefield this turn. -SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature.YouCtrl +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/urborg_justice.jpg SetInfo:WTH|Rare|http://magiccards.info/scans/en/wl/26.jpg diff --git a/res/cardsfolder/v/vengevine.txt b/res/cardsfolder/v/vengevine.txt index 68b93f9a0e0..b0a06ff1034 100644 --- a/res/cardsfolder/v/vengevine.txt +++ b/res/cardsfolder/v/vengevine.txt @@ -6,7 +6,7 @@ PT:4/3 K:Haste T:Mode$ SpellCast | ValidCard$ Creature | ValidControllingPlayer$ You | CheckSVar$ X | SVarCompare$ EQ2 | TriggerZones$ Graveyard | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ Whenever you cast a spell, if it's the second creature spell you cast this turn, you may return CARDNAME from your graveyard to the battlefield. SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield -SVar:X:Count$ThisTurnCast Creature.YouCtrl +SVar:X:Count$ThisTurnCast_Creature.YouCtrl SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/vengevine.jpg SetInfo:ROE|Mythic|http://magiccards.info/scans/en/roe/212.jpg diff --git a/res/cardsfolder/w/whiplash_trap.txt b/res/cardsfolder/w/whiplash_trap.txt index ab8de22f174..928eede97d8 100644 --- a/res/cardsfolder/w/whiplash_trap.txt +++ b/res/cardsfolder/w/whiplash_trap.txt @@ -4,7 +4,7 @@ Types:Instant Trap Text:no text A:SP$ ChangeZone | Cost$ 3 U U | Origin$ Battlefield | Destination$ Hand | TgtPrompt$ Choose target creatures. | ValidTgts$ Creature | TargetMin$ 2 | TargetMax$ 2 | SpellDescription$ Return two target creatures to their owners' hands. A:SP$ ChangeZone | Cost$ U | CheckSVar$ CreaturesEntered | SVarCompare$ GE2 | Origin$ Battlefield | Destination$ Hand | TgtPrompt$ Choose target creatures. | ValidTgts$ Creature | TargetMin$ 2 | TargetMax$ 2 | SpellDescription$ If an opponent had two or more creatures enter the battlefield under his or her control this turn, you may pay U rather than pay CARDNAME's mana cost. -SVar:CreaturesEntered:Count$ThisTurnEntered Battlefield Creature.YouDontCtrl +SVar:CreaturesEntered:Count$ThisTurnEntered_Battlefield_Creature.YouDontCtrl SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/whiplash_trap.jpg SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/77.jpg diff --git a/res/cardsfolder/w/woodland_sleuth.txt b/res/cardsfolder/w/woodland_sleuth.txt index c047033d7a2..5082d6ca4b9 100644 --- a/res/cardsfolder/w/woodland_sleuth.txt +++ b/res/cardsfolder/w/woodland_sleuth.txt @@ -5,7 +5,7 @@ Text:no text PT:2/3 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | CheckSVar$ Morbid | SVarCompare$ GE1 | TriggerDescription$ Morbid - When CARDNAME enters the battlefield, if a creature died this turn, return a creature card at random from your graveyard to your hand. SVar:TrigChangeZone:AB$ChangeZone | ChangeType$ Creature.YouCtrl | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Hidden$ True | AtRandom$ True -SVar:Morbid:Count$ThisTurnEntered Graveyard from Battlefield Creature +SVar:Morbid:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/woodland_sleuth.jpg SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/210.jpg diff --git a/res/cardsfolder/y/yawgmoths_agenda.txt b/res/cardsfolder/y/yawgmoths_agenda.txt index 56f3c835972..12b3c531b7e 100644 --- a/res/cardsfolder/y/yawgmoths_agenda.txt +++ b/res/cardsfolder/y/yawgmoths_agenda.txt @@ -3,7 +3,7 @@ ManaCost:3 B B Types:Enchantment Text:no text S:Mode$ CantBeCast | ValidCard$ Card | Caster$ You | CheckSVar$ X | Description$ You can't cast more than one spell each turn. -SVar:X:Count$ThisTurnCast Card.YouOwn +SVar:X:Count$ThisTurnCast_Card.YouOwn S:Mode$ Continuous | Affected$ Card.YouCtrl | AffectedZone$ Graveyard | AddHiddenKeyword$ HIDDEN May be played | Description$ You may play cards from your graveyard. K:If a card would be put into your graveyard from anywhere, exile it instead. SVar:RemRandomDeck:True diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 23c522806e7..b15ebd29bf1 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -3194,7 +3194,7 @@ public class CardFactoryUtil { // or // Count$ThisTurnEntered if (sq[0].contains("ThisTurnEntered")) { - final String[] workingCopy = l[0].split(" "); + final String[] workingCopy = l[0].split("_"); Zone destination, origin; String validFilter; @@ -3216,7 +3216,7 @@ public class CardFactoryUtil { // Count$LastTurnCast if (sq[0].contains("ThisTurnCast") || sq[0].contains("LastTurnCast")) { - final String[] workingCopy = l[0].split(" "); + final String[] workingCopy = l[0].split("_"); final String validFilter = workingCopy[1]; CardList res; @@ -3478,6 +3478,19 @@ public class CardFactoryUtil { return num * -1; } else if (s[0].contains("Times")) { return num * secondaryNum; + } else if (s[0].contains("LimitMax")) { + if (num < secondaryNum) { + return num; + } else { + return secondaryNum; + } + } else if (s[0].contains("LimitMin")) { + if(num > secondaryNum) { + return num; + } else { + return secondaryNum; + } + } else { return num; }