diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt index 77054a78b..3bce18629 100644 --- a/projects/mtg/bin/Res/sets/primitives/borderline.txt +++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt @@ -850,7 +850,7 @@ abilities=flying anyzone=type:artifact:myBattlefield/4 cdaactive auto={crew(other creature[power>=1]|myBattlefield)}:name(crew 1 [1 creature]) becomes(Artifact Creature) ueot restriction{type(other creature[-tapped;power>=1]|mybattlefield)~morethan~0,compare(crewtotalpower)~morethan~0} text=Flying -- Aetherwing, Golden-Scale Flagship's power is equal to the number of artifacts you control. -- Crew 1 (Tap any number of creatures you control with total power 1 or more: This Vehicle becomes an artifact creature until end of turn.) -coor=blue,red +color=blue,red type=Legendary Artifact subtype=Vehicle power=* @@ -10046,7 +10046,7 @@ toughness=2 [card] name=Boreas Charger abilities=flying -auto=@movedto(this|nonbattlezone) restriction{type(land|opponentbattlefield)~morethan~type(land|myBattlefield)}:name(Search plains) target(plains|mylibrary) moveto(myBattlefield) and!( transforms((,newability[tap(noevent)],newability[if type(land|opponentbattlefield)~morethan~type(land|myBattlefield) then name(Search other plains) name(Search other plains) target(land|mylibrary) moveto(myhand)])) oneshot )! +auto=@movedto(this|nonbattlezone) restriction{type(land|opponentbattlefield)~morethan~type(land|myBattlefield)}:name(Search plains) target(plains|mylibrary) moveto(myBattlefield) and!( transforms((,newability[tap(noevent)],newability[if type(land|opponentbattlefield)~morethan~type(land|myBattlefield) then name(Search other plains) name(Search other plains) target(plains|mylibrary) moveto(myhand)])) oneshot )! text=Flying -- When Boreas Charger leaves the battlefield, choose an opponent who controls more lands than you. Search your library for a number of Plains cards equal to the difference and reveal them. Put one of them onto the battlefield tapped and the rest into your hand. Then shuffle your library. mana={2}{W} type=Creature @@ -39486,7 +39486,7 @@ type=Instant [card] name=Heartfire Immolator abilities=prowess -auto=@movedTo(*[-creature]|myStack) 1/1 ueot +auto=@movedTo(*[-creature]|myStack):1/1 ueot auto={R}{S}:target(creature,planeswalker) dynamicability text=Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.) -- {R}, Sacrifice Heartfire Immolator: It deals damage equal to its power to target creature or planeswalker. mana={1}{R} @@ -62600,7 +62600,6 @@ name=Pariah's Shield auto={3}:equip auto=teach(creature) cantlifelose auto=teach(creature) transforms((,newability[@damageof(player):life:thatmuch controller && damage:thatmuch all(this)])) -auto=@damageof(player):life:thatmuch controller && damage:thatmuch all(this) text=All damage that would be dealt to you is dealt to equipped creature instead. -- Equip {3} mana={5} type=Artifact @@ -74398,7 +74397,7 @@ toughness=4 [card] name=Scatter Ray target=artifact,creature|stack -auto=transforms((,newability[pay[[{4}]] name(pay 4 mana) donothing-fizzle])) forever +auto=transforms((,newability[pay[[{4}]] name(pay 4 mana) donothing?fizzle])) forever text=Counter target artifact or creature spell unless its controller pays {4}. mana={1}{U} type=Instant @@ -100549,7 +100548,7 @@ toughness=8 [card] name=Zimone and Dina auto=_SECOND_DRAW_name(Gain life) life:-2 opponent && life:2 controller -auto={T}{S(other creature|mybattlefield)}:name(Draw a card) transforms((,newability[draw:1 controller],newability[may name(Put land in play) target(land|myhand) moveto(mybattlefield) and!( transforms((,newability[tap(noevent)],newability[if type(land|mybattlefield)~morethan~7 then name(Put land in play) draw:1 controller && ability$!may name(Put land in play) target(land|myhand) moveto(mybattlefield) and!( tap(noevent) )! !$ controller])) oneshot )!])) oneshot )! +auto={T}{S(other creature|mybattlefield)}:name(Draw a card) transforms((,newability[draw:1 controller],newability[may name(Put land in play) target(land|myhand) moveto(mybattlefield) and!( transforms((,newability[tap(noevent)],newability[if type(land|mybattlefield)~morethan~7 then name(Put land in play) draw:1 controller && ability$!may name(Put land in play) target(land|myhand) moveto(mybattlefield) and!( tap(noevent) )! !$ controller])) oneshot )!])) oneshot text=Whenever you draw your second card each turn, target opponent loses 2 life and you gain 2 life. -- {T}, Sacrifice another creature: Draw a card. You may put a land card from your hand onto the battlefield tapped. If you control eight or more lands, repeat this process once. mana={B}{G}{U} type=Legendary Creature diff --git a/projects/mtg/src/Rules.cpp b/projects/mtg/src/Rules.cpp index 73082e17b..b31a4614c 100644 --- a/projects/mtg/src/Rules.cpp +++ b/projects/mtg/src/Rules.cpp @@ -382,7 +382,8 @@ Player * Rules::loadPlayerRandomThree(GameObserver* observer, int isAI) tempDeck->addRandomCards(3, 0, 0, -1, "enchantment", colors, nbcolors); tempDeck->addRandomCards(3, 0, 0, -1, "instant", colors, nbcolors); tempDeck->addRandomCards(3, 0, 0, -1, "sorcery", colors, nbcolors); - tempDeck->addRandomCards(4, 0, 0, -1, "artifact", colors, nbcolors); + tempDeck->addRandomCards(3, 0, 0, -1, "artifact", colors, nbcolors); + tempDeck->addRandomCards(1, 0, 0, -1, "battle", colors, nbcolors); tempDeck->addRandomCards(1, 0, 0, -1, "planeswalker", colors, nbcolors); string deckFile = "random"; @@ -458,10 +459,10 @@ Player * Rules::loadPlayerRandomCommander(GameObserver* observer, int isAI) numLands /= colors.size() - 1; for (unsigned int i = 1; i < colors.size(); i++) { - tempDeck->addRandomCards(numLands, 0, 0, 'L', lands[colors.data()[i]].c_str()); + tempDeck->addRandomCards(numLands, 0, 0, Constants::RARITY_L, lands[colors.data()[i]].c_str()); } } - else { tempDeck->addRandomCards(numLands, 0, 0, 'L'); } + else { tempDeck->addRandomCards(numLands, 0, 0, Constants::RARITY_L); } tempDeck->addRandomCards(59, 0, 0, -1, "", colors.data(), colors.size()); @@ -531,7 +532,7 @@ Player * Rules::loadPlayerHorde(GameObserver* observer, int isAI) tempDeck->addRandomCards(5, 0, 0, -1, "enchantment", tribeColor, nbColors); tempDeck->addRandomCards(5, 0, 0, -1, "instant", tribeColor, nbColors); tempDeck->addRandomCards(5, 0, 0, -1, "sorcery", tribeColor, nbColors); - tempDeck->addRandomCards(1, 0, 0, -1, "artifact"); + tempDeck->addRandomCards(1, 0, 0, -1, "battle", tribeColor, nbColors); string deckFile = "random"; string deckFileSmall = "random"; diff --git a/projects/mtg/src/WGui.cpp b/projects/mtg/src/WGui.cpp index b9f37ab75..fd60306bc 100644 --- a/projects/mtg/src/WGui.cpp +++ b/projects/mtg/src/WGui.cpp @@ -2110,6 +2110,7 @@ void WGuiFilterItem::updateValue() mParent->addArg("Land", "t:Land;"); mParent->addArg("Legendary", "t:Legendary;"); mParent->addArg("Sorcery", "t:Sorcery;"); + mParent->addArg("Snow", "t:Snow;"); mParent->addArg("Tribal", "t:Tribal;"); mParent->addArg("Planeswalker", "t:Planeswalker;"); mParent->addArg("Battle", "t:Battle;");