diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt index 2b2e2c3ba..5ac11eec8 100644 --- a/projects/mtg/bin/Res/sets/primitives/borderline.txt +++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt @@ -352,3 +352,13 @@ mana={B} type=Instant text=Target creature gets +2/+0 and gains deathtouch until end of turn. Rebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.) [/card] +[card] +name=Yixlid Jailer +auto=lord(*|graveyard) loseabilities +text=Cards in graveyards lose all abilities. +mana={1}{B} +type=Creature +subtype=Zombie Wizard +power=2 +toughness=1 +[/card] diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt index ed0a3183f..d3e73b4e7 100644 --- a/projects/mtg/bin/Res/sets/primitives/mtg.txt +++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt @@ -18074,7 +18074,6 @@ toughness=2 [/card] [card] name=Cho-Manno's Blessing -alias=1000 abilities=auraward target=creature abilities=flash @@ -19799,7 +19798,6 @@ toughness=1 [/card] [card] name=Coldsteel Heart -alias=1000 auto=tap auto=chooseacolor {T}:add{chosencolor} chooseend text=Coldsteel Heart enters the battlefield tapped. -- As Coldsteel Heart enters the battlefield, choose a color. -- {T}: Add one mana of the chosen color to your mana pool. @@ -23086,7 +23084,6 @@ subtype=Aura Curse [/card] [card] name=Curse of Wizardry -alias=1000 auto=chooseacolor transforms((,newability[@movedto(*[chosencolor]|mystack):life:-1 controller],newability[@movedto(*[chosencolor]|opponentstack):life:-1 opponent])) chooseend text=As Curse of Wizardry enters the battlefield, choose a color. -- Whenever a player casts a spell of the chosen color, that player loses 1 life. mana={2}{B}{B} @@ -38501,7 +38498,6 @@ toughness=2 [/card] [card] name=Flickering Ward -alias=1000 abilities=auraward target=creature auto=chooseacolor teach(creature) protection from(*[chosencolor]) chooseend @@ -38594,7 +38590,6 @@ toughness=1 [/card] [card] name=Floating Shield -alias=1000 abilities=auraward target=creature auto=chooseacolor teach(creature) protection from(*[chosencolor]) chooseend @@ -47795,7 +47790,6 @@ toughness=3 [/card] [card] name=Hall of Triumph -alias=1000 auto=activatechooseacolor transforms((,newability[lord(creature[chosencolor]|mybattlefield) 1/1])) forever activatechooseend text=As Hall of Triumph enters the battlefield, choose a color. -- Creatures you control of the chosen color get +1/+1. mana={3} @@ -54288,7 +54282,6 @@ type=Enchantment [/card] [card] name=Iona, Shield of Emeria -alias=1000 abilities=flying auto=chooseacolor maxCast(*[chosencolor])0 opponent chooseend text=Flying -- As Iona, Shield of Emeria enters the battlefield, choose a color. -- Your opponents can't cast spells of the chosen color. @@ -55511,7 +55504,6 @@ toughness=3 [/card] [card] name=Jihad -alias=1000 auto=chooseacolor transforms((,newability[aslongas(*[chosencolor]|opponentbattlefield) lord(creature[white]|mybattlefield) 2/1],newability[aslongas(*[chosencolor]|opponentbattlefield) sacrifice <1])) chooseend text=As Jihad enters the battlefield, choose a color and an opponent. -- White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color. -- When the chosen player controls no nontoken permanents of the chosen color, sacrifice Jihad. mana={W}{W}{W} @@ -63814,7 +63806,6 @@ type=Instant [/card] [card] name=Lurebound Scarecrow -alias=1000 auto=chooseacolor aslongas(*[chosencolor]|myBattlefield) sacrifice <1 chooseend text=As Lurebound Scarecrow enters the battlefield, choose a color. -- When you control no permanents of the chosen color, sacrifice Lurebound Scarecrow. mana={3} @@ -77825,7 +77816,6 @@ subtype=Equipment [/card] [card] name=Paradise Plume -alias=1000 auto=chooseacolor transforms((,newability[{T}:add{chosencolor}],newability[@movedto(*[chosencolor]|stack):life:1 controller])) forever chooseend text=As Paradise Plume enters the battlefield, choose a color. -- Whenever a player casts a spell of the chosen color, you may gain 1 life. -- {T}: Add one mana of the chosen color to your mana pool. mana={4} @@ -78657,7 +78647,6 @@ type=Artifact [/card] [card] name=Pentarch Paladin -alias=1000 abilities=flanking auto=chooseacolor {W}{W}{T}:destroy target(*[chosencolor]) chooseend text=Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.) -- As Pentarch Paladin enters the battlefield, choose a color. -- {W}{W}, {T}: Destroy target permanent of the chosen color. @@ -78669,7 +78658,6 @@ toughness=3 [/card] [card] name=Pentarch Ward -alias=1000 abilities=auraward target=creature auto=chooseacolor teach(creature) protection from(*[chosencolor]) chooseend @@ -81995,7 +81983,6 @@ type=Enchantment [/card] [card] name=Prism Ring -alias=1000 auto=activatechooseacolor transforms((,newability[@movedto(*[chosencolor]|mystack):life:1 controller])) forever activatechooseend text=As Prism Ring enters the battlefield, choose a color. -- Whenever you cast a spell of the chosen color, you gain 1 life. mana={1} @@ -82511,7 +82498,6 @@ toughness=2 [/card] [card] name=Psychic Allergy -alias=1000 auto=upcost[{S(island|mybattlefield)}{S(island|mybattlefield)}] sacrifice auto=chooseacolor transforms((,newability[@each opponent upkeep:damage:type:*[-token&chosencolor]:opponentbattlefield opponent])) chooseend text=As Psychic Allergy enters the battlefield, choose a color. -- At the beginning of each opponent's upkeep, Psychic Allergy deals X damage to that player, where X is the number of nontoken permanents of the chosen color he or she controls. -- At the beginning of your upkeep, destroy Psychic Allergy unless you sacrifice two Islands. @@ -83732,7 +83718,6 @@ toughness=1 [/card] [card] name=Quirion Elves -alias=1000 auto={T}:Add{G} auto=chooseacolor {T}:add{chosencolor} chooseend text=As Quirion Elves enters the battlefield, choose a color. -- {T}: Add {G} to your mana pool. -- {T}: Add one mana of the chosen color to your mana pool. @@ -96152,7 +96137,6 @@ subtype=Shapeshifter [/card] [card] name=Shifting Sky -alias=1000 auto=chooseacolor lord(*[-land]) becomes(,chosencolor) chooseend text=As Shifting Sky enters the battlefield, choose a color. -- All nonland permanents are the chosen color. mana={2}{U} @@ -97574,7 +97558,6 @@ toughness=1 [/card] [card] name=Silhana Starfletcher -alias=1000 abilities=reach auto=activatechooseacolor {T}:add{chosencolor} activatechooseend text=Reach (This creature can block creatures with flying.) -- As Silhana Starfletcher enters the battlefield, choose a color. -- {T}: Add one mana of the chosen color to your mana pool. @@ -100750,7 +100733,6 @@ toughness=3 [/card] [card] name=Sol Grail -alias=1000 auto=chooseacolor transforms((,newability[{T}:add{chosencolor}])) forever chooseend text=As Sol Grail enters the battlefield, choose a color. -- {T}: Add one mana of the chosen color to your mana pool. mana={3} @@ -109705,7 +109687,6 @@ type=Legendary Land [/card] [card] name=Teferi's Moat -alias=1000 auto=chooseacolor lord(creature[chosencolor&-flying]|opponentBattlefield) cantattack chooseend text=As Teferi's Moat enters the battlefield, choose a color. -- Creatures of the chosen color without flying can't attack you. mana={3}{W}{U} @@ -120490,7 +120471,6 @@ toughness=2 [/card] [card] name=Voice of All -alias=1000 abilities=flying auto=chooseacolor transforms((,newability[protection from(*[chosencolor])],newability[0/0])) forever chooseend text=Flying (This creature can't be blocked except by creatures with flying or reach.) -- As Voice of All enters the battlefield, choose a color. -- Voice of All has protection from the chosen color. (It can't be blocked, targeted, dealt damage, or enchanted by anything of the chosen color.) @@ -122372,7 +122352,6 @@ toughness=1 [/card] [card] name=Ward Sliver -alias=1000 auto=chooseacolor transforms((,newability[lord(sliver) protection from(*[chosencolor])])) forever chooseend text=As Ward Sliver enters the battlefield, choose a color. -- All Slivers have protection from the chosen color. mana={4}{W} @@ -126618,16 +126597,6 @@ power=2 toughness=3 [/card] [card] -name=Yixlid Jailer -auto=lord(*|graveyard) loseabilities -text=Cards in graveyards lose all abilities. -mana={1}{B} -type=Creature -subtype=Zombie Wizard -power=2 -toughness=1 -[/card] -[card] name=Yoke of the Damned target=creature auto=@movedTo(graveyard) from(creature|battlefield):destroy diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index b8584c7bd..2b1c20dc7 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -386,7 +386,7 @@ void CardGui::Render() buff = "C"; //if(card->has(Constants::PAYZERO)) //buff += "Z"; - if(card->alias == 1000) + if(card->chooseacolor >= 1) { if(card->chooseacolor == 1) buff += "\n-Green"; diff --git a/projects/mtg/src/MTGDefinitions.cpp b/projects/mtg/src/MTGDefinitions.cpp index 7b88e7964..3b6c6f0d5 100644 --- a/projects/mtg/src/MTGDefinitions.cpp +++ b/projects/mtg/src/MTGDefinitions.cpp @@ -164,7 +164,7 @@ const char* Constants::MTGBasicAbilities[] = { "nosolo", "mustblock", "dethrone", - "overload", + "overload" }; map Constants::MTGBasicAbilitiesMap;