diff --git a/res/cards.txt b/res/cards.txt index 6f2a4d591f2..ee0ecf873a6 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,16 @@ +People of the Woods +G G +Creature Human +People of the Woods's toughness is equal to the number of Forests you control. +1/1 + +Aven Trailblazer +2 W +Creature Bird Soldier +Domain - Aven Trailblazer's toughness is equal to the number of basic land types among lands you control. +2/1 +Flying + Lady Caleria 3 G G W W Legendary Creature Human Archer @@ -4784,13 +4797,6 @@ no text spDiscardTgt:TgtChoose:X:Target player discards a card for each Swamp you control.:Mind Sludge - target player discards cards SVar:X:Count$TypeYouCtrl.Swamp -Aven Trailblazer -2 W -Creature Bird Soldier -Domain - Aven Trailblazer's toughness is equal to the number of basic land types among lands you control. -2/0 -Flying - Psychatog 1 U B Creature Atog @@ -9887,12 +9893,6 @@ no cost Land tap: Sacrifice a creature: You gain life equal to the sacrificed creature's toughness. -People of the Woods -G G -Creature Human -People of the Woods's toughness is equal to the number of Forests you control. -1/0 - Gaea's Avenger 1 G G Creature Treefolk diff --git a/res/common.txt b/res/common.txt index 2f448902c45..9ad01b7f63e 100644 --- a/res/common.txt +++ b/res/common.txt @@ -1738,3 +1738,15 @@ Shock Troops Aeolipile Orcish Bloodpainter Orcish Mechanics +Frostwind Invoker +Goblin Lookout +Ghost Tactician +Lavafume Invoker +Deglamer +Saprazzan Raider +Zephyr Spirit +Tukatongue Thallid +Jackalope Herd +Viashino Sandscout +Fists of Ironwood +Lys Alana Huntmaster diff --git a/res/quest/common.txt b/res/quest/common.txt index 2f448902c45..9ad01b7f63e 100644 --- a/res/quest/common.txt +++ b/res/quest/common.txt @@ -1738,3 +1738,15 @@ Shock Troops Aeolipile Orcish Bloodpainter Orcish Mechanics +Frostwind Invoker +Goblin Lookout +Ghost Tactician +Lavafume Invoker +Deglamer +Saprazzan Raider +Zephyr Spirit +Tukatongue Thallid +Jackalope Herd +Viashino Sandscout +Fists of Ironwood +Lys Alana Huntmaster diff --git a/res/quest/rare.txt b/res/quest/rare.txt index 5da2232fca3..636992b7f5a 100644 --- a/res/quest/rare.txt +++ b/res/quest/rare.txt @@ -1006,3 +1006,14 @@ Megatog Auratog Unyaro Bees Keldon Necropolis +Diamond Faerie +Gerrard's Battle Cry +Leonin Sun Standard +Steel Overseer +Mirror Gallery +Gwafa Hazid, Profiteer +Parallel Evolution +Rotlung Reanimator +Quicksilver Amulet +Wildfire +Destructive Force diff --git a/res/quest/uncommon.txt b/res/quest/uncommon.txt index 17cfd3fe1f9..2c9f766eb57 100644 --- a/res/quest/uncommon.txt +++ b/res/quest/uncommon.txt @@ -1074,3 +1074,18 @@ Blasting Station Blood Rites Scorched Rusalka Tar Pitcher +Aerie Mystics +Goblin Soothsayer +Skyshaper +Stampede Driver +Kulrath Knight +Timid Drake +Symbiotic Beast +Haru-Onna +Grixis Slavedriver +Breeding Pit +Viashino Cutthroat +Viashino Sandstalker +Infested Roothold +Lady Caleria +Tor Wauki diff --git a/res/rare.txt b/res/rare.txt index 5da2232fca3..636992b7f5a 100644 --- a/res/rare.txt +++ b/res/rare.txt @@ -1006,3 +1006,14 @@ Megatog Auratog Unyaro Bees Keldon Necropolis +Diamond Faerie +Gerrard's Battle Cry +Leonin Sun Standard +Steel Overseer +Mirror Gallery +Gwafa Hazid, Profiteer +Parallel Evolution +Rotlung Reanimator +Quicksilver Amulet +Wildfire +Destructive Force diff --git a/res/uncommon.txt b/res/uncommon.txt index 17cfd3fe1f9..2c9f766eb57 100644 --- a/res/uncommon.txt +++ b/res/uncommon.txt @@ -1074,3 +1074,18 @@ Blasting Station Blood Rites Scorched Rusalka Tar Pitcher +Aerie Mystics +Goblin Soothsayer +Skyshaper +Stampede Driver +Kulrath Knight +Timid Drake +Symbiotic Beast +Haru-Onna +Grixis Slavedriver +Breeding Pit +Viashino Cutthroat +Viashino Sandstalker +Infested Roothold +Lady Caleria +Tor Wauki diff --git a/src/forge/CardFactory_Lands.java b/src/forge/CardFactory_Lands.java index fdc7f7c106a..d34ff30b92c 100644 --- a/src/forge/CardFactory_Lands.java +++ b/src/forge/CardFactory_Lands.java @@ -2408,7 +2408,7 @@ class CardFactory_Lands { @Override public boolean canPlayAI() { - return getAttacker() != null; + return getLegendaryAttackers().size() > 0; } @Override @@ -2416,15 +2416,27 @@ class CardFactory_Lands { setTargetCard(getAttacker()); } - public Card getAttacker() { - //target creature that is going to attack + public CardList getLegendaryAttackers() { Combat c = ComputerUtil.getAttackers(); CardList att = new CardList(c.getAttackers()); + // Shizo can only target Legendary, don't target creatures that already have Fear + att = att.filter(new CardListFilter() { + public boolean addCard(Card c) { + return CardFactoryUtil.canTarget(card, c) && c.getType().contains("Legendary") + && !c.getIntrinsicKeyword().contains("Fear"); + } + }); att.remove(card); - att.shuffle(); + return att; + } + + public Card getAttacker() { + //target creature that is going to attack + CardList att = getLegendaryAttackers(); + if (att.size() == 0) return null; - if(att.size() != 0) return att.get(0); - else return null; + att.shuffle(); + return att.get(0); }//getAttacker() @Override