From 2d9cab915a89858601f18780aef3cdf8484d2d96 Mon Sep 17 00:00:00 2001 From: valfieri Date: Wed, 26 Aug 2020 09:25:49 +0200 Subject: [PATCH] Fixed some primitives and merged with last GIT commit. --- .../mtg/bin/Res/sets/primitives/borderline.txt | 16 ++++++++++++++-- projects/mtg/bin/Res/sets/primitives/mtg.txt | 15 ++++++++------- .../bin/Res/sets/primitives/planeswalkers.txt | 6 +++--- .../mtg/bin/Res/sets/primitives/unsupported.txt | 14 ++++++++------ 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt index e2b30a293..615eb28d0 100644 --- a/projects/mtg/bin/Res/sets/primitives/borderline.txt +++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt @@ -223,7 +223,8 @@ toughness=3 [card] name=Admiral's Order target=spell -auto=if raid altercost(colorless,-1) altercost(blue,-1) +other={U} name(Raid) +otherrestriction=raid auto=fizzle text=Raid — If you attacked with a creature this turn, you may pay {U} rather than pay this spell's mana cost. -- Counter target spell. mana={1}{U}{U} @@ -4960,6 +4961,17 @@ power=2 toughness=5 [/card] [card] +name=Caged Sun +auto=choice name(Green) transforms((,newability[lord(creature[green]|myBattlefield) 1/1],newability[lord(forest|myBattlefield) producecolor:green])) forever +auto=choice name(White) transforms((,newability[lord(creature[white]|myBattlefield) 1/1],newability[lord(plains|myBattlefield) producecolor:white])) forever +auto=choice name(Red) transforms((,newability[lord(creature[red]|myBattlefield) 1/1],newability[lord(mountain|myBattlefield) producecolor:red])) forever +auto=choice name(Black) transforms((,newability[lord(creature[black]|myBattlefield) 1/1],newability[lord(swamp|myBattlefield) producecolor:black])) forever +auto=choice name(Blue) transforms((,newability[lord(creature[blue]|myBattlefield) 1/1],newability[lord(island|myBattlefield) producecolor:blue])) forever +text=As Caged Sun enters the battlefield, choose a color. -- Creatures you control of the chosen color get +1/+1. -- Whenever a land's ability adds one or more mana of the chosen color to your mana pool, add one additional mana of that color to your mana pool. +mana={6} +type=Artifact +[/card +[card] name=Caged Zombie auto={1}{B}{T}:life:-2 opponent restriction{morbid} text={1}{B}, {T}: Each opponent loses 2 life. Activate this ability only if a creature died this turn. @@ -31149,7 +31161,7 @@ toughness=3 name=Repeating Barrage target=creature,player auto=damage:3 -autograveyard={3}{R}{R}restriction{if raid}:moveto(myhand) +autograveyard={3}{R}{R} restriction{raid}:moveto(myhand) text=Repeating Barrage deals 3 damage to target creature or player. -- Raid — {3}{R}{R}: Return Repeating Barrage from your graveyard to your hand. Activate this ability only if you attacked with a creature this turn. mana={1}{R}{R} type=Sorcery diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt index 694089b0a..5a51d2aa3 100644 --- a/projects/mtg/bin/Res/sets/primitives/mtg.txt +++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt @@ -44756,11 +44756,11 @@ type=Artifact [/card] [card] name=Gauntlet of Power -auto=choice name(green) all(this) transforms((,newability[lord(creature[green]|battlefield) 1/1],newability[lord(*[basic]|battlefield) producecolor:green])) forever -auto=choice name(blue) all(this) transforms((,newability[lord(creature[blue]|battlefield) 1/1],newability[lord(*[basic]|battlefield) producecolor:blue])) forever -auto=choice name(red) all(this) transforms((,newability[lord(creature[red]|battlefield) 1/1],newability[lord(*[basic]|battlefield) producecolor:red])) forever -auto=choice name(black) all(this) transforms((,newability[lord(creature[black]|battlefield) 1/1],newability[lord(*[basic]|battlefield) producecolor:black])) forever -auto=choice name(white) all(this) transforms((,newability[lord(creature[white]|battlefield) 1/1],newability[lord(*[basic]|battlefield) producecolor:white])) forever +auto=choice name(green) all(this) transforms((,newability[lord(creature[green]|battlefield) 1/1],newability[lord(forest[basic]|battlefield) producecolor:green])) forever +auto=choice name(blue) all(this) transforms((,newability[lord(creature[blue]|battlefield) 1/1],newability[lord(island[basic]|battlefield) producecolor:blue])) forever +auto=choice name(red) all(this) transforms((,newability[lord(creature[red]|battlefield) 1/1],newability[lord(mountain[basic]|battlefield) producecolor:red])) forever +auto=choice name(black) all(this) transforms((,newability[lord(creature[black]|battlefield) 1/1],newability[lord(swamp[basic]|battlefield) producecolor:black])) forever +auto=choice name(white) all(this) transforms((,newability[lord(creature[white]|battlefield) 1/1],newability[lord(plains[basic]|battlefield) producecolor:white])) forever text=As Gauntlet of Power enters the battlefield, choose a color. -- Creatures of the chosen color get +1/+1. -- Whenever a basic land is tapped for mana of the chosen color, its controller adds one mana of that color to his or her mana pool (in addition to the mana the land produces). mana={5} type=Artifact @@ -70162,8 +70162,9 @@ type=Artifact [/card] [card] name=Mana Echoes -auto=lord(creature) transforms((,newability[foreach(creature[share!types!]|mybattlefield) add{1} oneshot])) -text=Whenever a creature enters the battlefield, you may add {1} to your mana pool for each creature you control that shares a creature type with it. +auto=@movedTo(creature|myBattlefield):may name(Add {C} for each creature that shares...) all(trigger) transforms((,newability[foreach(*[creature;share!types!]|mybattlefield) add{1} oneshot])) +auto=@movedTo(creature|opponentBattlefield):may name(Add {C} for each creature that shares...) all(trigger) transforms((,newability[foreach(*[creature;share!types!]|opponentbattlefield) add{1} opponent oneshot])) +text=Whenever a creature enters the battlefield, you may add {C} to your mana pool for each creature you control that shares a creature type with it. mana={2}{R}{R} type=Enchantment [/card] diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt index cb0c6cbb0..ab00796c1 100644 --- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt +++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt @@ -1382,8 +1382,8 @@ name=Liliana, Dreadhorde General auto=counter(0/0,6,loyalty) auto=@movedTo(creature|Graveyard) from(mybattlefield):draw:1 controller auto={C(0/0,1,Loyalty)}:name(+1: Create a 2/2 Zombie) create(Zombie:Creature zombie:2/2:black) -auto={C(0/0,-4,Loyalty)}:name(-4: Each player sacrifices two creatures) sacrifice notatarget(creature|mybattlefield) && ability$! sacrifice notatarget(<2>creature|mybattlefield) !$ opponent -auto={C(0/0,-9,Loyalty)}:name(-9: Choose a permanent of a type and sacrifice the rest) ability$!name(Sacrifice all creatures except one) sacrifice notatarget(creature|mybattlefield)!$ opponent && ability$!name(Sacrifice all lands except one) sacrifice notatarget(land|mybattlefield)!$ opponent && ability$!name(Sacrifice all enchantments except one) sacrifice notatarget(enchantment|mybattlefield)!$ opponent && ability$!name(Sacrifice all artifacts except one) sacrifice notatarget(artifact|mybattlefield)!$ opponent && ability$!name(Sacrifice all planeswalkers except one) sacrifice notatarget(planeswalker|mybattlefield)!$ opponent +auto={C(0/0,-4,Loyalty)}:name(-4: Each player sacrifices two creatures) sacrifice target(creature|mybattlefield) && ability$!sacrifice notatarget(<2>creature|mybattlefield)!$ opponent +auto={C(0/0,-9,Loyalty)}:name(-9: Choose a permanent of a type and sacrifice the rest) ability$!name(Sacrifice all lands except one) if type(land|myBattlefield)~morethan~1 then sacrifice target(land|mybattlefield)!$ opponent && ability$!name(Sacrifice all creatures except one) if type(creature|myBattlefield)~morethan~1 then sacrifice notatarget(creature|mybattlefield)!$ opponent && ability$!name(Sacrifice all enchantments except one) if type(enchantment|myBattlefield)~morethan~1 then sacrifice notatarget(enchantment|mybattlefield)!$ opponent && ability$!name(Sacrifice all artifacts except one) if type(artifact|myBattlefield)~morethan~1 then sacrifice notatarget(artifact|mybattlefield)!$ opponent && ability$!name(Sacrifice all planeswalkers except one) if type(planeswalker|myBattlefield)~morethan~1 then sacrifice notatarget(planeswalker|mybattlefield)!$ opponent text=Whenever a creature you control dies, draw a card. -- +1: Create a 2/2 black Zombie creature token. -- -4: Each player sacrifices two creatures. -- -9: Each opponent chooses a permanent they control of each permanent type and sacrifices the rest. mana={4}{B}{B} type=Legendary Planeswalker @@ -2429,7 +2429,7 @@ subtype=Tibalt name=Ugin, the Ineffable auto=counter(0/0,4,loyalty) auto=lord(*[colorless]|mycastingzone) altercost(colorless,-2) -auto={C(0/0,1,Loyalty)}:name(+1: Exile de top and create a 2/2 spirit) moveTo(Exile) all(*[zpos=1]|myLibrary) && create(Spirit:Creature Spirit:2/2:colorless) and!( transforms((,newability[@movedto(this|nonbattlezone):moveTo(myHand) target(*|myExile)])])) forever )! +auto={C(0/0,1,Loyalty)}:name(+1: Exile top card and create a 2/2 spirit) moveTo(Exile) all(*[zpos=1]|myLibrary) && create(Spirit:Creature Spirit:2/2:colorless) and!( transforms((,newability[@movedto(this|nonbattlezone):moveTo(myHand) target(*|myExile)])])) forever )! auto={C(0/0,-3,Loyalty)}:name(-3: Destroy target colored permanent) destroy target(*[white;blue;black;red;green]) text=Colorless spells you cast cost {2} less to cast. -- +1: Exile the top card of your library face down and look at it. Create a 2/2 colorless Spirit creature token. When that token leaves the battlefield, put the exiled card into your hand. -- -3: Destroy target permanent that's one or more colors. mana={6} diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt index 3b8ca716a..070aadb70 100644 --- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt +++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt @@ -305,6 +305,14 @@ mana={6}{R}{R} type=Sorcery [/card] [card] +name=Alpine Moon +auto=may counter(0/0,1,Alpine) target(land[-basic]|opponentBattlefield) +auto=lord(land[counter{0/0,1,Alpine};share!name!]|opponentBattlefield) loseabilities && losesubtypesof(land) && transforms((newability[{T}:add{G}],newability[{T}:add{R}],newability[{T}:add{U}],newability[{T}:add{B}],newability[{T}:add{W}])) forever +text=As Alpine Moon enters the battlefield, choose a nonbasic land card name. -- Lands your opponents control with the chosen name lose all land types and abilities, and they gain “{T}: Add one mana of any color.” +mana={R} +type=Enchantment +[/card] +[card] name=Altar of the Pantheon text=Your devotion to each color and each combination of colors is increased by one. -- {T}: Add one mana of any color. If you control a God, a Demigod, or a legendary enchantment, you gain 1 life. mana={3} @@ -1659,12 +1667,6 @@ mana={B} type=Sorcery [/card] [card] -name=Caged Sun -text=As Caged Sun enters the battlefield, choose a color. -- Creatures you control of the chosen color get +1/+1. -- Whenever a land's ability adds one or more mana of the chosen color to your mana pool, add one additional mana of that color to your mana pool. -mana={6} -type=Artifact -[/card] -[card] name=Call of the Nightwing text=Put a 1/1 blue and black Horror creature token with flying onto the battlefield. -- Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.) mana={2}{U}{B}