From e549dc8ed20735b418d7f24b8212f61ed65f1816 Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 22 Oct 2012 16:33:50 +0000 Subject: [PATCH] - Made more scripts ready for multiplayer. --- .gitignore | 3 ++ res/cardsfolder/b/barbed_foliage.txt | 2 +- res/cardsfolder/b/briar_patch.txt | 4 +-- res/cardsfolder/d/dauthi_mindripper.txt | 2 +- res/cardsfolder/f/flint_golem.txt | 2 +- res/cardsfolder/f/floral_spuzzem.txt | 2 +- res/cardsfolder/g/gaeas_liege.txt | 2 +- res/cardsfolder/g/goblin_vandal.txt | 2 +- res/cardsfolder/g/grimgrin_corpse_born.txt | 36 +++++++++---------- res/cardsfolder/g/guiltfeeder.txt | 2 +- res/cardsfolder/h/harbor_guardian.txt | 2 +- res/cardsfolder/h/hellrider.txt | 2 +- res/cardsfolder/h/hissing_miasma.txt | 4 +-- res/cardsfolder/j/jangling_automaton.txt | 2 +- .../k/kazuul_tyrant_of_the_cliffs.txt | 4 +-- res/cardsfolder/k/keeper_of_tresserhorn.txt | 4 +-- res/cardsfolder/k/kukemssa_pirates.txt | 4 +-- res/cardsfolder/l/latullas_orders.txt | 2 +- res/cardsfolder/l/lim_duls_paladin.txt | 2 +- .../l/lord_of_shatterskull_pass.txt | 2 +- res/cardsfolder/m/mage_slayer.txt | 2 +- res/cardsfolder/m/mindstab_thrull.txt | 2 +- res/cardsfolder/m/myr_battlesphere.txt | 4 +-- res/cardsfolder/n/necrite.txt | 2 +- .../n/nefarox_overlord_of_grixis.txt | 2 +- res/cardsfolder/n/nemesis_of_reason.txt | 2 +- res/cardsfolder/o/ogre_marauder.txt | 30 ++++++++-------- res/cardsfolder/o/orcish_squatters.txt | 26 +++++++------- res/cardsfolder/p/port_inspector.txt | 2 +- res/cardsfolder/p/pretenders_claim.txt | 2 +- res/cardsfolder/r/raid_bombardment.txt | 2 +- res/cardsfolder/r/raking_canopy.txt | 4 +-- res/cardsfolder/r/robber_fly.txt | 6 ++-- res/cardsfolder/r/ronin_cliffrider.txt | 2 +- res/cardsfolder/s/scalding_salamander.txt | 2 +- res/cardsfolder/s/shrieking_specter.txt | 2 +- res/cardsfolder/s/sibilant_spirit.txt | 2 +- res/cardsfolder/s/sidar_jabari.txt | 2 +- res/cardsfolder/s/skymark_roc.txt | 2 +- res/cardsfolder/s/spectral_bears.txt | 2 +- res/cardsfolder/s/spectral_force.txt | 2 +- res/cardsfolder/s/suqata_assassin.txt | 2 +- res/cardsfolder/s/swamp_mosquito.txt | 2 +- res/cardsfolder/t/thraximundar.txt | 4 +-- res/cardsfolder/t/thresher_beast.txt | 2 +- res/cardsfolder/t/trepanation_blade.txt | 2 +- res/cardsfolder/x/xantid_swarm.txt | 4 +-- src/main/java/forge/Card.java | 3 +- .../forge/card/trigger/TriggerAttacks.java | 5 +-- 49 files changed, 108 insertions(+), 103 deletions(-) diff --git a/.gitignore b/.gitignore index d46be8104c5..49ae8adb44c 100644 --- a/.gitignore +++ b/.gitignore @@ -323,6 +323,7 @@ res/pics/LRW res/pics/M10 res/pics/M11 res/pics/M12 +res/pics/M13 res/pics/MBP res/pics/MBS res/pics/MIR @@ -333,6 +334,7 @@ res/pics/NMS res/pics/NPH res/pics/ODY res/pics/ONS +res/pics/PC2 res/pics/PCY res/pics/PLC res/pics/PLS @@ -341,6 +343,7 @@ res/pics/POR res/pics/PTK res/pics/RAV res/pics/ROE +res/pics/RTR res/pics/S00 res/pics/S99 res/pics/SCG diff --git a/res/cardsfolder/b/barbed_foliage.txt b/res/cardsfolder/b/barbed_foliage.txt index f5312b8bf7d..d568e4e0d15 100644 --- a/res/cardsfolder/b/barbed_foliage.txt +++ b/res/cardsfolder/b/barbed_foliage.txt @@ -2,7 +2,7 @@ Name:Barbed Foliage ManaCost:2 G G Types:Enchantment Text:no text -T:Mode$ Attacks | ValidCard$ Creature.YouDontCtrl | Attacked$ Player | Execute$ TrigDebuff | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature attacks you, it loses flanking until end of turn. +T:Mode$ Attacks | ValidCard$ Creature | Attacked$ You | Execute$ TrigDebuff | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature attacks you, it loses flanking until end of turn. SVar:TrigDebuff:AB$ Debuff | Cost$ 0 | Defined$ TriggeredAttacker | Keywords$ Flanking T:Mode$ Attacks | ValidCard$ Creature.YouDontCtrl+withoutFlying | Attacked$ Player | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature without flying attacks you, CARDNAME deals 1 damage to it. SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | NumDmg$ 1 | Defined$ TriggeredAttacker diff --git a/res/cardsfolder/b/briar_patch.txt b/res/cardsfolder/b/briar_patch.txt index 2fa5e3a2347..68f63473649 100644 --- a/res/cardsfolder/b/briar_patch.txt +++ b/res/cardsfolder/b/briar_patch.txt @@ -2,8 +2,8 @@ Name:Briar Patch ManaCost:1 G G Types:Enchantment Text:no text -T:Mode$ Attacks | ValidCard$ Creature.YouDontCtrl | Attacked$ Player | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature attacks you, it gets -1/-0 until end of turn. -SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ -1 +T:Mode$ Attacks | ValidCard$ Creature | Attacked$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature attacks you, it gets -1/-0 until end of turn. +SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ -1 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/briar_patch.jpg SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/232.jpg diff --git a/res/cardsfolder/d/dauthi_mindripper.txt b/res/cardsfolder/d/dauthi_mindripper.txt index 65746524d64..c57a35395ce 100644 --- a/res/cardsfolder/d/dauthi_mindripper.txt +++ b/res/cardsfolder/d/dauthi_mindripper.txt @@ -5,7 +5,7 @@ Text:no text PT:2/1 K:Shadow T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may sacrifice it. If you do, defending player discards three cards. -SVar:TrigDiscard:AB$Discard | Cost$ Sac<1/CARDNAME> | Defined$ Opponent | NumCards$ 3 | Mode$ TgtChoose +SVar:TrigDiscard:AB$Discard | Cost$ Sac<1/CARDNAME> | Defined$ DefendingPlayer | NumCards$ 3 | Mode$ TgtChoose SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/dauthi_mindripper.jpg SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/19.jpg diff --git a/res/cardsfolder/f/flint_golem.txt b/res/cardsfolder/f/flint_golem.txt index 13a0a08f614..bf3bb894ae3 100644 --- a/res/cardsfolder/f/flint_golem.txt +++ b/res/cardsfolder/f/flint_golem.txt @@ -4,7 +4,7 @@ Types:Artifact Creature Golem Text:no text PT:2/3 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME becomes blocked, defending player puts the top three cards of his or her library into his or her graveyard. -SVar:TrigMill:AB$Mill | Cost$ 0 | Defined$ Opponent | NumCards$ 3 +SVar:TrigMill:AB$Mill | Cost$ 0 | Defined$ DefendingPlayer | NumCards$ 3 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/flint_golem.jpg SetInfo:NMS|Uncommon|http://magiccards.info/scans/en/ne/130.jpg diff --git a/res/cardsfolder/f/floral_spuzzem.txt b/res/cardsfolder/f/floral_spuzzem.txt index 4e1fff584b7..b81a3b7bf7d 100644 --- a/res/cardsfolder/f/floral_spuzzem.txt +++ b/res/cardsfolder/f/floral_spuzzem.txt @@ -4,7 +4,7 @@ Types:Creature Elemental Text:no text PT:2/2 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may destroy target artifact defending player controls. If you do, CARDNAME assigns no combat damage this turn. -SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact.YouDontCtrl | TgtPrompt$ Select target artifact | SubAbility$ DBPump +SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact.DefenderCtrl | TgtPrompt$ Select target artifact | SubAbility$ DBPump SVar:DBPump:DB$Pump | KW$ HIDDEN CARDNAME assigns no combat damage SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/floral_spuzzem.jpg diff --git a/res/cardsfolder/g/gaeas_liege.txt b/res/cardsfolder/g/gaeas_liege.txt index 71e6c627655..3a05f282d64 100644 --- a/res/cardsfolder/g/gaeas_liege.txt +++ b/res/cardsfolder/g/gaeas_liege.txt @@ -8,7 +8,7 @@ SVar:A:Count$Valid Card.Self+notattacking SVar:X:Count$Valid Forest.YouCtrl S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ Y | SetToughness$ Y | CheckSVar$ B | SVarCompare$ EQ1 SVar:B:Count$Valid Card.Self+attacking -SVar:Y:Count$Valid Forest.YouDontCtrl +SVar:Y:Count$Valid Forest.DefenderCtrl A:AB$Animate | Cost$ T | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ Forest | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | UntilHostLeavesPlay$ True | SpellDescription$ Target land becomes a Forest until CARDNAME leaves the battlefield. SVar:BuffedBy:Forest SVar:RemAIDeck:True diff --git a/res/cardsfolder/g/goblin_vandal.txt b/res/cardsfolder/g/goblin_vandal.txt index c3107575241..85de5b9cb1d 100644 --- a/res/cardsfolder/g/goblin_vandal.txt +++ b/res/cardsfolder/g/goblin_vandal.txt @@ -4,7 +4,7 @@ Types:Creature Goblin Rogue Text:no text PT:1/1 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may pay R. If you do, destroy target artifact defending player controls and CARDNAME assigns no combat damage this turn. -SVar:TrigDestroy:AB$Destroy | Cost$ R | ValidTgts$ Artifact.YouDontCtrl | TgtPrompt$ Select target artifact defending player controls | SubAbility$ DBPump | Mandatory$ True +SVar:TrigDestroy:AB$Destroy | Cost$ R | ValidTgts$ Artifact.DefenderCtrl | TgtPrompt$ Select target artifact defending player controls | SubAbility$ DBPump | Mandatory$ True SVar:DBPump:DB$Pump | KW$ HIDDEN CARDNAME assigns no combat damage SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_vandal.jpg diff --git a/res/cardsfolder/g/grimgrin_corpse_born.txt b/res/cardsfolder/g/grimgrin_corpse_born.txt index adbadf07e3f..79e06fa54b7 100644 --- a/res/cardsfolder/g/grimgrin_corpse_born.txt +++ b/res/cardsfolder/g/grimgrin_corpse_born.txt @@ -1,19 +1,19 @@ -Name:Grimgrin, Corpse-Born -ManaCost:3 U B -Types:Legendary Creature Zombie Warrior -Text:no text -PT:5/5 -K:CARDNAME enters the battlefield tapped. -K:CARDNAME doesn't untap during your untap step. -A:AB$ Untap | Cost$ Sac<1/Creature.Other> | SubAbility$ DBPutCounter | SpellDescription$ Untap CARDNAME and put a +1/+1 counter on it. -SVar:DBPutCounter:DB$PutCounter | Cost$ 0 | CounterType$ P1P1 | CounterNum$1 -T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME attacks, destroy target creature defending player controls, then put a +1/+1 counter on CARDNAME. -SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature | SubAbility$ DBPutCounter -SVar:DBPutCounter:DB$PutCounter | Cost$ 0 | CounterType$ P1P1 | CounterNum$1 -SVar:RemAIDeck:True -SVar:HasAttackEffect:TRUE -SVar:Rarity:Mythic -SVar:Picture:http://www.wizards.com/global/images/magic/general/grimgrin_corpse_born.jpg -SetInfo:ISD|Mythic|http://magiccards.info/scans/en/isd/214.jpg -Oracle:Grimgrin, Corpse-Born enters the battlefield tapped and doesn't untap during your untap step.\nSacrifice another creature: Untap Grimgrin and put a +1/+1 counter on it.\nWhenever Grimgrin attacks, destroy target creature defending player controls, then put a +1/+1 counter on Grimgrin. +Name:Grimgrin, Corpse-Born +ManaCost:3 U B +Types:Legendary Creature Zombie Warrior +Text:no text +PT:5/5 +K:CARDNAME enters the battlefield tapped. +K:CARDNAME doesn't untap during your untap step. +A:AB$ Untap | Cost$ Sac<1/Creature.Other> | SubAbility$ DBPutCounter | SpellDescription$ Untap CARDNAME and put a +1/+1 counter on it. +SVar:DBPutCounter:DB$PutCounter | Cost$ 0 | CounterType$ P1P1 | CounterNum$1 +T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME attacks, destroy target creature defending player controls, then put a +1/+1 counter on CARDNAME. +SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Select target creature | SubAbility$ DBPutCounter +SVar:DBPutCounter:DB$PutCounter | Cost$ 0 | CounterType$ P1P1 | CounterNum$1 +SVar:RemAIDeck:True +SVar:HasAttackEffect:TRUE +SVar:Rarity:Mythic +SVar:Picture:http://www.wizards.com/global/images/magic/general/grimgrin_corpse_born.jpg +SetInfo:ISD|Mythic|http://magiccards.info/scans/en/isd/214.jpg +Oracle:Grimgrin, Corpse-Born enters the battlefield tapped and doesn't untap during your untap step.\nSacrifice another creature: Untap Grimgrin and put a +1/+1 counter on it.\nWhenever Grimgrin attacks, destroy target creature defending player controls, then put a +1/+1 counter on Grimgrin. End \ No newline at end of file diff --git a/res/cardsfolder/g/guiltfeeder.txt b/res/cardsfolder/g/guiltfeeder.txt index 754bafd69cb..dd61b8eb02c 100644 --- a/res/cardsfolder/g/guiltfeeder.txt +++ b/res/cardsfolder/g/guiltfeeder.txt @@ -5,7 +5,7 @@ Text:no text PT:0/4 K:Fear T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, defending player loses 1 life for each card in his or her graveyard. -SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ X | References$ X +SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ DefendingPlayer | LifeAmount$ X | References$ X SVar:X:Count$InOppYard SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/guiltfeeder.jpg diff --git a/res/cardsfolder/h/harbor_guardian.txt b/res/cardsfolder/h/harbor_guardian.txt index 02fd1a48d49..3b87dd1c18e 100644 --- a/res/cardsfolder/h/harbor_guardian.txt +++ b/res/cardsfolder/h/harbor_guardian.txt @@ -5,7 +5,7 @@ Text:no text PT:3/4 K:Reach T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | OptionalDecider$ Opponent | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME attacks, defending player may draw a card. -SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ Opponent | NumCards$ 1 +SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ DefendingPlayer | NumCards$ 1 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/harbor_guardian.jpg SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/326.jpg diff --git a/res/cardsfolder/h/hellrider.txt b/res/cardsfolder/h/hellrider.txt index 49ada1ad203..979d023bb6b 100644 --- a/res/cardsfolder/h/hellrider.txt +++ b/res/cardsfolder/h/hellrider.txt @@ -5,7 +5,7 @@ Text:no text PT:3/3 K:Haste T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control attacks, CARDNAME deals 1 damage to defending player. -SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ 1 +SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ DefendingPlayer | NumDmg$ 1 SVar:Picture:http://www.wizards.com/global/images/magic/general/hellrider.jpg SetInfo:DKA|Rare|http://magiccards.info/scans/en/dka/93.jpg Oracle:Haste\nWhenever a creature you control attacks, Hellrider deals 1 damage to defending player. diff --git a/res/cardsfolder/h/hissing_miasma.txt b/res/cardsfolder/h/hissing_miasma.txt index ef69ac442ec..cfe95e2a392 100644 --- a/res/cardsfolder/h/hissing_miasma.txt +++ b/res/cardsfolder/h/hissing_miasma.txt @@ -2,8 +2,8 @@ Name:Hissing Miasma ManaCost:1 B B Types:Enchantment Text:no text -T:Mode$ Attacks | ValidCard$ Creature.YouDontCtrl | Attacked$ Player | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature attacks you, its controller loses 1 life. -SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1 | SpellDescription$ Whenever a creature attacks you, its controller loses 1 life. +T:Mode$ Attacks | ValidCard$ Creature | Attacked$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature attacks you, its controller loses 1 life. +SVar:TrigLoseLife:AB$ LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1 | SpellDescription$ Whenever a creature attacks you, its controller loses 1 life. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/hissing_miasma.jpg SetInfo:GPT|Uncommon|http://magiccards.info/scans/en/gp/51.jpg diff --git a/res/cardsfolder/j/jangling_automaton.txt b/res/cardsfolder/j/jangling_automaton.txt index 28b31f78d4f..b375dd9bbd1 100644 --- a/res/cardsfolder/j/jangling_automaton.txt +++ b/res/cardsfolder/j/jangling_automaton.txt @@ -4,7 +4,7 @@ Types:Artifact Creature Construct Text:no text PT:3/2 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME attacks, untap all creatures defending player controls. -SVar:TrigUntap:AB$UntapAll | Cost$ 0 | ValidCards$ Creature.YouDontCtrl +SVar:TrigUntap:AB$UntapAll | Cost$ 0 | ValidCards$ Creature.DefenderCtrl SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/jangling_automaton.jpg diff --git a/res/cardsfolder/k/kazuul_tyrant_of_the_cliffs.txt b/res/cardsfolder/k/kazuul_tyrant_of_the_cliffs.txt index 521da828728..ca577daf33f 100644 --- a/res/cardsfolder/k/kazuul_tyrant_of_the_cliffs.txt +++ b/res/cardsfolder/k/kazuul_tyrant_of_the_cliffs.txt @@ -3,8 +3,8 @@ ManaCost:3 R R Types:Legendary Creature Ogre Warrior Text:no text PT:5/4 -T:Mode$ Attacks | ValidCard$ Creature.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a creature an opponent controls attacks, if you're the defending player, put a 3/3 red Ogre creature token onto the battlefield unless that creature's controller pays 3. -SVar:TrigToken:AB$Token | Cost$ 0 | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Ogre | TokenColors$ Red | TokenTypes$ Creature,Ogre | TokenPower$ 3 | TokenToughness$ 3 | UnlessCost$ 3 | UnlessPayer$ TriggeredAttackerController +T:Mode$ Attacks | ValidCard$ Creature | Attacked$ You,Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a creature an opponent controls attacks, if you're the defending player, put a 3/3 red Ogre creature token onto the battlefield unless that creature's controller pays 3. +SVar:TrigToken:AB$ Token | Cost$ 0 | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Ogre | TokenColors$ Red | TokenTypes$ Creature,Ogre | TokenPower$ 3 | TokenToughness$ 3 | UnlessCost$ 3 | UnlessPayer$ TriggeredAttackerController SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/kazuul_tyrant_of_the_cliffs.jpg SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/84.jpg diff --git a/res/cardsfolder/k/keeper_of_tresserhorn.txt b/res/cardsfolder/k/keeper_of_tresserhorn.txt index ce5502b5144..82ece0d371a 100644 --- a/res/cardsfolder/k/keeper_of_tresserhorn.txt +++ b/res/cardsfolder/k/keeper_of_tresserhorn.txt @@ -4,8 +4,8 @@ Types:Creature Avatar Text:no text PT:6/6 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, it assigns no combat damage this turn and defending player loses 2 life. -SVar:TrigPump:DB$Pump | Cost$ 0 | KW$ HIDDEN CARDNAME assigns no combat damage | SubAbility$ DBLose -SVar:DBLose:DB$LoseLife | Defined$ Opponent | LifeAmount$ 2 +SVar:TrigPump:DB$ Pump | Cost$ 0 | KW$ HIDDEN CARDNAME assigns no combat damage | SubAbility$ DBLose +SVar:DBLose:DB$ LoseLife | Defined$ DefendingPlayer | LifeAmount$ 2 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/keeper_of_tresserhorn.jpg SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/14.jpg diff --git a/res/cardsfolder/k/kukemssa_pirates.txt b/res/cardsfolder/k/kukemssa_pirates.txt index 0b44c4f310c..61f807cee85 100644 --- a/res/cardsfolder/k/kukemssa_pirates.txt +++ b/res/cardsfolder/k/kukemssa_pirates.txt @@ -4,8 +4,8 @@ Types:Creature Human Pirate Text:no text PT:2/2 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may gain control of target artifact defending player controls. If you do, CARDNAME assigns no combat damage this turn. -SVar:TrigGainControl:AB$GainControl | Cost$ 0 | ValidTgts$ Artifact.YouDontCtrl | TgtPrompt$ Select target artifact defending player controls | SubAbility$ DBNoCombatDamage -SVar:DBNoCombatDamage:DB$Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage +SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | ValidTgts$ Artifact.DefenderCtrl | TgtPrompt$ Select target artifact defending player controls | SubAbility$ DBNoCombatDamage +SVar:DBNoCombatDamage:DB$ Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/kukemssa_pirates.jpg SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/71.jpg diff --git a/res/cardsfolder/l/latullas_orders.txt b/res/cardsfolder/l/latullas_orders.txt index 2d8caa3abcd..3d4978993df 100644 --- a/res/cardsfolder/l/latullas_orders.txt +++ b/res/cardsfolder/l/latullas_orders.txt @@ -6,7 +6,7 @@ K:Flash K:Enchant creature A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AITgts$ Card.powerGE1 | AILogic$ Pump T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ Whenever enchanted creature deals combat damage to defending player, you may destroy target artifact that player controls. -SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact.YouDontCtrl | TgtPrompt$ Select target artifact +SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact.DefenderCtrl | TgtPrompt$ Select target artifact SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/latullas_orders.jpg SetInfo:PCY|Common|http://magiccards.info/scans/en/pr/96.jpg diff --git a/res/cardsfolder/l/lim_duls_paladin.txt b/res/cardsfolder/l/lim_duls_paladin.txt index 2295ad855fc..bf330005041 100644 --- a/res/cardsfolder/l/lim_duls_paladin.txt +++ b/res/cardsfolder/l/lim_duls_paladin.txt @@ -13,7 +13,7 @@ T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | TriggerZones$ B SVar:TrigBlockedPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 6 | NumDef$ 3 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ TrigUnBlockedPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, it assigns no combat damage to defending player this turn and that player loses 4 life. SVar:TrigUnBlockedPump:AB$ Pump | Cost$ 0 | KW$ HIDDEN CARDNAME assigns no combat damage | SubAbility$ DBLoseLife -SVar:DBLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 4 +SVar:DBLoseLife:DB$ LoseLife | Defined$ DefendingPlayer | LifeAmount$ 4 SVar:X:Remembered$Amount SVar:RemAIDeck:True SVar:Rarity:Uncommon diff --git a/res/cardsfolder/l/lord_of_shatterskull_pass.txt b/res/cardsfolder/l/lord_of_shatterskull_pass.txt index 3b198267c77..78236ec7aa3 100644 --- a/res/cardsfolder/l/lord_of_shatterskull_pass.txt +++ b/res/cardsfolder/l/lord_of_shatterskull_pass.txt @@ -10,7 +10,7 @@ S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddTr SVar:X:Count$Valid Card.Self+counters_GE1_LEVEL+counters_LE5_LEVEL SVar:Y:Count$Valid Card.Self+counters_GE6_LEVEL SVar:TriggerDamage:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, it deals 6 damage to each creature defending player controls. -SVar:TrigDamage:AB$DamageAll | Cost$ 0 | ValidCards$ Creature.YouDontCtrl | NumDmg$ 6 +SVar:TrigDamage:AB$DamageAll | Cost$ 0 | ValidCards$ Creature.DefenderCtrl | NumDmg$ 6 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/lord_of_shatterskull_pass.jpg SetInfo:ROE|Rare|http://magiccards.info/scans/en/roe/156.jpg diff --git a/res/cardsfolder/m/mage_slayer.txt b/res/cardsfolder/m/mage_slayer.txt index 29ff8ab3eba..477c64aa7f4 100644 --- a/res/cardsfolder/m/mage_slayer.txt +++ b/res/cardsfolder/m/mage_slayer.txt @@ -4,7 +4,7 @@ Types:Artifact Equipment Text:no text K:Equip 3 T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigDamage | TriggerDescription$ Whenever equipped creature attacks, it deals damage equal to its power to defending player. -SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Opponent | DamageSource$ Equipped | TgtPrompt$ Select target opponent or planeswalker | NumDmg$ X | References$ X +SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | ValidTgts$ DefendingPlayer | DamageSource$ Equipped | TgtPrompt$ Select target opponent or planeswalker | NumDmg$ X | References$ X SVar:X:TriggeredAttacker$CardPower S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddSVar$ AE SVar:AE:SVar:HasAttackEffect:TRUE diff --git a/res/cardsfolder/m/mindstab_thrull.txt b/res/cardsfolder/m/mindstab_thrull.txt index f435f163b6e..0d7842b3a18 100644 --- a/res/cardsfolder/m/mindstab_thrull.txt +++ b/res/cardsfolder/m/mindstab_thrull.txt @@ -4,7 +4,7 @@ Types:Creature Thrull Text:no text PT:2/2 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may sacrifice it. If you do, defending player discards three cards. -SVar:TrigDiscard:AB$Discard | Cost$ Sac<1/CARDNAME> | Defined$ Opponent | NumCards$ 3 | Mode$ TgtChoose +SVar:TrigDiscard:AB$Discard | Cost$ Sac<1/CARDNAME> | Defined$ DefendingPlayer | NumCards$ 3 | Mode$ TgtChoose SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/mindstab_thrull.jpg SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/40.jpg diff --git a/res/cardsfolder/m/myr_battlesphere.txt b/res/cardsfolder/m/myr_battlesphere.txt index 67a4f2bc2d6..d7e6eb884d3 100644 --- a/res/cardsfolder/m/myr_battlesphere.txt +++ b/res/cardsfolder/m/myr_battlesphere.txt @@ -3,10 +3,10 @@ ManaCost:7 Types:Artifact Creature Myr Construct PT:4/7 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put four 1/1 colorless Myr artifact creature tokens onto the battlefield. -SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 4 | TokenName$ Myr | TokenTypes$ Artifact,Creature,Myr | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 +SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 4 | TokenName$ Myr | TokenTypes$ Artifact,Creature,Myr | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, you may tap X untapped Myr you control. If you do, CARDNAME gets +X/+0 until end of turn and deals X damage to defending player. SVar:TrigPump:AB$ Pump | Cost$ tapXType | References$ X | NumAtt$ +ChosenX | NumDef$ +0 | SubAbility$ DBDealDamage -SVar:DBDealDamage:DB$ DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ ChosenX | SubAbility$ DBCleanup +SVar:DBDealDamage:DB$ DealDamage | Cost$ 0 | Defined$ DefendingPlayer | NumDmg$ ChosenX | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearChosenX$ True SVar:X:XChoice SVar:Rarity:Rare diff --git a/res/cardsfolder/n/necrite.txt b/res/cardsfolder/n/necrite.txt index 86ab685f316..1821eda3133 100644 --- a/res/cardsfolder/n/necrite.txt +++ b/res/cardsfolder/n/necrite.txt @@ -4,7 +4,7 @@ Types:Creature Thrull Text:no text PT:2/2 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may sacrifice it. If you do, destroy target creature defending player controls. It can't be regenerated. -SVar:TrigDestroy:AB$Destroy | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature defending player controls | NoRegen$ True +SVar:TrigDestroy:AB$Destroy | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Select target creature defending player controls | NoRegen$ True SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/necrite.jpg diff --git a/res/cardsfolder/n/nefarox_overlord_of_grixis.txt b/res/cardsfolder/n/nefarox_overlord_of_grixis.txt index 881feb3d56d..86a3bf0ef48 100644 --- a/res/cardsfolder/n/nefarox_overlord_of_grixis.txt +++ b/res/cardsfolder/n/nefarox_overlord_of_grixis.txt @@ -6,7 +6,7 @@ PT:5/5 K:Flying K:Exalted T:Mode$ Attacks | ValidCard$ Card.Self | Alone$ True | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME attacks alone, defending player sacrifices a creature. -SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ Opponent | SacValid$ Creature +SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ DefendingPlayer | SacValid$ Creature SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/nefarox_overlord_of_grixis.jpg diff --git a/res/cardsfolder/n/nemesis_of_reason.txt b/res/cardsfolder/n/nemesis_of_reason.txt index 6336a1b397f..c51d975a7d1 100644 --- a/res/cardsfolder/n/nemesis_of_reason.txt +++ b/res/cardsfolder/n/nemesis_of_reason.txt @@ -4,7 +4,7 @@ Types:Creature Leviathan Horror Text:no text PT:3/7 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME attacks, defending player puts the top ten cards of his or her library into his or her graveyard. -SVar:TrigMill:AB$Mill | Cost$ 0 | Defined$ Opponent | NumCards$ 10 +SVar:TrigMill:AB$ Mill | Cost$ 0 | Defined$ DefendingPlayer | NumCards$ 10 SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/nemesis_of_reason.jpg diff --git a/res/cardsfolder/o/ogre_marauder.txt b/res/cardsfolder/o/ogre_marauder.txt index 2e7577d52fb..f328d41108b 100644 --- a/res/cardsfolder/o/ogre_marauder.txt +++ b/res/cardsfolder/o/ogre_marauder.txt @@ -1,16 +1,16 @@ -Name:Ogre Marauder -ManaCost:1 B B -Types:Creature Ogre Warrior -Text:no text -PT:3/1 -T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigOgreMarauderSacrifice | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, it gains "Ogre Marauder is unblockable" until end of turn unless defending player sacrifices a creature. -SVar:TrigOgreMarauderSacrifice:AB$ Sacrifice | Cost$ 0 | SacValid$ Creature | Defined$ Opponent | Optional$ True | RememberSacrificed$ True | SubAbility$ DBOgreMarauderPump -SVar:DBOgreMarauderPump:DB$ Pump | Defined$ Self | KW$ HIDDEN Unblockable | ConditionDefined$ Remembered | ConditionPresent$ Creature | ConditionCompare$ EQ0 | SubAbility$ DBOgreMarauderCleanup -SVar:DBOgreMarauderCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:RemAIDeck:True -SVar:RemRandomDeck:True -SVar:Rarity:Uncommon -SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_marauder.jpg -SetInfo:BOK|Uncommon|http://magiccards.info/scans/en/bok/75.jpg -Oracle:Whenever Ogre Marauder attacks, it gains "Ogre Marauder is unblockable" until end of turn unless defending player sacrifices a creature. +Name:Ogre Marauder +ManaCost:1 B B +Types:Creature Ogre Warrior +Text:no text +PT:3/1 +T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigOgreMarauderSacrifice | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, it gains "Ogre Marauder is unblockable" until end of turn unless defending player sacrifices a creature. +SVar:TrigOgreMarauderSacrifice:AB$ Sacrifice | Cost$ 0 | SacValid$ Creature | Defined$ DefendingPlayer | Optional$ True | RememberSacrificed$ True | SubAbility$ DBOgreMarauderPump +SVar:DBOgreMarauderPump:DB$ Pump | Defined$ Self | KW$ HIDDEN Unblockable | ConditionDefined$ Remembered | ConditionPresent$ Creature | ConditionCompare$ EQ0 | SubAbility$ DBOgreMarauderCleanup +SVar:DBOgreMarauderCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:RemAIDeck:True +SVar:RemRandomDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_marauder.jpg +SetInfo:BOK|Uncommon|http://magiccards.info/scans/en/bok/75.jpg +Oracle:Whenever Ogre Marauder attacks, it gains "Ogre Marauder is unblockable" until end of turn unless defending player sacrifices a creature. End \ No newline at end of file diff --git a/res/cardsfolder/o/orcish_squatters.txt b/res/cardsfolder/o/orcish_squatters.txt index b94db706ddc..2b9a8c52641 100644 --- a/res/cardsfolder/o/orcish_squatters.txt +++ b/res/cardsfolder/o/orcish_squatters.txt @@ -1,14 +1,14 @@ -Name:Orcish Squatters -ManaCost:4 R -Types:Creature Orc -Text:no text -PT:2/3 -T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may gain control of target land defending player controls for as long as you control CARDNAME. If you do, CARDNAME assigns no combat damage this turn. -SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | ValidTgts$ Land.YouDontCtrl | TgtPrompt$ Select target land opponent controls | LoseControl$ LoseControl,LeavesPlay | SubAbility$ DBPump -SVar:DBPump:DB$ Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_squatters.jpg -SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/258.jpg -SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/211.jpg -Oracle:Whenever Orcish Squatters attacks and isn't blocked, you may gain control of target land defending player controls for as long as you control Orcish Squatters. If you do, Orcish Squatters assigns no combat damage this turn. +Name:Orcish Squatters +ManaCost:4 R +Types:Creature Orc +Text:no text +PT:2/3 +T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may gain control of target land defending player controls for as long as you control CARDNAME. If you do, CARDNAME assigns no combat damage this turn. +SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | ValidTgts$ Land.DefenderCtrl | TgtPrompt$ Select target land opponent controls | LoseControl$ LoseControl,LeavesPlay | SubAbility$ DBPump +SVar:DBPump:DB$ Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_squatters.jpg +SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/258.jpg +SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/211.jpg +Oracle:Whenever Orcish Squatters attacks and isn't blocked, you may gain control of target land defending player controls for as long as you control Orcish Squatters. If you do, Orcish Squatters assigns no combat damage this turn. End \ No newline at end of file diff --git a/res/cardsfolder/p/port_inspector.txt b/res/cardsfolder/p/port_inspector.txt index bf41167752c..02ffae60b3d 100644 --- a/res/cardsfolder/p/port_inspector.txt +++ b/res/cardsfolder/p/port_inspector.txt @@ -4,7 +4,7 @@ Types:Creature Human Text:no text PT:1/2 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerDescription$ Whenever CARDNAME becomes blocked, you may look at defending player's hand. -SVar:TrigPeek:AB$RevealHand | Cost$ 0 | Defined$ Opponent +SVar:TrigPeek:AB$RevealHand | Cost$ 0 | Defined$ DefendingPlayer SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/port_inspector.jpg SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/90.jpg diff --git a/res/cardsfolder/p/pretenders_claim.txt b/res/cardsfolder/p/pretenders_claim.txt index 8ffe2b0b2a5..3898194d47b 100644 --- a/res/cardsfolder/p/pretenders_claim.txt +++ b/res/cardsfolder/p/pretenders_claim.txt @@ -5,7 +5,7 @@ Text:no text K:Enchant creature A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump T:Mode$ AttackerBlocked | ValidCard$ Card.AttachedBy | Execute$ TrigTapAll | TriggerDescription$ Whenever enchanted creature becomes blocked, tap all lands defending player controls. -SVar:TrigTapAll:AB$TapAll | Cost$ 0 | ValidCards$ Land.YouDontCtrl +SVar:TrigTapAll:AB$TapAll | Cost$ 0 | ValidCards$ Land.DefenderCtrl SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/pretenders_claim.jpg SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/151.jpg diff --git a/res/cardsfolder/r/raid_bombardment.txt b/res/cardsfolder/r/raid_bombardment.txt index f3a1fb22dbc..0367955cfb5 100644 --- a/res/cardsfolder/r/raid_bombardment.txt +++ b/res/cardsfolder/r/raid_bombardment.txt @@ -3,7 +3,7 @@ ManaCost:2 R Types:Enchantment Text:no text T:Mode$ Attacks | ValidCard$ Creature.powerLE2+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature you control with power 2 or less attacks, CARDNAME deals 1 damage to defending player. -SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ 1 +SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ DefendingPlayer | NumDmg$ 1 SVar:PlayMain1:TRUE SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/raid_bombardment.jpg diff --git a/res/cardsfolder/r/raking_canopy.txt b/res/cardsfolder/r/raking_canopy.txt index 2a0a34f074e..c8a67eeb62d 100644 --- a/res/cardsfolder/r/raking_canopy.txt +++ b/res/cardsfolder/r/raking_canopy.txt @@ -2,8 +2,8 @@ Name:Raking Canopy ManaCost:1 G G Types:Enchantment Text:no text -T:Mode$ Attacks | ValidCard$ Creature.YouDontCtrl+withFlying | Attacked$ Player | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature with flying attacks you, CARDNAME deals 4 damage to it. -SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 4 +T:Mode$ Attacks | ValidCard$ Creature.withFlying | Attacked$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature with flying attacks you, CARDNAME deals 4 damage to it. +SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 4 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/raking_canopy.jpg SetInfo:SHM|Uncommon|http://magiccards.info/scans/en/shm/127.jpg diff --git a/res/cardsfolder/r/robber_fly.txt b/res/cardsfolder/r/robber_fly.txt index 8074adffe1c..facd3c6f0fb 100644 --- a/res/cardsfolder/r/robber_fly.txt +++ b/res/cardsfolder/r/robber_fly.txt @@ -5,9 +5,9 @@ Text:no text PT:1/1 K:Flying T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME becomes blocked, defending player discards all the cards in his or her hand, then draws that many cards. -SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ Opponent | Mode$ Hand | RememberDiscarded$ True | SubAbility$ DBDraw -SVar:DBDraw:DB$ Draw | NumCards$ X | Defined$ Opponent | SubAbility$ DBCleanup | References$ X -SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True +SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ DefendingPlayer | Mode$ Hand | RememberDiscarded$ True | SubAbility$ DBDraw +SVar:DBDraw:DB$ Draw | NumCards$ X | Defined$ DefendingPlayer | SubAbility$ DBCleanup | References$ X +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$Amount SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/robber_fly.jpg diff --git a/res/cardsfolder/r/ronin_cliffrider.txt b/res/cardsfolder/r/ronin_cliffrider.txt index 1344fece836..644670f73b6 100644 --- a/res/cardsfolder/r/ronin_cliffrider.txt +++ b/res/cardsfolder/r/ronin_cliffrider.txt @@ -5,7 +5,7 @@ Text:no text PT:2/2 K:Bushido 1 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamage | OptionalDecider$ You| TriggerDescription$ Whenever CARDNAME attacks, you may have it deal 1 damage to each creature defending player controls. -SVar:TrigDamage:AB$DamageAll | Cost$ 0 | ValidCards$ Creature.YouDontCtrl | NumDmg$ 1| ValidDescription$ each creature defending player controls. +SVar:TrigDamage:AB$DamageAll | Cost$ 0 | ValidCards$ Creature.DefenderCtrl | NumDmg$ 1| ValidDescription$ each creature defending player controls. SVar:HasAttackEffect:TRUE SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/ronin_cliffrider.jpg diff --git a/res/cardsfolder/s/scalding_salamander.txt b/res/cardsfolder/s/scalding_salamander.txt index 7822870fbfe..6d585dcff6f 100644 --- a/res/cardsfolder/s/scalding_salamander.txt +++ b/res/cardsfolder/s/scalding_salamander.txt @@ -4,7 +4,7 @@ Types:Creature Salamander Text:no text PT:2/1 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks, you may have it deal 1 damage to each creature without flying defending player controls. -SVar:TrigDamage:AB$DamageAll | Cost$ 0 | NumDmg$ 1 | ValidCards$ Creature.withoutFlying+YouDontCtrl +SVar:TrigDamage:AB$DamageAll | Cost$ 0 | NumDmg$ 1 | ValidCards$ Creature.withoutFlying+DefenderCtrl SVar:HasAttackEffect:TRUE SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/scalding_salamander.jpg diff --git a/res/cardsfolder/s/shrieking_specter.txt b/res/cardsfolder/s/shrieking_specter.txt index 633d1b2657e..0da2fbda58a 100644 --- a/res/cardsfolder/s/shrieking_specter.txt +++ b/res/cardsfolder/s/shrieking_specter.txt @@ -5,7 +5,7 @@ Text:no text PT:2/2 K:Flying T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME attacks, defending player discards a card. -SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose +SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ DefendingPlayer | NumCards$ 1 | Mode$ TgtChoose SVar:HasAttackEffect:TRUE SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/shrieking_specter.jpg diff --git a/res/cardsfolder/s/sibilant_spirit.txt b/res/cardsfolder/s/sibilant_spirit.txt index 81d840e4cc8..0da2a2ffebc 100644 --- a/res/cardsfolder/s/sibilant_spirit.txt +++ b/res/cardsfolder/s/sibilant_spirit.txt @@ -5,7 +5,7 @@ Text:no text PT:5/6 K:Flying T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | OptionalDecider$ Opponent | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME attacks, defending player may draw a card. -SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ Opponent | NumCards$ 1 +SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ DefendingPlayer | NumCards$ 1 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/sibilant_spirit.jpg SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/123.jpg diff --git a/res/cardsfolder/s/sidar_jabari.txt b/res/cardsfolder/s/sidar_jabari.txt index 95016b90b5e..af879a19f58 100644 --- a/res/cardsfolder/s/sidar_jabari.txt +++ b/res/cardsfolder/s/sidar_jabari.txt @@ -5,7 +5,7 @@ Text:no text PT:2/2 K:Flanking T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, tap target creature defending player controls. -SVar:TrigTap:AB$Tap | Cost$ 0 | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature defending player controls +SVar:TrigTap:AB$Tap | Cost$ 0 | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Select target creature defending player controls SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/sidar_jabari.jpg SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/243.jpg diff --git a/res/cardsfolder/s/skymark_roc.txt b/res/cardsfolder/s/skymark_roc.txt index 6e7dba64505..1cd13c67507 100644 --- a/res/cardsfolder/s/skymark_roc.txt +++ b/res/cardsfolder/s/skymark_roc.txt @@ -5,7 +5,7 @@ Text:no text PT:3/3 K:Flying T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigBounce | TriggerDescription$ Whenever CARDNAME attacks, you may return target creature defending player controls with toughness 2 or less to its owner's hand. -SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouDontCtrl+toughnessLE2 | TgtPrompt$ Choose creature you don't control with toughness 2 or less | Origin$ Battlefield | Destination$ Hand +SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.DefenderCtrl+toughnessLE2 | TgtPrompt$ Choose creature you don't control with toughness 2 or less | Origin$ Battlefield | Destination$ Hand SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/skymark_roc.jpg SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/196.jpg diff --git a/res/cardsfolder/s/spectral_bears.txt b/res/cardsfolder/s/spectral_bears.txt index 4e8a5e6ecea..d86cd945db6 100644 --- a/res/cardsfolder/s/spectral_bears.txt +++ b/res/cardsfolder/s/spectral_bears.txt @@ -3,7 +3,7 @@ ManaCost:1 G Types:Creature Bear Spirit Text:no text PT:3/3 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ StayTapped | IsPresent$ Permanent.Black+nonToken+YouDontCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no black nontoken permanents, it doesn't untap during your next untap step. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ StayTapped | IsPresent$ Permanent.Black+nonToken+DefenderCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no black nontoken permanents, it doesn't untap during your next untap step. SVar:StayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/spectral_bears.jpg diff --git a/res/cardsfolder/s/spectral_force.txt b/res/cardsfolder/s/spectral_force.txt index 2744a1cfa23..46c19c444a3 100644 --- a/res/cardsfolder/s/spectral_force.txt +++ b/res/cardsfolder/s/spectral_force.txt @@ -4,7 +4,7 @@ Types:Creature Elemental Spirit Text:no text PT:8/8 K:Trample -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ StayTapped | IsPresent$ Permanent.Black+nonToken+YouDontCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no black nontoken permanents, it doesn't untap during your next untap step. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ StayTapped | IsPresent$ Permanent.Black+nonToken+DefenderCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no black nontoken permanents, it doesn't untap during your next untap step. SVar:StayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/spectral_force.jpg diff --git a/res/cardsfolder/s/suqata_assassin.txt b/res/cardsfolder/s/suqata_assassin.txt index 59abd1b68ae..129c8f517cd 100644 --- a/res/cardsfolder/s/suqata_assassin.txt +++ b/res/cardsfolder/s/suqata_assassin.txt @@ -5,7 +5,7 @@ Text:no text PT:1/1 K:Fear T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPoison | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, defending player gets a poison counter. (A player with ten or more poison counters loses the game.) -SVar:TrigPoison:AB$Poison | Cost$ 0 | Defined$ Opponent | Num$ 1 +SVar:TrigPoison:AB$Poison | Cost$ 0 | Defined$ DefendingPlayer | Num$ 1 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/suqata_assassin.jpg SetInfo:VIS|Uncommon|http://magiccards.info/scans/en/vi/19.jpg diff --git a/res/cardsfolder/s/swamp_mosquito.txt b/res/cardsfolder/s/swamp_mosquito.txt index b2c31509071..dc457e555d0 100644 --- a/res/cardsfolder/s/swamp_mosquito.txt +++ b/res/cardsfolder/s/swamp_mosquito.txt @@ -5,7 +5,7 @@ Text:no text PT:0/1 K:Flying T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPoison | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, defending player gets a poison counter. (A player with ten or more poison counters loses the game.) -SVar:TrigPoison:AB$Poison | Cost$ 0 | Defined$ Opponent | Num$ 1 +SVar:TrigPoison:AB$Poison | Cost$ 0 | Defined$ DefendingPlayer | Num$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/swamp_mosquito.jpg SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/30.jpg|2 diff --git a/res/cardsfolder/t/thraximundar.txt b/res/cardsfolder/t/thraximundar.txt index 5126c2d97f9..4c9ee8c8f5d 100644 --- a/res/cardsfolder/t/thraximundar.txt +++ b/res/cardsfolder/t/thraximundar.txt @@ -6,8 +6,8 @@ PT:6/6 K:Haste T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ Whenever Thraximundar attacks, defending player sacrifices a creature. T:Mode$ Sacrificed | ValidCard$ Creature | Execute$ TrigPutCounter | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever a player sacrifices a creature, you may put a +1/+1 counter on CARDNAME. -SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Opponent | SacValid$ Creature -SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 +SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ DefendingPlayer | SacValid$ Creature +SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 SVar:HasAttackEffect:TRUE SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/thraximundar.jpg diff --git a/res/cardsfolder/t/thresher_beast.txt b/res/cardsfolder/t/thresher_beast.txt index 2af130de1e2..5745e947083 100644 --- a/res/cardsfolder/t/thresher_beast.txt +++ b/res/cardsfolder/t/thresher_beast.txt @@ -4,7 +4,7 @@ Types:Creature Beast Text:no text PT:4/4 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME becomes blocked, defending player sacrifices a land. -SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Land | Defined$ Opponent | ChangeNum$ 1 +SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Land | Defined$ DefendingPlayer | ChangeNum$ 1 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/thresher_beast.jpg SetInfo:PCY|Common|http://magiccards.info/scans/en/pr/128.jpg diff --git a/res/cardsfolder/t/trepanation_blade.txt b/res/cardsfolder/t/trepanation_blade.txt index 930729cbea8..649f291fa59 100644 --- a/res/cardsfolder/t/trepanation_blade.txt +++ b/res/cardsfolder/t/trepanation_blade.txt @@ -4,7 +4,7 @@ Types:Artifact Equipment Text:no text K:Equip 2 T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigDig | TriggerDescription$ Whenever equipped creature attacks, defending player reveals cards from the top of his or her library until he or she reveals a land card. The creature gets +1/+0 until end of turn for each card revealed this way. That player puts the revealed cards into his or her graveyard. -SVar:TrigDig:AB$DigUntil | Defined$ Opponent | Cost$ 0 | Valid$ Land | ValidDescription$ land | RevealedDestination$ Graveyard | RememberRevealed$ True | SubAbility$ TrigPump +SVar:TrigDig:AB$DigUntil | Defined$ DefendingPlayer | Cost$ 0 | Valid$ Land | ValidDescription$ land | RevealedDestination$ Graveyard | RememberRevealed$ True | SubAbility$ TrigPump SVar:TrigPump:DB$Pump | Defined$ Equipped | NumAtt$ X | References$ X | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$Amount diff --git a/res/cardsfolder/x/xantid_swarm.txt b/res/cardsfolder/x/xantid_swarm.txt index d8f0ee93ed7..b4bd793854d 100644 --- a/res/cardsfolder/x/xantid_swarm.txt +++ b/res/cardsfolder/x/xantid_swarm.txt @@ -5,8 +5,8 @@ Text:no text PT:0/1 K:Flying T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigEffect | TriggerDescription$ When CARDNAME attacks, defending player can't cast spells this turn. -SVar:TrigEffect:AB$Effect | Cost$ 0 | Name$ Xantid Swarm Effect | StaticAbilities$ CantBeCast -SVar:CantBeCast:Mode$ CantBeCast | ValidCard$ Card | Caster$ Opponent | Description$ Defending player can't cast spells. +SVar:TrigEffect:AB$ Effect | Cost$ 0 | Name$ Xantid Swarm Effect | StaticAbilities$ CantBeCast +SVar:CantBeCast:Mode$ CantBeCast | ValidCard$ Card | Caster$ DefendingPlayer | Description$ Defending player can't cast spells. SVar:RemRandomDeck:True SVar:HasAttackEffect:TRUE SVar:Rarity:Rare diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 843e8e57479..ee4f4ef4b55 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -6497,7 +6497,8 @@ public class Card extends GameEntity implements Comparable { return false; } } else if (property.startsWith("DefenderCtrl")) { - if (!this.getController().equals(Singletons.getModel().getGame().getCombat().getDefendingPlayer())) { + if (Singletons.getModel().getGame().getCombat().getAttackingPlayer() == null + || !this.getController().equals(Singletons.getModel().getGame().getCombat().getDefendingPlayer())) { return false; } } else if (property.startsWith("EnchantedPlayerCtrl")) { diff --git a/src/main/java/forge/card/trigger/TriggerAttacks.java b/src/main/java/forge/card/trigger/TriggerAttacks.java index cafd3f03d95..38c366a9853 100644 --- a/src/main/java/forge/card/trigger/TriggerAttacks.java +++ b/src/main/java/forge/card/trigger/TriggerAttacks.java @@ -63,8 +63,9 @@ public class TriggerAttacks extends Trigger { } if (this.getMapParams().containsKey("Attacked")) { - if (this.getMapParams().get("Attacked").equals("Player") - && ((GameEntity) runParams2.get("Attacked") instanceof Card)) { + GameEntity attacked = (GameEntity) runParams2.get("Attacked"); + if (!attacked.isValid(this.getMapParams().get("Attacked").split(",") + , this.getHostCard().getController(), this.getHostCard())) { return false; } }