diff --git a/forge-gui/res/cardsfolder/a/akoum_flameseeker.txt b/forge-gui/res/cardsfolder/a/akoum_flameseeker.txt index 70cb71b4637..a762ce25b66 100644 --- a/forge-gui/res/cardsfolder/a/akoum_flameseeker.txt +++ b/forge-gui/res/cardsfolder/a/akoum_flameseeker.txt @@ -6,5 +6,6 @@ A:AB$ Discard | Cost$ T tapXType<1/Ally> | Defined$ You | NumCards$ 1 | Mode$ Tg SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:RemAIDeck:True +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/akoum_flameseeker.jpg Oracle:Cohort - {T}, Tap an untapped Ally you control: Discard a card. If you do, draw a card. diff --git a/forge-gui/res/cardsfolder/a/allied_reinforcements.txt b/forge-gui/res/cardsfolder/a/allied_reinforcements.txt index d1be8aa0b67..b1a728380b0 100644 --- a/forge-gui/res/cardsfolder/a/allied_reinforcements.txt +++ b/forge-gui/res/cardsfolder/a/allied_reinforcements.txt @@ -2,5 +2,6 @@ Name:Allied Reinforcements ManaCost:3 W Types:Sorcery A:SP$ Token | Cost$ 3 W | TokenImage$ w 2 2 knight ally | TokenAmount$ 2 | TokenName$ Knight Ally | TokenTypes$ Creature,Knight,Ally | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | SpellDescription$ Put two 2/2 white Knight Ally creature tokens onto the battlefield. +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/allied_reinforcements.jpg Oracle:Put two 2/2 white Knight Ally creature tokens onto the battlefield. diff --git a/forge-gui/res/cardsfolder/a/angelic_captain.txt b/forge-gui/res/cardsfolder/a/angelic_captain.txt index 306baf6292d..97712c52cc1 100644 --- a/forge-gui/res/cardsfolder/a/angelic_captain.txt +++ b/forge-gui/res/cardsfolder/a/angelic_captain.txt @@ -6,5 +6,6 @@ K:Flying T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+1 until end of turn for each other attacking Ally. SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ X | NumDef$ X | References$ X SVar:X:Count$Valid Ally.attacking+Other +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_captain.jpg Oracle:Flying\nWhenever Angelic Captain attacks, it gets +1/+1 until end of turn for each other attacking Ally. diff --git a/forge-gui/res/cardsfolder/b/barrage_tyrant.txt b/forge-gui/res/cardsfolder/b/barrage_tyrant.txt index 9bcf95752d6..926c5faac4c 100644 --- a/forge-gui/res/cardsfolder/b/barrage_tyrant.txt +++ b/forge-gui/res/cardsfolder/b/barrage_tyrant.txt @@ -6,5 +6,6 @@ K:Devoid A:AB$ DealDamage | Cost$ 2 R Sac<1/Creature.Colorless+Other/another colorless creature> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage equal to the sacrificed creature's power to target creature or player. SVar:X:Sacrificed$CardPower SVar:RemAIDeck:True +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/barrage_tyrant.jpg Oracle:Devoid (This card has no color.)\n{2}{R}, Sacrifice another colorless creature: Barrage Tyrant deals damage equal to the sacrificed creature's power to target creature or player. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/c/chasm_guide.txt b/forge-gui/res/cardsfolder/c/chasm_guide.txt index d2665631958..4b65360534e 100644 --- a/forge-gui/res/cardsfolder/c/chasm_guide.txt +++ b/forge-gui/res/cardsfolder/c/chasm_guide.txt @@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ Haste SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/chasm_guide.jpg Oracle:Rally - Whenever Chasm Guide or another Ally enters the battlefield under your control, creatures you control gain haste until end of turn. diff --git a/forge-gui/res/cardsfolder/d/dominator_drone.txt b/forge-gui/res/cardsfolder/d/dominator_drone.txt index a9149dcd719..09523c7f7a3 100644 --- a/forge-gui/res/cardsfolder/d/dominator_drone.txt +++ b/forge-gui/res/cardsfolder/d/dominator_drone.txt @@ -6,6 +6,6 @@ K:Devoid K:Ingest T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | IsPresent$ Creature.Colorless+Other+YouCtrl | TriggerDescription$ When CARDNAME enters the battlefield, if you control another colorless creature, each opponent loses 2 life. SVar:TrigLoseLife:AB$ LoseLife | Cost$ 0 | Defined$ Player.Opponent | LifeAmount$ 2 -DeckHints:Type$Processor +DeckHints:Type$Processor & Keyword$Devoid & Color$Colorless SVar:Picture:http://www.wizards.com/global/images/magic/general/dominator_drone.jpg Oracle:Devoid (This creature has no color.)\nIngest (Whenever this creature deals combat damage to a player, that player exiles the top card of his or her library.)\nWhen Dominator Drone enters the battlefield, if you control another colorless creature, each opponent loses 2 life. diff --git a/forge-gui/res/cardsfolder/d/dranas_chosen.txt b/forge-gui/res/cardsfolder/d/dranas_chosen.txt index 09c6bd3052b..b6069d96cf2 100644 --- a/forge-gui/res/cardsfolder/d/dranas_chosen.txt +++ b/forge-gui/res/cardsfolder/d/dranas_chosen.txt @@ -4,5 +4,6 @@ Types:Creature Vampire Shaman Ally PT:2/2 A:AB$Token | Cost$ T tapXType<1/Ally> | TokenAmount$ 1 | TokenOwner$ You | TokenName$ Zombie | TokenColors$ Black | TokenImage$ b 2 2 zombie OGW | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenTapped$ True | SpellDescription$ Put a 2/2 black Zombie creature token onto the battlefield tapped. SVar:RemAIDeck:True +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/dranas_chosen.jpg Oracle:Cohort - {T}, Tap an untapped Ally you control: Put a 2/2 black Zombie creature token onto the battlefield tapped. diff --git a/forge-gui/res/cardsfolder/d/dust_stalker.txt b/forge-gui/res/cardsfolder/d/dust_stalker.txt index 865b2a00131..c75286cad44 100644 --- a/forge-gui/res/cardsfolder/d/dust_stalker.txt +++ b/forge-gui/res/cardsfolder/d/dust_stalker.txt @@ -7,5 +7,6 @@ K:Haste T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | IsPresent$ Creature.YouCtrl+Colorless+Other | PresentCompare$ EQ0 | Execute$ TrigReturn | TriggerDescription$ At the beginning of each end step, if you control no other colorless creatures, return CARDNAME to its owner's hand. SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Hand SVar:PlayMain1:TRUE +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/dust_stalker.jpg Oracle:Devoid (This card has no color.)\nHaste\nAt the beginning of each end step, if you control no other colorless creatures, return Dust Stalker to its owner's hand. diff --git a/forge-gui/res/cardsfolder/e/eldrazi_aggressor.txt b/forge-gui/res/cardsfolder/e/eldrazi_aggressor.txt index f0529ae2abf..32892f5f65f 100644 --- a/forge-gui/res/cardsfolder/e/eldrazi_aggressor.txt +++ b/forge-gui/res/cardsfolder/e/eldrazi_aggressor.txt @@ -7,5 +7,6 @@ S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Haste | CheckSVar$ X | SV SVar:X:Count$Valid Creature.YouCtrl+Colorless+Other SVar:PlayMain1:TRUE SVar:BuffedBy:Creature.Colorless +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/eldrazi_aggressor.jpg Oracle:Devoid (This card has no color.)\nEldrazi Aggressor has haste as long as you control another colorless creature. diff --git a/forge-gui/res/cardsfolder/f/firemantle_mage.txt b/forge-gui/res/cardsfolder/f/firemantle_mage.txt index 3ce4e75dc1d..fab45ede363 100644 --- a/forge-gui/res/cardsfolder/f/firemantle_mage.txt +++ b/forge-gui/res/cardsfolder/f/firemantle_mage.txt @@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ Menace SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/firemantle_mage.jpg Oracle:Rally - Whenever Firemantle Mage or another Ally enters the battlefield under your control, creatures you control gain menace until end of turn. diff --git a/forge-gui/res/cardsfolder/f/flayer_drone.txt b/forge-gui/res/cardsfolder/f/flayer_drone.txt index 8bd5993b9d5..9d16386cada 100644 --- a/forge-gui/res/cardsfolder/f/flayer_drone.txt +++ b/forge-gui/res/cardsfolder/f/flayer_drone.txt @@ -6,5 +6,6 @@ K:Devoid K:First Strike T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+Colorless+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever another colorless creature enters the battlefield under your control, target opponent loses 1 life. SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | LifeAmount$ 1 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/flayer_drone.jpg Oracle:Devoid (This card has no color.)\nFirst strike\nWhenever another colorless creature enters the battlefield under your control, target opponent loses 1 life. diff --git a/forge-gui/res/cardsfolder/g/grovetender_druids.txt b/forge-gui/res/cardsfolder/g/grovetender_druids.txt index 06c9ef6726f..979c6783155 100644 --- a/forge-gui/res/cardsfolder/g/grovetender_druids.txt +++ b/forge-gui/res/cardsfolder/g/grovetender_druids.txt @@ -5,5 +5,6 @@ PT:3/3 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, you may pay {1}. If you do, put a 1/1 green Plant creature token onto the battlefield. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under your control, you may pay {1}. If you do, put a 1/1 green Plant creature token onto the battlefield. SVar:TrigToken:AB$ Token | Cost$ 1 | TokenAmount$ 1 | TokenName$ Plant | TokenTypes$ Creature,Plant | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenOwner$ You +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/grovetender_druids.jpg Oracle:Rally — Whenever Grovetender Druids or another Ally enters the battlefield under your control, you may pay {1}. If you do, put a 1/1 green Plant creature token onto the battlefield. diff --git a/forge-gui/res/cardsfolder/g/gruesome_slaughter.txt b/forge-gui/res/cardsfolder/g/gruesome_slaughter.txt index 48fb59ac4c0..cc19e3a8642 100644 --- a/forge-gui/res/cardsfolder/g/gruesome_slaughter.txt +++ b/forge-gui/res/cardsfolder/g/gruesome_slaughter.txt @@ -5,6 +5,6 @@ A:SP$ AnimateAll | Cost$ 6 | ValidCards$ Creature.Colorless+YouCtrl | Abilities$ SVar:ThrowPunch:AB$ DealDamage | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ GruesomeX | References$ GruesomeX | SpellDescription$ This creature deals damage equal to its power to target creature. SVar:GruesomeX:Count$CardPower SVar:RemRandomDeck:True -SVar:RemAIDeck:True +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/gruesome_slaughter.jpg Oracle:Until end of turn, colorless creatures you control gain "{T}: This creature deals damage equal to its power to target creature." diff --git a/forge-gui/res/cardsfolder/h/herald_of_kozilek.txt b/forge-gui/res/cardsfolder/h/herald_of_kozilek.txt index b6eeb822d04..a72eba7f497 100644 --- a/forge-gui/res/cardsfolder/h/herald_of_kozilek.txt +++ b/forge-gui/res/cardsfolder/h/herald_of_kozilek.txt @@ -4,5 +4,6 @@ Types:Creature Eldrazi Drone PT:2/4 K:Devoid S:Mode$ ReduceCost | ValidCard$ Card.Colorless | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Colorless spells you cast cost {1} less to cast. +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/herald_of_kozilek.jpg Oracle:Devoid (This card has no color.)\nColorless spells you cast cost {1} less to cast. diff --git a/forge-gui/res/cardsfolder/h/hero_of_goma_fada.txt b/forge-gui/res/cardsfolder/h/hero_of_goma_fada.txt index 00e43b1a032..6fca227e37e 100644 --- a/forge-gui/res/cardsfolder/h/hero_of_goma_fada.txt +++ b/forge-gui/res/cardsfolder/h/hero_of_goma_fada.txt @@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ Indestructible SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/hero_of_goma_fada.jpg Oracle:Rally - Whenever Hero of Goma Fada or another Ally enters the battlefield under your control, creatures you control gain indestructible until end of turn. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/k/kalastria_healer.txt b/forge-gui/res/cardsfolder/k/kalastria_healer.txt index 0b554ac993c..63aceb75b5f 100644 --- a/forge-gui/res/cardsfolder/k/kalastria_healer.txt +++ b/forge-gui/res/cardsfolder/k/kalastria_healer.txt @@ -8,5 +8,6 @@ SVar:TrigDrain:AB$ LoseLife | Cost$ 0 | Defined$ Player.Opponent | LifeAmount$ 1 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1 SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/kalastria_healer.jpg Oracle:Rally — Whenever Kalastria Healer or another Ally enters the battlefield under your control, each opponent loses 1 life and you gain 1 life. diff --git a/forge-gui/res/cardsfolder/k/kor_bladewhirl.txt b/forge-gui/res/cardsfolder/k/kor_bladewhirl.txt index cc581e6863b..248aaea3e8e 100644 --- a/forge-gui/res/cardsfolder/k/kor_bladewhirl.txt +++ b/forge-gui/res/cardsfolder/k/kor_bladewhirl.txt @@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ First Strike SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/kor_bladewhirl.jpg Oracle:Rally — Whenever Kor Bladewhirl or another Ally enters the battlefield under your control, creatures you control gain first strike until end of turn. diff --git a/forge-gui/res/cardsfolder/k/kor_entanglers.txt b/forge-gui/res/cardsfolder/k/kor_entanglers.txt index e357b67c5ec..bcc4c07b817 100644 --- a/forge-gui/res/cardsfolder/k/kor_entanglers.txt +++ b/forge-gui/res/cardsfolder/k/kor_entanglers.txt @@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O SVar:TrigTap:AB$ Tap | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/kor_entanglers.jpg Oracle:Rally — Whenever Kor Entanglers or another Ally enters the battlefield under your control, tap target creature an opponent controls. diff --git a/forge-gui/res/cardsfolder/k/kozileks_sentinel.txt b/forge-gui/res/cardsfolder/k/kozileks_sentinel.txt index f74cb1afb5c..895a790209b 100644 --- a/forge-gui/res/cardsfolder/k/kozileks_sentinel.txt +++ b/forge-gui/res/cardsfolder/k/kozileks_sentinel.txt @@ -6,5 +6,6 @@ K:Devoid T:Mode$ SpellCast | ValidCard$ Card.Colorless | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a colorless spell, CARDNAME gets +1/+0 until end of turn. SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ +1 SVar:BuffedBy:Card.Colorless +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/kozileks_sentinel.jpg Oracle:Devoid (This card has no color.)\nWhenever you cast a colorless spell, Kozilek's Sentinel gets +1/+0 until end of turn. diff --git a/forge-gui/res/cardsfolder/l/lantern_scout.txt b/forge-gui/res/cardsfolder/l/lantern_scout.txt index 3ae137aeab5..4cbe770fe86 100644 --- a/forge-gui/res/cardsfolder/l/lantern_scout.txt +++ b/forge-gui/res/cardsfolder/l/lantern_scout.txt @@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ Lifelink SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/lantern_scout.jpg Oracle:Rally - Whenever Lantern Scout or another Ally enters the battlefield under your control, creatures you control gain lifelink until end of turn. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/m/makindi_patrol.txt b/forge-gui/res/cardsfolder/m/makindi_patrol.txt index 2c01987e61b..63f1d65ddbb 100644 --- a/forge-gui/res/cardsfolder/m/makindi_patrol.txt +++ b/forge-gui/res/cardsfolder/m/makindi_patrol.txt @@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ Vigilance SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/makindi_patrol.jpg Oracle:Rally — Whenever Makindi Patrol or another Ally enters the battlefield under your control, creatures you control gain vigilance until end of turn. diff --git a/forge-gui/res/cardsfolder/m/malakir_soothsayer.txt b/forge-gui/res/cardsfolder/m/malakir_soothsayer.txt index 8891fc8fdf2..ae018650dc9 100644 --- a/forge-gui/res/cardsfolder/m/malakir_soothsayer.txt +++ b/forge-gui/res/cardsfolder/m/malakir_soothsayer.txt @@ -5,5 +5,6 @@ PT:4/4 A:AB$ Draw | Cost$ T tapXType<1/Ally> | NumCards$ 1 | SpellDescription$ You draw a card and you lose 1 life. | SubAbility$ DBLoseLife SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1 SVar:RemAIDeck:True +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/malakir_soothsayer.jpg Oracle:Cohort - {T}, Tap an untapped Ally you control: You draw a card and you lose 1 life. diff --git a/forge-gui/res/cardsfolder/m/march_from_the_tomb.txt b/forge-gui/res/cardsfolder/m/march_from_the_tomb.txt index 2ea081c5eb7..4e5fab37bcf 100644 --- a/forge-gui/res/cardsfolder/m/march_from_the_tomb.txt +++ b/forge-gui/res/cardsfolder/m/march_from_the_tomb.txt @@ -3,5 +3,7 @@ ManaCost:3 W B Types:Sorcery A:SP$ ChangeZone | Cost$ 3 W B | Origin$ Graveyard | Destination$ Battlefield | TargetMin$ 0 | TargetMax$ X | References$ X | MaxTotalTargetCMC$ 8 | ValidTgts$ Creature.Ally+YouCtrl | TgtPrompt$ Select target Ally creature card in your graveyard. | SpellDescription$ Return any number of target Ally creature cards with total converted mana cost 8 or less from your graveyard to the battlefield. SVar:X:Count$ValidGraveyard Creature.Ally+YouCtrl +SVar:RemRandomDeck:True +DeckNeeds:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/march_from_the_tomb.jpg Oracle:Return any number of target Ally creature cards with total converted mana cost 8 or less from your graveyard to the battlefield. diff --git a/forge-gui/res/cardsfolder/m/molten_nursery.txt b/forge-gui/res/cardsfolder/m/molten_nursery.txt index 50cc828f12b..48c12f8b750 100644 --- a/forge-gui/res/cardsfolder/m/molten_nursery.txt +++ b/forge-gui/res/cardsfolder/m/molten_nursery.txt @@ -5,5 +5,6 @@ K:Devoid T:Mode$ SpellCast | ValidCard$ Card.Colorless | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you cast a colorless spell, CARDNAME deals 1 damage to target creature or player. SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 SVar:BuffedBy:Card.Colorless +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/molten_nursery.jpg Oracle:Devoid (This card has no color.)\nWhenever you cast a colorless spell, Molten Nursery deals 1 damage to target creature or player. diff --git a/forge-gui/res/cardsfolder/m/munda_ambush_leader.txt b/forge-gui/res/cardsfolder/m/munda_ambush_leader.txt index 78e19e9a358..c73194c587a 100644 --- a/forge-gui/res/cardsfolder/m/munda_ambush_leader.txt +++ b/forge-gui/res/cardsfolder/m/munda_ambush_leader.txt @@ -6,5 +6,6 @@ K:Haste T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | OptionalDecider$ You | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under you control, you may look at the top four cards of your library. If you do, reveal any number of Ally cards from among them, then put those cards on top of your library in any order and the rest on the bottom in any order. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDig | Secondary$ True | OptionalDecider$ You | TriggerDescription$ Rally — Whenever CARDNAME or another Ally enters the battlefield under you control, you may look at the top four cards of your library. If you do, reveal any number of Ally cards from among them, then put those cards on top of your library in any order and the rest on the bottom in any order. SVar:TrigDig:AB$ Dig | Cost$ 0 | DigNum$ 4 | AnyNumber$ | ChangeValid$ Ally | DestinationZone$ Library | LibraryPosition$ 0 +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/munda_ambush_leader.jpg Oracle:Haste\nRally — Whenever Munda, Ambush Leader or another Ally enters the battlefield under you control, you may look at the top four cards of your library. If you do, reveal any number of Ally cards from among them, then put those cards on top of your library in any order and the rest on the bottom in any order. diff --git a/forge-gui/res/cardsfolder/m/mundas_vanguard.txt b/forge-gui/res/cardsfolder/m/mundas_vanguard.txt index 1b6b46a2ea6..039b38f090c 100644 --- a/forge-gui/res/cardsfolder/m/mundas_vanguard.txt +++ b/forge-gui/res/cardsfolder/m/mundas_vanguard.txt @@ -4,5 +4,6 @@ Types:Creature Kor Knight Ally PT:3/3 A:AB$ PutCounterAll | Cost$ T tapXType<1/Ally> | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | PrecostDesc$ Cohort - | SpellDescription$ Put a +1/+1 counter on each creature you control. SVar:RemAIDeck:True +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/mundas_vanguard.jpg Oracle:Cohort - {T}, Tap an untapped Ally you control: Put a +1/+1 counter on each creature you control. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/n/nettle_drone.txt b/forge-gui/res/cardsfolder/n/nettle_drone.txt index d403ab884a7..280e37eb3a9 100644 --- a/forge-gui/res/cardsfolder/n/nettle_drone.txt +++ b/forge-gui/res/cardsfolder/n/nettle_drone.txt @@ -6,5 +6,6 @@ K:Devoid A:AB$ DealDamage | Cost$ T | Defined$ Player.Opponent | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to each opponent. T:Mode$ SpellCast | ValidCard$ Card.Colorless | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever you cast a colorless spell, untap Nettle Drone. SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/nettle_drone.jpg Oracle:Devoid (This card has no color.)\n{T}: Nettle Drone deals 1 damage to each opponent.\nWhenever you cast a colorless spell, untap Nettle Drone. diff --git a/forge-gui/res/cardsfolder/o/oath_of_gideon.txt b/forge-gui/res/cardsfolder/o/oath_of_gideon.txt index 16ae18972af..0c7875d3ac3 100644 --- a/forge-gui/res/cardsfolder/o/oath_of_gideon.txt +++ b/forge-gui/res/cardsfolder/o/oath_of_gideon.txt @@ -6,5 +6,6 @@ SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ w 1 1 kor ally | TokenName$ Kor R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Battlefield | ValidCard$ Planeswalker.YouCtrl | ReplaceWith$ AddExtraCounter | Description$ Each planeswalker you control enters the battlefield with an additional loyalty counter on it. SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ LOYALTY | CounterNum$ 1 | SubAbility$ MoveToBattlefield SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/oath_of_gideon.jpg Oracle:When Oath of Gideon enters the battlefield, put two 1/1 white Kor Ally creature tokens onto the battlefield.\nEach planeswalker you control enters the battlefield with an additional loyalty counter on it. diff --git a/forge-gui/res/cardsfolder/o/ondu_champion.txt b/forge-gui/res/cardsfolder/o/ondu_champion.txt index 193600baf69..73e5d472fe0 100644 --- a/forge-gui/res/cardsfolder/o/ondu_champion.txt +++ b/forge-gui/res/cardsfolder/o/ondu_champion.txt @@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ Trample SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/ondu_champion.jpg Oracle:Rally - Whenever Ondu Champion or another Ally enters the battlefield under your control, creatures you control gain trample until end of turn. diff --git a/forge-gui/res/cardsfolder/o/ondu_war_cleric.txt b/forge-gui/res/cardsfolder/o/ondu_war_cleric.txt index bd035c4fcd2..cc8ff093a8d 100644 --- a/forge-gui/res/cardsfolder/o/ondu_war_cleric.txt +++ b/forge-gui/res/cardsfolder/o/ondu_war_cleric.txt @@ -4,5 +4,6 @@ Types:Creature Human Cleric Ally PT:2/2 A:AB$ GainLife | Cost$ T tapXType<1/Ally> | LifeAmount$ 2 | SpellDescription$ You gain 2 life. SVar:RemAIDeck:True +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/ondu_war_cleric.jpg Oracle:Cohort - {T}, Tap an untapped Ally you control: You gain 2 life. diff --git a/forge-gui/res/cardsfolder/r/reckless_cohort.txt b/forge-gui/res/cardsfolder/r/reckless_cohort.txt index 388fc89a5d6..8f0be12b5cd 100644 --- a/forge-gui/res/cardsfolder/r/reckless_cohort.txt +++ b/forge-gui/res/cardsfolder/r/reckless_cohort.txt @@ -5,5 +5,6 @@ PT:2/2 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME attacks each combat if able. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME attacks each combat if able unless you control another Ally. SVar:X:Count$Valid Ally.Other+YouCtrl SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/reckless_cohort.jpg Oracle:Reckless Cohort attacks each combat if able unless you control another Ally. diff --git a/forge-gui/res/cardsfolder/r/resolute_blademaster.txt b/forge-gui/res/cardsfolder/r/resolute_blademaster.txt index 4f19b3eaf85..f4d6b7d2c3b 100644 --- a/forge-gui/res/cardsfolder/r/resolute_blademaster.txt +++ b/forge-gui/res/cardsfolder/r/resolute_blademaster.txt @@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ Double Strike SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/resolute_blademaster.jpg Oracle:Rally — Whenever Resolute Blademaster or another Ally enters the battlefield under your control, creatures you control gain double strike until end of turn. diff --git a/forge-gui/res/cardsfolder/s/skitterskin.txt b/forge-gui/res/cardsfolder/s/skitterskin.txt index 0cb5e723573..8e526c99e55 100644 --- a/forge-gui/res/cardsfolder/s/skitterskin.txt +++ b/forge-gui/res/cardsfolder/s/skitterskin.txt @@ -6,5 +6,6 @@ K:Devoid K:CARDNAME can't block. A:AB$ Regenerate | Cost$ 1 B | CheckSVar$ X | SVarCompare$ GE1 | References$ X | SpellDescription$ Regenerate CARDNAME. Activate this ability only if you control another colorless creature. SVar:X:Count$Valid Creature.Colorless+YouCtrl+Other +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/skitterskin.jpg Oracle:Devoid (This card has no color.)\nSkitterskin can't block.\n{1}{B}: Regenerate Skitterskin. Activate this ability only if you control another colorless creature. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/s/sky_scourer.txt b/forge-gui/res/cardsfolder/s/sky_scourer.txt index 63245999e11..15d96b86a19 100644 --- a/forge-gui/res/cardsfolder/s/sky_scourer.txt +++ b/forge-gui/res/cardsfolder/s/sky_scourer.txt @@ -7,5 +7,6 @@ K:Flying T:Mode$ SpellCast | ValidCard$ Card.Colorless | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a colorless spell, CARDNAME gets +1/+0 until end of turn. SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ +1 SVar:BuffedBy:Card.Colorless +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/sky_scourer.jpg Oracle:Devoid (This card has no color.)\nFlying\nWhenever you cast a colorless spell, Sky Scourer gets +1/+0 until end of turn. diff --git a/forge-gui/res/cardsfolder/s/spawnbinder_mage.txt b/forge-gui/res/cardsfolder/s/spawnbinder_mage.txt index ed26bc35ad6..6f081c44056 100644 --- a/forge-gui/res/cardsfolder/s/spawnbinder_mage.txt +++ b/forge-gui/res/cardsfolder/s/spawnbinder_mage.txt @@ -4,5 +4,6 @@ Types:Creature Human Wizard Ally PT:2/4 A:AB$ Tap | Cost$ T tapXType<1/Ally> | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature. SVar:RemAIDeck:True +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/spawnbinder_mage.jpg Oracle:Cohort - {T}, Tap an untapped Ally you control: Tap target creature. diff --git a/forge-gui/res/cardsfolder/s/stoneforge_acolyte.txt b/forge-gui/res/cardsfolder/s/stoneforge_acolyte.txt index 6d57bd15f39..eab3daf36b1 100644 --- a/forge-gui/res/cardsfolder/s/stoneforge_acolyte.txt +++ b/forge-gui/res/cardsfolder/s/stoneforge_acolyte.txt @@ -3,5 +3,7 @@ ManaCost:W Types:Creature Kor Artificer Ally PT:1/2 A:AB$ Dig | Cost$ T tapXType<1/Ally> | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Equipment | SpellDescription$ Look at the top four cards of your library. You may reveal an Equipment card from among them and put it into your hand. Put the rest on the bottom of your library in any order. +SVar:RemAIDeck:True +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/stoneforge_acolyte.jpg Oracle:Cohort - {T}, Tap an untapped Ally you control: Look at the top four cards of your library. You may reveal an Equipment card from among them and put it into your hand. Put the rest on the bottom of your library in any order. diff --git a/forge-gui/res/cardsfolder/s/swarm_surge.txt b/forge-gui/res/cardsfolder/s/swarm_surge.txt index 008b75b66a0..22edba0480d 100644 --- a/forge-gui/res/cardsfolder/s/swarm_surge.txt +++ b/forge-gui/res/cardsfolder/s/swarm_surge.txt @@ -4,5 +4,6 @@ Types:Sorcery K:Devoid A:SP$ PumpAll | Cost$ 2 B | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | SubAbility$ DBPumpAll | SpellDescription$ Creatures you control get +2/+0 until end of turn. Colorless creatures you control also gain first strike until end of turn. SVar:DBPumpAll:DB$PumpAll | ValidCards$ Creature.Colorless+YouCtrl | KW$ First Strike +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/swarm_surge.jpg Oracle:Devoid (This card has no color.)\nCreatures you control get +2/+0 until end of turn. Colorless creatures you control also gain first strike until end of turn. diff --git a/forge-gui/res/cardsfolder/t/tajuru_beastmaster.txt b/forge-gui/res/cardsfolder/t/tajuru_beastmaster.txt index 9a508e5df23..a4f039b766f 100644 --- a/forge-gui/res/cardsfolder/t/tajuru_beastmaster.txt +++ b/forge-gui/res/cardsfolder/t/tajuru_beastmaster.txt @@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1 SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/tajuru_beastmaster.jpg Oracle:Rally - Whenever Tajuru Beastmaster or another Ally enters the battlefield under your control, creatures you control get +1/+1 until end of turn. diff --git a/forge-gui/res/cardsfolder/t/tajuru_warcaller.txt b/forge-gui/res/cardsfolder/t/tajuru_warcaller.txt index 5a2533ffa54..64d4b2d9b63 100644 --- a/forge-gui/res/cardsfolder/t/tajuru_warcaller.txt +++ b/forge-gui/res/cardsfolder/t/tajuru_warcaller.txt @@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +2 SVar:PlayMain1:TRUE SVar:BuffedBy:Ally +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/tajuru_warcaller.jpg Oracle:Rally - Whenever Tajuru Warcaller or another Ally enters the battlefield under your control, creatures you control get +2/+2 until end of turn. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/t/thought_harvester.txt b/forge-gui/res/cardsfolder/t/thought_harvester.txt index 560b27ab928..f8682dd4367 100644 --- a/forge-gui/res/cardsfolder/t/thought_harvester.txt +++ b/forge-gui/res/cardsfolder/t/thought_harvester.txt @@ -7,5 +7,6 @@ K:Flying T:Mode$ SpellCast | ValidCard$ Card.Colorless | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever you cast a colorless spell, target opponent exiles the top card of his or her library. SVar:TrigMill:AB$ Mill | Cost$ 0 | NumCards$ 1 | Destination$ Exile | ValidTgts$ Opponent | TgtPrompt$ Choose the target opponent SVar:BuffedBy:Card.Colorless +DeckHints:Color$Colorless SVar:Picture:http://www.wizards.com/global/images/magic/general/thought_harvester.jpg Oracle:Devoid (This card has no color.)\nFlying\nWhenever you cast a colorless spell, target opponent exiles the top card of his or her library. diff --git a/forge-gui/res/cardsfolder/t/titans_presence.txt b/forge-gui/res/cardsfolder/t/titans_presence.txt index 64f0ce80371..1345f014b39 100644 --- a/forge-gui/res/cardsfolder/t/titans_presence.txt +++ b/forge-gui/res/cardsfolder/t/titans_presence.txt @@ -5,5 +5,6 @@ A:SP$ ChangeZone | Cost$ 3 Reveal<1/Creature.Colorless> | ValidTgts$ Creature | SVar:Y:Revealed$CardPower SVar:X:Targeted$CardPower SVar:RemAIDeck:True +DeckHints:Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/titans_presence.jpg Oracle:As an additional cost to cast Titan's Presence, reveal a colorless creature card from your hand.\nExile target creature if its power is less than or equal to the revealed card's power. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/u/unified_front.txt b/forge-gui/res/cardsfolder/u/unified_front.txt index 24af25e2e3f..6dc4ed84e45 100644 --- a/forge-gui/res/cardsfolder/u/unified_front.txt +++ b/forge-gui/res/cardsfolder/u/unified_front.txt @@ -3,5 +3,6 @@ ManaCost:3 W Types:Sorcery A:SP$ Token | Cost$ 3 W | TokenAmount$ X | References$ X | TokenName$ Kor Ally | TokenTypes$ Creature,Kor,Ally | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Converge — Put a 1/1 white Kor Ally creature token onto the battlefield for each color of mana spent to cast CARDNAME. SVar:X:Count$Converge +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/unified_front.jpg Oracle:Converge — Put a 1/1 white Kor Ally creature token onto the battlefield for each color of mana spent to cast Unified Front. diff --git a/forge-gui/res/cardsfolder/v/veteran_warleader.txt b/forge-gui/res/cardsfolder/v/veteran_warleader.txt index e020accf98f..7116ed839c2 100644 --- a/forge-gui/res/cardsfolder/v/veteran_warleader.txt +++ b/forge-gui/res/cardsfolder/v/veteran_warleader.txt @@ -10,5 +10,6 @@ SVar:ChooseVigilance:DB$ Pump | Defined$ Self | KW$ Vigilance | SpellDescription SVar:ChooseTrample:DB$ Pump | Defined$ Self | KW$ Trample | SpellDescription$ CARDNAME gains trample until end of turn. SVar:BuffedBy:Creature SVar:NoZeroToughnessAI:True +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/veteran_warleader.jpg Oracle:Veteran Warleader's power and toughness are each equal to the number of creatures you control.\nTap another untapped Ally you control: Veteran Warleader gains your choice of first strike, vigilance, or trample until end of turn. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/v/vile_aggregate.txt b/forge-gui/res/cardsfolder/v/vile_aggregate.txt index cacb59d6aa9..9183ce13299 100644 --- a/forge-gui/res/cardsfolder/v/vile_aggregate.txt +++ b/forge-gui/res/cardsfolder/v/vile_aggregate.txt @@ -8,6 +8,6 @@ SVar:X:Count$Valid Creature.Colorless+YouCtrl K:Trample K:Ingest SVar:BuffedBy:Creature.Colorless -DeckHints:Type$Processor +DeckHints:Type$Processor & Color$Colorless & Keyword$Devoid SVar:Picture:http://www.wizards.com/global/images/magic/general/vile_aggregate.jpg Oracle:Devoid (This card has no color.)\nVile Aggregate's power is equal to the number of colorless creatures you control.\nTrample\nIngest (Whenever this creature deals combat damage to a player, that player exiles the top card of his or her library.) diff --git a/forge-gui/res/cardsfolder/z/zadas_commando.txt b/forge-gui/res/cardsfolder/z/zadas_commando.txt index 11ba17d4c1c..5101b658832 100644 --- a/forge-gui/res/cardsfolder/z/zadas_commando.txt +++ b/forge-gui/res/cardsfolder/z/zadas_commando.txt @@ -4,5 +4,7 @@ Types:Creature Goblin Archer Ally PT:2/1 K:First Strike A:AB$ DealDamage | Cost$ T tapXType<1/Ally> | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target opponent. +SVar:RemAIDeck:True +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/zadas_commando.jpg Oracle:First strike\nCohort - {T}, Tap an untapped Ally you control: Zada's Commando deals 1 damage to target opponent. diff --git a/forge-gui/res/cardsfolder/z/zulaport_chainmage.txt b/forge-gui/res/cardsfolder/z/zulaport_chainmage.txt index cd3c750276f..653126604c1 100644 --- a/forge-gui/res/cardsfolder/z/zulaport_chainmage.txt +++ b/forge-gui/res/cardsfolder/z/zulaport_chainmage.txt @@ -3,5 +3,7 @@ ManaCost:3 B Types:Creature Human Shaman Ally PT:4/2 A:AB$ LoseLife | Cost$ T tapXType<1/Ally> | LifeAmount$ 2 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SpellDescription$ Target opponent loses 2 life. +SVar:RemAIDeck:True +DeckHints:Type$Ally SVar:Picture:http://www.wizards.com/global/images/magic/general/zulaport_chainmage.jpg Oracle:Cohort - {T}, Tap an untapped Ally you control: Target opponent loses 2 life. diff --git a/forge-gui/src/main/java/forge/limited/CardRanker.java b/forge-gui/src/main/java/forge/limited/CardRanker.java index 432eca0f1f9..f01587cbe08 100644 --- a/forge-gui/src/main/java/forge/limited/CardRanker.java +++ b/forge-gui/src/main/java/forge/limited/CardRanker.java @@ -148,6 +148,14 @@ public class CardRanker { score += Iterables.size(cards) * typeFactors.get(type); } } + final DeckHints needs = card.getRules().getAiHints().getDeckNeeds(); + if (needs != null && needs.isValid()) { + final Map> cardsByType = needs.filterByType(otherCards); + for (DeckHints.Type type : cardsByType.keySet()) { + Iterable cards = cardsByType.get(type); + score += Iterables.size(cards) * typeFactors.get(type); + } + } return score; } diff --git a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java index 991dbaba374..5c8edac2714 100644 --- a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java @@ -557,13 +557,11 @@ public class LimitedDeckBuilder extends DeckGeneratorBase { final CardAiHints ai = card.getRules().getAiHints(); if (ai.getRemRandomDecks()) { final List comboCards = new ArrayList(); - if (ai.getDeckNeeds() != null - && ai.getDeckNeeds().isValid()) { + if (ai.getDeckNeeds() != null && ai.getDeckNeeds().isValid()) { final DeckHints needs = ai.getDeckNeeds(); comboCards.addAll(needs.filter(deckList)); } - if (ai.getDeckHints() != null - && ai.getDeckHints().isValid()) { + if (ai.getDeckHints() != null && ai.getDeckHints().isValid()) { final DeckHints hints = ai.getDeckHints(); comboCards.addAll(hints.filter(deckList)); }