- Made more scripts ready for multiplayer.

.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

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

res/cardsfolder/b/briar_patch.txt

@@ -2,7 +2,7 @@ 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.
+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

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

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

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

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

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

res/cardsfolder/g/grimgrin_corpse_born.txt

@@ -8,7 +8,7 @@ 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: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

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

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

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.

res/cardsfolder/h/hissing_miasma.txt

@@ -2,7 +2,7 @@ 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.
+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

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

res/cardsfolder/k/kazuul_tyrant_of_the_cliffs.txt

@@ -3,7 +3,7 @@ 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.
+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

res/cardsfolder/k/keeper_of_tresserhorn.txt

@@ -5,7 +5,7 @@ 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: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

res/cardsfolder/k/kukemssa_pirates.txt

@@ -4,7 +4,7 @@ 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: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

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

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

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

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

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

res/cardsfolder/m/myr_battlesphere.txt

@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 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<X/Myr> | 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

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

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

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

res/cardsfolder/o/ogre_marauder.txt

@@ -4,7 +4,7 @@ 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: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

res/cardsfolder/o/orcish_squatters.txt

@@ -4,7 +4,7 @@ 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: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

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

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

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

res/cardsfolder/r/raking_canopy.txt

@@ -2,7 +2,7 @@ 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.
+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

res/cardsfolder/r/robber_fly.txt

@@ -5,8 +5,8 @@ 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:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ DefendingPlayer | Mode$ Hand | RememberDiscarded$ True | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | NumCards$ X | Defined$ Opponent | SubAbility$ DBCleanup | References$ X
+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

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

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

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

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

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

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

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

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

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

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

res/cardsfolder/t/thraximundar.txt

@@ -6,7 +6,7 @@ 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: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

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

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

res/cardsfolder/x/xantid_swarm.txt

@@ -6,7 +6,7 @@ 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:CantBeCast:Mode$ CantBeCast | ValidCard$ Card | Caster$ DefendingPlayer | Description$ Defending player can't cast spells.
 SVar:RemRandomDeck:True
 SVar:HasAttackEffect:TRUE
 SVar:Rarity:Rare

src/main/java/forge/Card.java

@@ -6497,7 +6497,8 @@ public class Card extends GameEntity implements Comparable<Card> {
                 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")) {

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 attacked = (GameEntity) runParams2.get("Attacked");
-                    && ((GameEntity) runParams2.get("Attacked") instanceof Card)) {
+            if (!attacked.isValid(this.getMapParams().get("Attacked").split(",")
+                    , this.getHostCard().getController(), this.getHostCard())) {
                 return false;
             }
         }