diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt index f004096cf..4c6afb3e7 100644 --- a/projects/mtg/bin/Res/sets/primitives/mtg.txt +++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt @@ -7995,7 +7995,7 @@ type=Enchantment [/card] [card] name=Awe for the Guilds -auto=all(creature[-multicolor]) cantblock ueot +auto=all(creature[-multicolor;-colorless]) cantblock ueot text=Monocolored creatures can't block this turn. mana={2}{R} type=Sorcery @@ -51183,7 +51183,7 @@ toughness=4 [/card] [card] name=Guardian of the Guildpact -auto=protection from(*[-multicolor]) +auto=protection from(*[-multicolor;-colorless]) text=Protection from monocolored mana={3}{W} type=Creature @@ -61893,8 +61893,7 @@ toughness=2 [/card] [card] name=Kavu Runner -abilities=haste -auto=aslongas(creature[blue;white]|opponentBattlefield) -haste +auto=aslongas(creature[blue;white]|opponentBattlefield) haste <1 text=Kavu Runner has haste as long as no opponent controls a white or blue creature. mana={3}{R} type=Creature @@ -115127,7 +115126,7 @@ type=Artifact [/card] [card] name=Sultai Charm -auto=choice name(Destroy monocolored) destroy target(creature[-multicolor]) +auto=choice name(Destroy monocolored) destroy target(creature[-multicolor;-colorless]) auto=choice name(destroy artifact or enchantment) destroy target(artifact,enchantment) auto=choice name(Draw 2 and discard 1) draw:2 && transforms((,newability[target(*|myhand) reject])) forever text=Choose one: -- Destroy target monocolored creature. -- Destroy target artifact or enchantment. -- Draw two cards, then discard a card. @@ -125144,7 +125143,7 @@ toughness=2 [/card] [card] name=Ultimate Price -target=creature[-multicolor] +target=creature[-multicolor;-colorless] auto=destroy text=Destroy target monocolored creature. mana={1}{B} diff --git a/projects/mtg/src/AIPlayerBaka.cpp b/projects/mtg/src/AIPlayerBaka.cpp index 20566c6ae..61323df8c 100644 --- a/projects/mtg/src/AIPlayerBaka.cpp +++ b/projects/mtg/src/AIPlayerBaka.cpp @@ -2543,6 +2543,9 @@ MTGCardInstance * AIPlayerBaka::FindCardToPlay(ManaCost * pMana, const char * ty if (card->hasType(Subtypes::TYPE_LEGENDARY) && game->inPlay->findByName(card->name)) continue; + if (card->has(Constants::TREASON) && observer->getCurrentGamePhase() != MTG_PHASE_FIRSTMAIN) + continue; + if (card->hasType(Subtypes::TYPE_PLANESWALKER) && card->types.size() > 0 && game->inPlay->hasTypeSpecificInt(Subtypes::TYPE_PLANESWALKER,card->types[1])) continue; @@ -2691,6 +2694,9 @@ MTGCardInstance * AIPlayerBaka::FindCardToPlay(ManaCost * pMana, const char * ty if (card->hasType(Subtypes::TYPE_LEGENDARY) && game->inPlay->findByName(card->name)) continue; + if (card->has(Constants::TREASON) && observer->getCurrentGamePhase() != MTG_PHASE_FIRSTMAIN) + continue; + if (card->hasType(Subtypes::TYPE_PLANESWALKER) && card->types.size() > 0 && game->inPlay->hasTypeSpecificInt(Subtypes::TYPE_PLANESWALKER,card->types[1])) continue; @@ -2838,6 +2844,9 @@ MTGCardInstance * AIPlayerBaka::FindCardToPlay(ManaCost * pMana, const char * ty if (card->hasType(Subtypes::TYPE_LEGENDARY) && game->inPlay->findByName(card->name)) continue; + if (card->has(Constants::TREASON) && observer->getCurrentGamePhase() != MTG_PHASE_FIRSTMAIN) + continue; + if (card->hasType(Subtypes::TYPE_PLANESWALKER) && card->types.size() > 0 && game->inPlay->hasTypeSpecificInt(Subtypes::TYPE_PLANESWALKER,card->types[1])) continue;