diff --git a/res/cardsfolder/e/extra_arms.txt b/res/cardsfolder/e/extra_arms.txt index aac8db3c146..f7e87e6d61d 100644 --- a/res/cardsfolder/e/extra_arms.txt +++ b/res/cardsfolder/e/extra_arms.txt @@ -6,6 +6,8 @@ K:Enchant creature A:SP$ Attach | Cost$ 4 R | ValidTgts$ Creature | AILogic$ Pump T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature attacks, it deals 2 damage to target creature or player. SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | DamageSource$ TriggeredCard | NumDmg$ 2 +S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddSVar$ AE +SVar:AE:SVar:HasAttackEffect:TRUE SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/extra_arms.jpg SetInfo:SCG|Uncommon|http://magiccards.info/scans/en/sc/92.jpg diff --git a/res/cardsfolder/f/fangren_firstborn.txt b/res/cardsfolder/f/fangren_firstborn.txt index c29677fae9f..10ee9609674 100644 --- a/res/cardsfolder/f/fangren_firstborn.txt +++ b/res/cardsfolder/f/fangren_firstborn.txt @@ -5,6 +5,7 @@ Text:no text PT:4/2 T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigCounters | TriggerDescription$ Whenever CARDNAME attacks, put a +1/+1 counter on each attacking creature. SVar:TrigCounters:AB$PutCounterAll | Cost$ 0 | ValidCards$ Creature.attacking | CounterType$ P1P1 | CounterNum$ 1 +SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/fangren_firstborn.jpg SetInfo:DST|Rare|http://magiccards.info/scans/en/ds/75.jpg diff --git a/res/cardsfolder/f/frost_titan.txt b/res/cardsfolder/f/frost_titan.txt index 12c39ac2b10..abbb3f16c75 100644 --- a/res/cardsfolder/f/frost_titan.txt +++ b/res/cardsfolder/f/frost_titan.txt @@ -10,6 +10,7 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | Secondary$ True | Tr SVar:TrigTap:AB$Tap | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Choose target permanent. | SubAbility$ DBPump SVar:DBPump:DB$Pump | Defined$ Targeted | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step. SVar:TrigCounter:AB$Counter | Cost$ 0 | Defined$ TriggeredSourceSA | UnlessCost$ 2 | UnlessPayer$ TriggeredSourceSAController +SVar:HasAttackEffect:TRUE SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/frost_titan.jpg SetInfo:M11|Mythic|http://magiccards.info/scans/en/m11/55.jpg diff --git a/res/cardsfolder/g/geist_of_saint_traft.txt b/res/cardsfolder/g/geist_of_saint_traft.txt index d4131fefb38..999218b073c 100644 --- a/res/cardsfolder/g/geist_of_saint_traft.txt +++ b/res/cardsfolder/g/geist_of_saint_traft.txt @@ -8,6 +8,7 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 4 4 Angel | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenTapped$ True | TokenAttacking$ True | TokenTriggers$ DelTrig | TokenSVars$ TrigExile SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | Execute$ TrigExile | TriggerDescription$ At end of combat, exile the Angel token. SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Exile +SVar:HasAttackEffect:TRUE SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/geist_of_saint_traft.jpg SetInfo:ISD|Mythic|http://magiccards.info/scans/en/isd/213.jpg diff --git a/res/cardsfolder/g/gemini_engine.txt b/res/cardsfolder/g/gemini_engine.txt index 428b3ebcd26..c59b5221269 100644 --- a/res/cardsfolder/g/gemini_engine.txt +++ b/res/cardsfolder/g/gemini_engine.txt @@ -9,6 +9,7 @@ SVar:TrigSac:Mode$ Phase | Phase$ EndCombat | Execute$ TrigSacrifice | TriggerDe SVar:TrigSacrifice:AB$ Sacrifice | Cost$ 0 | SacValid$ Self | Mandatory$ True SVar:X:Count$CardPower SVar:Y:Count$CardToughness +SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/gemini_engine.jpg SetInfo:DST|Rare|http://magiccards.info/scans/en/ds/121.jpg diff --git a/res/cardsfolder/g/grave_titan.txt b/res/cardsfolder/g/grave_titan.txt index ea270fed9eb..7ab981c94d2 100644 --- a/res/cardsfolder/g/grave_titan.txt +++ b/res/cardsfolder/g/grave_titan.txt @@ -7,6 +7,7 @@ K:Deathtouch T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield, put two 2/2 black Zombie creature tokens onto the battlefield. T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, put two 2/2 black Zombie creature tokens onto the battlefield. SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ B 2 2 Zombie | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ You | TokenAmount$ 2 +SVar:HasAttackEffect:TRUE SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/grave_titan.jpg SetInfo:M11|Mythic|http://magiccards.info/scans/en/m11/97.jpg diff --git a/res/cardsfolder/g/grimgrin_corpse_born.txt b/res/cardsfolder/g/grimgrin_corpse_born.txt index 1673ca64dec..adbadf07e3f 100644 --- a/res/cardsfolder/g/grimgrin_corpse_born.txt +++ b/res/cardsfolder/g/grimgrin_corpse_born.txt @@ -11,6 +11,7 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescripti 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 diff --git a/res/cardsfolder/h/herald_of_war.txt b/res/cardsfolder/h/herald_of_war.txt index ac8a5c2b55a..fe5e085090a 100644 --- a/res/cardsfolder/h/herald_of_war.txt +++ b/res/cardsfolder/h/herald_of_war.txt @@ -8,6 +8,7 @@ T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ HeraldsWarCry | TriggerDes SVar:HeraldsWarCry:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 K:CostChange:Player:Less:X:Spell:All:Angel/Human:OnlyOneBonus:Angels and Humans you cast cost 1 less for each +1/+1 counter on CARDNAME. SVar:X:Count$NumCounters.P1P1 +SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/herald_of_war.jpg SetInfo:AVR|Rare|http://magiccards.info/scans/en/avr/24.jpg diff --git a/res/cardsfolder/h/hero_of_bladehold.txt b/res/cardsfolder/h/hero_of_bladehold.txt index e92ac0d864e..f2df23dd05f 100644 --- a/res/cardsfolder/h/hero_of_bladehold.txt +++ b/res/cardsfolder/h/hero_of_bladehold.txt @@ -7,6 +7,7 @@ T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ Tr T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, put two 1/1 white Soldier creature tokens onto the battlefield tapped and attacking. SVar:TrigBattleCry:AB$PumpAll | Cost$ 0 | ValidCards$ Creature.attacking+Other | NumAtt$ 1 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 2 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenTapped$ True | TokenAttacking$ True +SVar:HasAttackEffect:TRUE SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/hero_of_bladehold.jpg SetInfo:MBS|Mythic|http://magiccards.info/scans/en/mbs/8.jpg diff --git a/res/cardsfolder/i/infectious_horror.txt b/res/cardsfolder/i/infectious_horror.txt index e59532b41d4..4317ce85956 100644 --- a/res/cardsfolder/i/infectious_horror.txt +++ b/res/cardsfolder/i/infectious_horror.txt @@ -5,6 +5,7 @@ Text:no text PT:2/2 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME attacks, each opponent loses 2 life. SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 2 +SVar:HasAttackEffect:TRUE SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/infectious_horror.jpg SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/47.jpg diff --git a/res/cardsfolder/i/inferno_titan.txt b/res/cardsfolder/i/inferno_titan.txt index 609142a07bf..b4b684d76c0 100644 --- a/res/cardsfolder/i/inferno_titan.txt +++ b/res/cardsfolder/i/inferno_titan.txt @@ -9,6 +9,7 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ Dmg1 | Secondary$ True | Trigg SVar:Dmg1:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ Dmg2 SVar:Dmg2:DB$DealDamage | Tgt$ TgtCP | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ Dmg3 SVar:Dmg3:DB$DealDamage | Tgt$ TgtCP | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1 +SVar:HasAttackEffect:TRUE SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/inferno_titan.jpg SetInfo:M11|Mythic|http://magiccards.info/scans/en/m11/146.jpg diff --git a/res/cardsfolder/k/kessig_cagebreakers.txt b/res/cardsfolder/k/kessig_cagebreakers.txt index 76a5ce64e47..eee8cb172b0 100644 --- a/res/cardsfolder/k/kessig_cagebreakers.txt +++ b/res/cardsfolder/k/kessig_cagebreakers.txt @@ -6,6 +6,7 @@ PT:3/4 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, put a 2/2 green Wolf creature token onto the battlefield tapped and attacking for each creature card in your graveyard. SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ G 2 2 Wolf | TokenAmount$ X | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 | TokenTapped$ True | TokenAttacking$ True SVar:X:Count$TypeInYourYard.Creature +SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/kessig_cagebreakers.jpg SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/189.jpg diff --git a/res/cardsfolder/m/moonsilver_spear.txt b/res/cardsfolder/m/moonsilver_spear.txt index 0728cb99421..89d108a4431 100644 --- a/res/cardsfolder/m/moonsilver_spear.txt +++ b/res/cardsfolder/m/moonsilver_spear.txt @@ -5,6 +5,8 @@ Text:Equipped creature has first strike. K:eqPump 4:+0/+0/First Strike T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigAngelToken | TriggerDescription$ Whenever equipped creature attacks, put a 4/4 white Angel token with flying onto the battlefield. SVar:TrigAngelToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying +S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddSVar$ AE +SVar:AE:SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/moonsilver_spear.jpg SetInfo:AVR|Rare|http://magiccards.info/scans/en/avr/217.jpg diff --git a/res/cardsfolder/n/nefashu.txt b/res/cardsfolder/n/nefashu.txt index 17eede4f7a0..1dc23948aac 100644 --- a/res/cardsfolder/n/nefashu.txt +++ b/res/cardsfolder/n/nefashu.txt @@ -5,6 +5,7 @@ Text:no text PT:5/3 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigShrink | TriggerDescription$ Whenever CARDNAME attacks, up to five target creatures each get -1/-1 until end of turn. SVar:TrigShrink:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ 5 | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True +SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/nefashu.jpg SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/70.jpg diff --git a/res/cardsfolder/n/nemesis_of_reason.txt b/res/cardsfolder/n/nemesis_of_reason.txt index 160a77b576a..6336a1b397f 100644 --- a/res/cardsfolder/n/nemesis_of_reason.txt +++ b/res/cardsfolder/n/nemesis_of_reason.txt @@ -5,6 +5,7 @@ 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:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/nemesis_of_reason.jpg SetInfo:ARB|Rare|http://magiccards.info/scans/en/arb/28.jpg diff --git a/res/cardsfolder/p/predator_ooze.txt b/res/cardsfolder/p/predator_ooze.txt index dfe1e6263aa..cc200ea25af 100644 --- a/res/cardsfolder/p/predator_ooze.txt +++ b/res/cardsfolder/p/predator_ooze.txt @@ -7,6 +7,7 @@ K:Indestructible K:Whenever a creature dealt damage by CARDNAME this turn is put into a graveyard, put a +1/+1 counter on CARDNAME. T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME attacks, put a +1/+1 counter on it. SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 +SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/predator_ooze.jpg SetInfo:DKA|Rare|http://magiccards.info/scans/en/dka/124.jpg diff --git a/res/cardsfolder/p/primeval_titan.txt b/res/cardsfolder/p/primeval_titan.txt index eaf7d2188db..7c7533fbf55 100644 --- a/res/cardsfolder/p/primeval_titan.txt +++ b/res/cardsfolder/p/primeval_titan.txt @@ -7,6 +7,7 @@ K:Trample T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for up to two land cards, put them onto the battlefield tapped, then shuffle your library. T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks, you may search your library for up to two land cards, put them onto the battlefield tapped, then shuffle your library. SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land | ChangeNum$ 2 +SVar:HasAttackEffect:TRUE SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/primeval_titan.jpg SetInfo:M11|Mythic|http://magiccards.info/scans/en/m11/192.jpg diff --git a/res/cardsfolder/p/pulse_tracker.txt b/res/cardsfolder/p/pulse_tracker.txt index 9e218fffe32..d18cc89d6ef 100644 --- a/res/cardsfolder/p/pulse_tracker.txt +++ b/res/cardsfolder/p/pulse_tracker.txt @@ -5,6 +5,7 @@ Text:no text PT:1/1 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDrain | TriggerDescription$ Whenever CARDNAME attacks, each opponent loses 1 life. SVar:TrigDrain:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1 +SVar:HasAttackEffect:TRUE SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/pulse_tracker.jpg SetInfo:WWK|Common|http://magiccards.info/scans/en/wwk/62.jpg diff --git a/res/cardsfolder/r/ronin_cliffrider.txt b/res/cardsfolder/r/ronin_cliffrider.txt index 3092231dd62..1344fece836 100644 --- a/res/cardsfolder/r/ronin_cliffrider.txt +++ b/res/cardsfolder/r/ronin_cliffrider.txt @@ -6,6 +6,7 @@ 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:HasAttackEffect:TRUE SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/ronin_cliffrider.jpg SetInfo:BOK|Uncommon|http://magiccards.info/scans/en/bok/116.jpg diff --git a/res/cardsfolder/s/scalding_salamander.txt b/res/cardsfolder/s/scalding_salamander.txt index 486366e72bb..7822870fbfe 100644 --- a/res/cardsfolder/s/scalding_salamander.txt +++ b/res/cardsfolder/s/scalding_salamander.txt @@ -5,6 +5,7 @@ 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:HasAttackEffect:TRUE SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/scalding_salamander.jpg SetInfo:EXO|Uncommon|http://magiccards.info/scans/en/ex/100.jpg diff --git a/res/cardsfolder/s/shrieking_specter.txt b/res/cardsfolder/s/shrieking_specter.txt index b652dc024d6..633d1b2657e 100644 --- a/res/cardsfolder/s/shrieking_specter.txt +++ b/res/cardsfolder/s/shrieking_specter.txt @@ -6,6 +6,7 @@ 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:HasAttackEffect:TRUE SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/shrieking_specter.jpg SetInfo:S99|Uncommon|http://magiccards.info/scans/en/st/89.jpg diff --git a/res/cardsfolder/s/sun_titan.txt b/res/cardsfolder/s/sun_titan.txt index 7519ba00c16..1150adc98d4 100644 --- a/res/cardsfolder/s/sun_titan.txt +++ b/res/cardsfolder/s/sun_titan.txt @@ -7,6 +7,7 @@ K:Vigilance T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME enters the battlefield, you may return target permanent card with converted mana cost 3 or less from your graveyard to the battlefield. T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks, you may return target permanent card with converted mana cost 3 or less from your graveyard to the battlefield. SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.YouCtrl+cmcLE3 | Cost$ 0 +SVar:HasAttackEffect:TRUE SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/sun_titan.jpg SetInfo:M11|Mythic|http://magiccards.info/scans/en/m11/35.jpg diff --git a/res/cardsfolder/t/thraximundar.txt b/res/cardsfolder/t/thraximundar.txt index 1c7c33d78b0..5126c2d97f9 100644 --- a/res/cardsfolder/t/thraximundar.txt +++ b/res/cardsfolder/t/thraximundar.txt @@ -8,6 +8,7 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ 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:HasAttackEffect:TRUE SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/thraximundar.jpg SetInfo:ARB|Mythic|http://magiccards.info/scans/en/arb/113.jpg diff --git a/res/cardsfolder/x/xantid_swarm.txt b/res/cardsfolder/x/xantid_swarm.txt index 9bc09456cf1..d8f0ee93ed7 100644 --- a/res/cardsfolder/x/xantid_swarm.txt +++ b/res/cardsfolder/x/xantid_swarm.txt @@ -8,6 +8,7 @@ T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ Tr 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:RemRandomDeck:True +SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/xantid_swarm.jpg SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/135.jpg diff --git a/res/cardsfolder/y/yore_tiller_nephilim.txt b/res/cardsfolder/y/yore_tiller_nephilim.txt index 1956158b42b..5f3ba4ebc84 100644 --- a/res/cardsfolder/y/yore_tiller_nephilim.txt +++ b/res/cardsfolder/y/yore_tiller_nephilim.txt @@ -5,6 +5,7 @@ Text:no text PT:2/2 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, return target creature card from your graveyard to the battlefield tapped and attacking. SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | Tapped$ True | Attacking$ True +SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/yore_tiller_nephilim.jpg SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/140.jpg diff --git a/res/cardsfolder/z/zur_the_enchanter.txt b/res/cardsfolder/z/zur_the_enchanter.txt index bee89c484d0..c2249c54aa4 100644 --- a/res/cardsfolder/z/zur_the_enchanter.txt +++ b/res/cardsfolder/z/zur_the_enchanter.txt @@ -6,6 +6,7 @@ PT:1/4 K:Flying T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ Whenever CARDNAME attacks, you may search your library for an enchantment card with converted mana cost 3 or less and put it onto the battlefield. If you do, shuffle your library. SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | ChangeType$ Enchantment.cmcLE3 | ChangeNum$ 1 +SVar:HasAttackEffect:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/zur_the_enchanter.jpg SetInfo:CSP|Rare|http://magiccards.info/scans/en/cs/135.jpg diff --git a/src/main/java/forge/game/player/ComputerUtilAttack.java b/src/main/java/forge/game/player/ComputerUtilAttack.java index 828e41eab8f..bc72c4b4bba 100644 --- a/src/main/java/forge/game/player/ComputerUtilAttack.java +++ b/src/main/java/forge/game/player/ComputerUtilAttack.java @@ -782,7 +782,7 @@ public class ComputerUtilAttack { // wither or infect boolean isWorthLessThanAllKillers = true; boolean canBeBlocked = false; - boolean hasAttackEffect = attacker.getSVar("HasAttackEffect").equals("TRUE"); + boolean hasAttackEffect = attacker.getSVar("HasAttackEffect").equals("TRUE") || attacker.hasStartOfKeyword("Annihilator"); int numberOfPossibleBlockers = 0; if (!this.isEffectiveAttacker(attacker, combat)) {