From 4b167c3776c5fcf77ca7b9b0e1d0c27fe6b6b459 Mon Sep 17 00:00:00 2001 From: "anthonycalosa@gmail.com" Date: Sat, 18 May 2013 16:30:14 +0000 Subject: [PATCH] added Abyssal Gatekeeper, Akki Blizzard-Herder, Archmage Ascension, Runeflare Trap --- projects/mtg/bin/Res/sets/primitives/mtg.txt | 39 +++++++++++++++++++ .../bin/Res/sets/primitives/unsupported.txt | 31 --------------- projects/mtg/src/GameObserver.cpp | 2 +- 3 files changed, 40 insertions(+), 32 deletions(-) diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt index a6694f993..60136b78f 100644 --- a/projects/mtg/bin/Res/sets/primitives/mtg.txt +++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt @@ -391,6 +391,16 @@ type=Enchantment subtype=Aura [/card] [card] +name=Abyssal Gatekeeper +auto=@movedto(this|graveyard) from(battlefield):ability$!sacrifice notatarget(creature|mybattlefield)!$ controller && ability$!sacrifice notatarget(creature|mybattlefield)!$ opponent +text=When Abyssal Gatekeeper is put into a graveyard from the battlefield, each player sacrifices a creature. +mana={1}{B} +type=Creature +subtype=Horror +power=1 +toughness=1 +[/card] +[card] name=Abyssal Horror abilities=flying auto=target(player) ability$!name(discard 2 cards) target(<2>*|myhand) reject!$ targetedplayer @@ -1197,6 +1207,16 @@ power=1 toughness=1 [/card] [card] +name=Akki Blizzard-Herder +auto=@movedto(this|graveyard) from(battlefield):ability$!sacrifice notatarget(land|mybattlefield)!$ controller && ability$!sacrifice notatarget(land|mybattlefield)!$ opponent +text=When Akki Blizzard-Herder is put into a graveyard from the battlefield, each player sacrifices a land. +mana={1}{R} +type=Creature +subtype=Goblin Shaman +power=1 +toughness=1 +[/card] +[card] name=Akki Coalflinger abilities=first strike auto={R}{T}:lord(creature[attacking]) first strike @@ -3570,6 +3590,14 @@ power=1 toughness=1 [/card] [card] +name=Archmage Ascension +auto=@each endofturn restriction{compare(pdrewcount)~morethan~1}:may counter(0/0,1,Quest) +auto=this(counter{0/0.1.Quest}>=6) transforms((,newability[replacedraw name(search a card) notatarget(*|mylibrary) moveto(ownerhand)])) +text=At the beginning of each end step, if you drew two or more cards this turn, you may put a quest counter on Archmage Ascension. -- As long as Archmage Ascension has six or more quest counters on it, if you would draw a card, you may instead search your library for a card, put that card into your hand, then shuffle your library. +mana={2}{U} +type=Enchantment +[/card] +[card] name=Archon of Justice abilities=flying auto=@movedTo(this|graveyard) from(battlefield):moveTo(exile) target(*|battlefield) @@ -72014,6 +72042,17 @@ type=Artifact subtype=Equipment [/card] [card] +name=Runeflare Trap +target=player +auto=damage:type:*:targetedpersonshand +other={R} +otherrestriction=compare(odrewcount)~morethan~2 +text=If an opponent drew three or more cards this turn, you may pay {R} rather than pay Runeflare Trap's mana cost. -- Runeflare Trap deals damage to target player equal to the number of cards in that player's hand. +mana={4}{R}{R} +type=Instant +subtype=Trap +[/card] +[card] name=Runes of the Deus target=creature auto=teach(creature[red]) 1/1 diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt index d90b3901c..e5ad09def 100644 --- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt +++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt @@ -88,15 +88,6 @@ mana={2}{G}{G} type=Enchantment [/card] [card] -name=Abyssal Gatekeeper -text=When Abyssal Gatekeeper is put into a graveyard from the battlefield, each player sacrifices a creature. -mana={1}{B} -type=Creature -subtype=Horror -power=1 -toughness=1 -[/card] -[card] name=Acidic Dagger text={4}, {T}: Whenever target creature deals combat damage to a non-Wall creature this turn, destroy that non-Wall creature. When the targeted creature leaves the battlefield this turn, sacrifice Acidic Dagger. Activate this ability only during combat before blockers are declared. mana={4} @@ -188,15 +179,6 @@ type=Enchantment subtype=Aura [/card] [card] -name=Akki Blizzard-Herder -text=When Akki Blizzard-Herder is put into a graveyard from the battlefield, each player sacrifices a land. -mana={1}{R} -type=Creature -subtype=Goblin Shaman -power=1 -toughness=1 -[/card] -[card] name=Akki Lavarunner text=Haste -- Whenever Akki Lavarunner deals damage to an opponent, flip it. mana={3}{R} @@ -468,12 +450,6 @@ type=Instant subtype=Trap [/card] [card] -name=Archmage Ascension -text=At the beginning of each end step, if you drew two or more cards this turn, you may put a quest counter on Archmage Ascension. -- As long as Archmage Ascension has six or more quest counters on it, if you would draw a card, you may instead search your library for a card, put that card into your hand, then shuffle your library. -mana={2}{U} -type=Enchantment -[/card] -[card] name=Arcum's Weathervane text={2}, {T}: Target snow land is no longer snow. -- {2}, {T}: Target nonsnow basic land becomes snow. mana={2} @@ -15092,13 +15068,6 @@ mana={W}{W} type=Enchantment [/card] [card] -name=Runeflare Trap -text=If an opponent drew three or more cards this turn, you may pay {R} rather than pay Runeflare Trap's mana cost. -- Runeflare Trap deals damage to target player equal to the number of cards in that player's hand. -mana={4}{R}{R} -type=Instant -subtype=Trap -[/card] -[card] name=Runesword text={3}, {T}: Target attacking creature gets +2/+0 until end of turn. When that creature leaves the battlefield this turn, sacrifice Runesword. If the creature deals damage to a creature this turn, the creature dealt damage can't be regenerated this turn. If a creature dealt damage by the targeted creature would be put into a graveyard this turn, exile that creature instead. mana={6} diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index 194600b1b..1e08324da 100644 --- a/projects/mtg/src/GameObserver.cpp +++ b/projects/mtg/src/GameObserver.cpp @@ -203,7 +203,7 @@ void GameObserver::nextGamePhase() { cleanupPhase(); currentPlayer->damageCount = 0; - currentPlayer->drawCounter = 0; + currentPlayer->drawCounter = 0; currentPlayer->opponent()->damageCount = 0; //added to clear odcount currentPlayer->preventable = 0; mLayers->actionLayer()->cleanGarbage(); //clean abilities history for this turn;