diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 504cd105a..112a947ec 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -18,12 +18,6 @@ mana={1}{U}
 type=Instant
 [/card]
 [card]
-name=AEther Flash
-text=Whenever a creature enters the battlefield, AEther Flash deals 2 damage to it.
-mana={2}{R}{R}
-type=Enchantment
-[/card]
-[card]
 name=AEther Membrane
 text=Defender; reach (This creature can block creatures with flying.) -- Whenever AEther Membrane blocks a creature, return that creature to its owner's hand at end of combat.
 mana={1}{R}{R}
@@ -252,7 +246,6 @@ toughness=2
 [/card]
 [card]
 name=Adarkar Valkyrie
-abilities=Flying,Vigilance
 text=Flying, vigilance -- {T}: When target creature other than Adarkar Valkyrie is put into a graveyard this turn, return that card to the battlefield under your control.
 mana={4}{W}{W}
 type=Snow Creature
@@ -330,10 +323,6 @@ type=Enchantment
 [/card]
 [card]
 name=Afterlife
-target=creature
-auto=bury
-auto=token(Spirit,creature spirit,1/1,flying white) targetcontroller
-## token doesn't work with "targetcontroller"
 text=Destroy target creature. It can't be regenerated. Its controller puts a 1/1 white Spirit creature token with flying onto the battlefield.
 mana={2}{W}
 type=Instant
@@ -381,9 +370,6 @@ subtype=Aura
 [/card]
 [card]
 name=Agility
-target=creature
-auto=flanking
-auto=:1/1
 text=Enchant creature -- Enchanted creature gets +1/+1 and has flanking. (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)
 mana={1}{R}
 type=Enchantment
@@ -612,7 +598,6 @@ subtype=Aura
 [/card]
 [card]
 name=Altar Golem
-abilities=doesnotuntap
 text=Trample -- Altar Golem's power and toughness are each equal to the number of creatures on the battlefield. -- Altar Golem doesn't untap during your untap step. -- Tap five untapped creatures you control: Untap Altar Golem.
 mana={7}
 type=Artifact Creature
@@ -745,15 +730,6 @@ text=Ancestral Vision is blue. -- Suspend 4 - {U} (Rather than cast this card fr
 type=Sorcery
 [/card]
 [card]
-name=Ancient Kavu
-text={2}: Ancient Kavu becomes colorless until end of turn.
-mana={3}{R}
-type=Creature
-subtype=Kavu
-power=3
-toughness=3
-[/card]
-[card]
 name=Ancient Ooze
 text=Ancient Ooze's power and toughness are each equal to the total converted mana cost of other creatures you control.
 mana={5}{G}{G}
@@ -2748,12 +2724,6 @@ type=Artifact
 subtype=Equipment
 [/card]
 [card]
-name=Blinkmoth Infusion
-text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Untap all artifacts.
-mana={12}{U}{U}
-type=Instant
-[/card]
-[card]
 name=Blinkmoth Urn
 text=At the beginning of each player's precombat main phase, if Blinkmoth Urn is untapped, that player adds {1} to his or her mana pool for each artifact he or she controls.
 mana={5}
@@ -3577,15 +3547,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Broodstar
-text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Flying -- Broodstar's power and toughness are each equal to the number of artifacts you control.
-mana={8}{U}{U}
-type=Creature
-subtype=Beast
-power=*
-toughness=*
-[/card]
-[card]
 name=Brothers Yamazaki
 text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) -- If there are exactly two permanents named Brothers Yamazaki on the battlefield, the "legend rule" doesn't apply to them. -- Each other creature named Brothers Yamazaki gets +2/+2 and has haste.
 mana={2}{R}
@@ -8504,15 +8465,6 @@ mana={G}
 type=Enchantment
 [/card]
 [card]
-name=Dross Golem
-text=Affinity for Swamps (This spell costs {1} less to cast for each Swamp you control.) -- Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)
-mana={5}
-type=Artifact Creature
-subtype=Golem
-power=3
-toughness=2
-[/card]
-[card]
 name=Drought
 text=At the beginning of your upkeep, sacrifice Drought unless you pay {W}{W}. -- Spells cost an additional "Sacrifice a Swamp" to cast for each black mana symbol in their mana costs. -- Activated abilities cost an additional "Sacrifice a Swamp" to activate for each black mana symbol in their activation costs.
 mana={2}{W}{W}
@@ -10071,11 +10023,6 @@ mana={3}{W}
 type=World Enchantment
 [/card]
 [card]
-name=Eye of Ugin
-text=Colorless Eldrazi spells you cast cost {2} less to cast. -- {7}, {T}: Search your library for a colorless creature card, reveal it, and put it into your hand. Then shuffle your library.
-type=Legendary Land
-[/card]
-[card]
 name=Eye of Yawgmoth
 text={3}, {T}, Sacrifice a creature: Reveal cards from the top of your library equal to the sacrificed creature's power. Put one into your hand and exile the rest.
 mana={3}
@@ -11359,9 +11306,6 @@ type=Enchantment
 [/card]
 [card]
 name=Forbidden Lore
-target=land
-auto={T}:2/1 target(creature)
-#does not work as expected the land does not tap the aura does.
 text=Enchant land -- Enchanted land has "{T}: Target creature gets +2/+1 until end of turn."
 mana={2}{G}
 type=Enchantment
@@ -11369,12 +11313,6 @@ subtype=Aura
 [/card]
 [card]
 name=Forbidden Orchard
-auto={T}:add {G} && token(Spirit,Creature Spirit,1/1) opponent
-auto={T}:add {W} && token(Spirit,Creature Spirit,1/1) opponent
-auto={T}:add {U} && token(Spirit,Creature Spirit,1/1) opponent
-auto={T}:add {B} && token(Spirit,Creature Spirit,1/1) opponent
-auto={T}:add {R} && token(Spirit,Creature Spirit,1/1) opponent
-#Not yet implemented
 text={T}: Add one mana of any color to your mana pool. -- Whenever you tap Forbidden Orchard for mana, put a 1/1 colorless Spirit creature token onto the battlefield under target opponent's control.
 type=Land
 [/card]
@@ -11686,15 +11624,6 @@ power=2
 toughness=1
 [/card]
 [card]
-name=Frogmite
-text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.)
-mana={4}
-type=Artifact Creature
-subtype=Frog
-power=2
-toughness=2
-[/card]
-[card]
 name=Frontline Strategist
 text=Morph {W} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.) -- When Frontline Strategist is turned face up, prevent all combat damage non-Soldier creatures would deal this turn.
 mana={W}
@@ -16043,12 +15972,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Into Thin Air
-text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Return target artifact to its owner's hand.
-mana={5}{U}
-type=Instant
-[/card]
-[card]
 name=Into the Fray
 text=Target creature attacks this turn if able. -- Splice onto Arcane {R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
 mana={R}
@@ -19779,15 +19702,6 @@ power=2
 toughness=3
 [/card]
 [card]
-name=Meadowboon
-text=When Meadowboon leaves the battlefield, put a +1/+1 counter on each creature target player controls. -- Evoke {3}{W} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
-mana={2}{W}{W}
-type=Creature
-subtype=Elemental
-power=3
-toughness=3
-[/card]
-[card]
 name=Meddle
 text=If target spell has only one target and that target is a creature, change that spell's target to another creature.
 mana={1}{U}
@@ -21414,15 +21328,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Myr Enforcer
-text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.)
-mana={7}
-type=Artifact Creature
-subtype=Myr
-power=4
-toughness=4
-[/card]
-[card]
 name=Myr Incubator
 text={6}, {T}, Sacrifice Myr Incubator: Search your library for any number of artifact cards, exile them, then put that many 1/1 colorless Myr artifact creature tokens onto the battlefield. Then shuffle your library.
 mana={6}
@@ -22010,19 +21915,6 @@ mana={4}{B}{B}
 type=Sorcery
 [/card]
 [card]
-name=Nevermaker
-abilities=flying
-other={3}{U}
-auto=@movedTo(this|nonbattlezone) from(battlefield):moveTo(ownerlibrary) target(*[-land])
-auto=alternative moveto(mygraveyard)
-text=Flying -- When Nevermaker leaves the battlefield, put target nonland permanent on top of its owner's library. -- Evoke {3}{U} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
-mana={3}{U}
-type=Creature
-subtype=Elemental
-power=2
-toughness=3
-[/card]
-[card]
 name=New Benalia
 text=New Benalia enters the battlefield tapped. -- When New Benalia enters the battlefield, scry 1. (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.) -- {T}: Add {W} to your mana pool.
 type=Land
@@ -23371,15 +23263,6 @@ power=0
 toughness=1
 [/card]
 [card]
-name=Oxidda Golem
-text=Affinity for Mountains (This spell costs {1} less to cast for each Mountain you control.) -- Haste
-mana={6}
-type=Artifact Creature
-subtype=Golem
-power=3
-toughness=2
-[/card]
-[card]
 name=Pack Hunt
 text=Search your library for up to three cards with the same name as target creature, reveal them, and put them into your hand. Then shuffle your library.
 mana={3}{G}
@@ -23909,12 +23792,6 @@ type=Instant
 subtype=Trap
 [/card]
 [card]
-name=Pernicious Deed
-text={X}, Sacrifice Pernicious Deed: Destroy each artifact, creature, and enchantment with converted mana cost X or less.
-mana={1}{B}{G}
-type=Enchantment
-[/card]
-[card]
 name=Perplex
 text=Counter target spell unless its controller discards his or her hand. -- Transmute {1}{U}{B} ({1}{U}{B}, Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Transmute only as a sorcery.)
 mana={1}{U}{B}
@@ -24001,15 +23878,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Phage the Untouchable
-text=When Phage the Untouchable enters the battlefield, if you didn't cast it from your hand, you lose the game. -- Whenever Phage deals combat damage to a creature, destroy that creature. It can't be regenerated. -- Whenever Phage deals combat damage to a player, that player loses the game.
-mana={3}{B}{B}{B}{B}
-type=Legendary Creature
-subtype=Zombie Minion
-power=4
-toughness=4
-[/card]
-[card]
 name=Phantasmagorian
 text=When you cast Phantasmagorian, any player may discard three cards. If a player does, counter Phantasmagorian. -- Discard three cards: Return Phantasmagorian from your graveyard to your hand.
 mana={5}{B}{B}
@@ -25651,15 +25519,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Quicksilver Behemoth
-text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- When Quicksilver Behemoth attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
-mana={6}{U}
-type=Creature
-subtype=Beast
-power=4
-toughness=5
-[/card]
-[card]
 name=Quicksilver Dagger
 text=Enchant creature -- Enchanted creature has "{T}: This creature deals 1 damage to target player. You draw a card."
 mana={1}{U}{R}
@@ -25738,15 +25597,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Qumulox
-text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Flying
-mana={6}{U}{U}
-type=Creature
-subtype=Beast
-power=5
-toughness=4
-[/card]
-[card]
 name=Rabid Wombat
 text=Vigilance -- Rabid Wombat gets +2/+2 for each Aura attached to it.
 mana={2}{G}{G}
@@ -25813,15 +25663,6 @@ mana={R}{R}
 type=Enchantment
 [/card]
 [card]
-name=Raging Spirit
-text={2}: Raging Spirit becomes colorless until end of turn.
-mana={3}{R}
-type=Creature
-subtype=Spirit
-power=3
-toughness=3
-[/card]
-[card]
 name=Raiding Party
 text=Raiding Party can't be the target of white spells or abilities from white sources. -- Sacrifice an Orc: Each player may tap any number of untapped white creatures he or she controls. For each creature tapped this way, that player chooses up to two Plains. Then destroy all Plains that weren't chosen this way by any player.
 mana={2}{R}
@@ -26144,15 +25985,6 @@ type=Artifact
 subtype=Equipment
 [/card]
 [card]
-name=Razor Golem
-text=Affinity for Plains (This spell costs {1} less to cast for each Plains you control.) -- Vigilance
-mana={6}
-type=Artifact Creature
-subtype=Golem
-power=3
-toughness=4
-[/card]
-[card]
 name=Razor Pendulum
 text=At the beginning of each player's end step, if that player has 5 or less life, Razor Pendulum deals 2 damage to him or her.
 mana={4}
@@ -28521,12 +28353,6 @@ power=2
 toughness=1
 [/card]
 [card]
-name=Scale of Chiss-Goria
-text=Flash -- Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- {T}: Target creature gets +0/+1 until end of turn.
-mana={3}
-type=Artifact
-[/card]
-[card]
 name=Scalpelexis
 text=Flying (This creature can't be blocked except by creatures with flying or reach.) -- Whenever Scalpelexis deals combat damage to a player, that player exiles the top four cards of his or her library. If two or more of those cards have the same name, repeat this process.
 mana={4}{U}
@@ -30869,15 +30695,6 @@ power=3
 toughness=2
 [/card]
 [card]
-name=Somber Hoverguard
-text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Flying
-mana={5}{U}
-type=Creature
-subtype=Drone
-power=3
-toughness=2
-[/card]
-[card]
 name=Somnophore
 text=Flying -- Whenever Somnophore deals damage to a player, tap target creature that player controls. That creature doesn't untap during its controller's untap step for as long as Somnophore remains on the battlefield.
 mana={2}{U}{U}
@@ -31575,15 +31392,6 @@ power=0
 toughness=1
 [/card]
 [card]
-name=Spire Golem
-text=Affinity for Islands (This spell costs {1} less to cast for each Island you control.) -- Flying
-mana={6}
-type=Artifact Creature
-subtype=Golem
-power=2
-toughness=4
-[/card]
-[card]
 name=Spire Owl
 text=Flying -- When Spire Owl enters the battlefield, look at the top four cards of your library, then put them back in any order.
 mana={1}{U}
@@ -33214,15 +33022,6 @@ power=2
 toughness=4
 [/card]
 [card]
-name=Tangle Golem
-text=Affinity for Forests (This spell costs {1} less to cast for each Forest you control.)
-mana={7}
-type=Artifact Creature
-subtype=Golem
-power=5
-toughness=4
-[/card]
-[card]
 name=Tangle Kelp
 text=Enchant creature -- When Tangle Kelp enters the battlefield, tap enchanted creature. -- Enchanted creature doesn't untap during its controller's untap step if it attacked during its controller's last turn.
 mana={U}
@@ -33995,12 +33794,6 @@ power=2
 toughness=3
 [/card]
 [card]
-name=Thoughtcast
-text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Draw two cards.
-mana={4}{U}
-type=Sorcery
-[/card]
-[card]
 name=Thoughtcutter Agent
 text={U}{B}, {T}: Target player loses 1 life and reveals his or her hand.
 mana={U}{B}
@@ -34511,12 +34304,6 @@ mana={5}{G}{G}
 type=Sorcery
 [/card]
 [card]
-name=Tooth of Chiss-Goria
-text=Flash -- Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- {T}: Target creature gets +1/+0 until end of turn.
-mana={3}
-type=Artifact
-[/card]
-[card]
 name=Topple
 text=Exile target creature with the greatest power. (If two or more creatures are tied for greatest power, target any one of them.)
 mana={2}{W}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 7a0221126..1ac83f1a5 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1403,6 +1403,16 @@ power=5
 toughness=1
 [/card]
 [card]
+name=Ancient Kavu
+auto={2}:transforms(,arifact) ueot
+text={2}: Ancient Kavu becomes colorless until end of turn.
+mana={3}{R}
+type=Creature
+subtype=Kavu
+power=3
+toughness=3
+[/card]
+[card]
 name=Ancient Runes
 auto=@each my upkeep:foreach(artifact|myBattlefield) damage:1 controller
 auto=@each opponent upkeep:foreach(artifact|opponentBattlefield) damage:1 opponent
@@ -4993,6 +5003,14 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Blinkmoth Infusion
+abilities=affinityartifacts
+auto=untap all(artifact)
+text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Untap all artifacts.
+mana={12}{U}{U}
+type=Instant
+[/card]
+[card]
 name=Blinkmoth Nexus
 auto={T}:Add{1}
 auto={1}:becomes(Blinkmoth Artifact Creature,1/1,flying) ueot
@@ -6577,6 +6595,17 @@ power=4
 toughness=4
 [/card]
 [card]
+name=Broodstar
+abilities=affinityartifact,flying
+auto=foreach(artifact|mybattlefield) 1/1
+text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Flying -- Broodstar's power and toughness are each equal to the number of artifacts you control.
+mana={8}{U}{U}
+type=Creature
+subtype=Beast
+power=*
+toughness=*
+[/card]
+[card]
 name=Broodwarden
 auto=lord(eldrazi spawn|myBattlefield) 2/1
 text=Eldrazi Spawn creatures you control get +2/+1.
@@ -7311,7 +7340,7 @@ toughness=1
 [/card]
 [card]
 name=Carnage Altar
-auto={S(creature|myBattlefield)}:Draw:1
+auto={3}{S(creature|myBattlefield)}:draw:1
 text={3}, Sacrifice a creature: Draw a card.
 mana={2}
 type=Artifact
@@ -8368,7 +8397,7 @@ name=Chimeric Coils
 auto={X}{1}:becomes(artifact creature construct,*/*) ueot && thisforeach(X) all(this) 1/1
 auto=@each endofturn:bury all(creature[chimeric coils])
 text={X}{1}: Chimeric Coils becomes an X/X Construct artifact creature. Sacrifice it at the beginning of the next end step.
-mana={1}
+mana={X}
 type=Artifact
 [/card]
 [card]
@@ -13565,6 +13594,16 @@ power=5
 toughness=1
 [/card]
 [card]
+name=Dross Golem
+abilities=affinityswamps,fear
+text=Affinity for Swamps (This spell costs {1} less to cast for each Swamp you control.) -- Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)
+mana={5}
+type=Artifact Creature
+subtype=Golem
+power=3
+toughness=2
+[/card]
+[card]
 name=Dross Harvester
 abilities=protection from white
 auto=@movedTo(graveyard) from(creature|battlefield):life:2
@@ -18172,6 +18211,16 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Frogmite
+abilities=affinityartifacts
+text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.)
+mana={4}
+type=Artifact Creature
+subtype=Frog
+power=2
+toughness=2
+[/card]
+[card]
 name=Frogtosser Banneret
 abilities=haste
 auto=lord(goblin|myhand) colorless:-1
@@ -24346,6 +24395,15 @@ mana={1}{U}
 type=Instant
 [/card]
 [card]
+name=Into Thin Air
+ability=affinityartifacts
+target=artifact
+auto=moveTo(ownerhand)
+text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Return target artifact to its owner's hand.
+mana={5}{U}
+type=Instant
+[/card]
+[card]
 name=Intrepid Hero
 auto={T}:destroy target(creature[power>=4])
 text={T}: Destroy target creature with power 4 or greater.
@@ -30506,6 +30564,18 @@ text={T}: Add {1} to your mana pool. -- {T}: Untap target attacking creature wit
 type=Land
 [/card]
 [card]
+name=Meadowboon
+other={3}{W}
+auto=@movedTo(this|graveyard) from(mybattlefield):counter(1/1,1) all(creature|myBattlefield)
+auto=alternative moveto(mygraveyard)
+text=When Meadowboon leaves the battlefield, put a +1/+1 counter on each creature target player controls. -- Evoke {3}{W} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
+mana={2}{W}{W}
+type=Creature
+subtype=Elemental
+power=3
+toughness=3
+[/card]
+[card]
 name=Measure of Wickedness
 auto=@next my endofturn:bury
 auto=@next my endofturn:life:-8 controller
@@ -32637,6 +32707,16 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Myr Enforcer
+auto=affinityartifacts
+text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.)
+mana={7}
+type=Artifact Creature
+subtype=Myr
+power=4
+toughness=4
+[/card]
+[card]
 name=Myr Landshaper
 auto={T}:transforms(artifact) target(land) ueot
 text={T}: Target land becomes an artifact in addition to its other types until end of turn.
@@ -33383,6 +33463,19 @@ type=Artifact
 subtype=Equipment
 [/card]
 [card]
+name=Nevermaker
+abilities=flying
+other={3}{U}
+auto=@movedTo(this|nonbattlezone) from(battlefield):moveTo(ownerlibrary) target(*[-land])
+auto=alternative moveto(mygraveyard)
+text=Flying -- When Nevermaker leaves the battlefield, put target nonland permanent on top of its owner's library. -- Evoke {3}{U} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
+mana={3}{U}
+type=Creature
+subtype=Elemental
+power=2
+toughness=3
+[/card]
+[card]
 name=Nevinyrral's Disk
 auto=tap
 auto={1}{T}:destroy all(artifact,creature,enchantment)
@@ -35152,6 +35245,16 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Oxidda Golem
+abilities=affinitymountains,haste
+text=Affinity for Mountains (This spell costs {1} less to cast for each Mountain you control.) -- Haste
+mana={6}
+type=Artifact Creature
+subtype=Golem
+power=3
+toughness=2
+[/card]
+[card]
 name=Oxidize
 target=artifact
 auto=bury
@@ -35837,6 +35940,25 @@ mana={2}{B}
 type=Sorcery
 [/card]
 [card]
+name=Pernicious Deed
+auto={0}{S}:name(X = 0) && destroy all(*[-land;manacost=0])
+auto={1}{S}:name(X = 1) && destroy all(*[-land;manacost<=1])
+auto={2}{S}:name(X = 2) && destroy all(*[-land;manacost<=2])
+auto={3}{S}:name(X = 3) && destroy all(*[-land;manacost<=3])
+auto={4}{S}:name(X = 4) && destroy all(*[-land;manacost<=4])
+auto={5}{S}:name(X = 5) && destroy all(*[-land;manacost<=5])
+auto={6}{S}:name(X = 6) && destroy all(*[-land;manacost<=6])
+auto={7}{S}:name(X = 7) && destroy all(*[-land;manacost<=7])
+auto={8}{S}:name(X = 8) && destroy all(*[-land;manacost<=8])
+auto={9}{S}:name(X = 9) && destroy all(*[-land;manacost<=9])
+auto={10}{S}:name(X = 10) && destroy all(*[-land;manacost<=10])
+auto={11}{S}:name(X = 11) && destroy all(*[-land;manacost<=11])
+auto={12}{S}:name(X = 12) && destroy all(*[-land;manacost<=12])
+text={X}, Sacrifice Pernicious Deed: Destroy each artifact, creature, and enchantment with converted mana cost X or less.
+mana={1}{B}{G}
+type=Enchantment
+[/card]
+[card]
 name=Persuasion
 target=creature
 alias=1194
@@ -35928,19 +36050,17 @@ toughness=2
 ##the cantlose on phage only last until the ability checks if she was played from hand enjoy :)
 [card]
 name=Phage the Untouchable
+abilities=deathtouch
 auto=kicker lord(this) cantlose ueot
-auto=@damaged(player) from(this|mybattlefield): wingame controller
+auto=@damaged(player) from(this|mybattlefield):wingame controller
 auto=choice name(Phage enters the Battlefield!!) && wingame opponent && all(this) -cantlose ueot
-Text=When Phage the Untouchable enters the battlefield, if you didn't cast it from your hand, you lose the game. Whenever Phage deals combat damage
-(I remove this space)
-to a creature, destroy that creature. It can't be regenerated. Whenever Phage deals combat damage to a player, that player loses the game.
+Text=When Phage the Untouchable enters the battlefield, if you didn't cast it from your hand, you lose the game. Whenever Phage deals combat damage to a creature, destroy that creature. It can't be regenerated. Whenever Phage deals combat damage to a player, that player loses the game.
 mana={3}{B}{B}{B}{B}
 kicker={0}
+type=Legendary Creature
+subtype=Spirit
 power=4
 toughness=4
-abilities=deathtouch
-type=legendary creature
-subtype=spirit
 [/card]
 [card]
 name=Phantasmal Forces
@@ -37940,6 +38060,17 @@ mana={4}
 type=Artifact
 [/card]
 [card]
+name=Quicksilver Behemoth
+abilities=affinityartifacts
+auto=@each combatends:moveTo(ownerhand) all(quicksilver behemoth[attacking;blocking]|myBattlefield)
+text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- When Quicksilver Behemoth attacks or blocks, return it to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
+mana={6}{U}
+type=Creature
+subtype=Beast
+power=4
+toughness=5
+[/card]
+[card]
 name=Quiet Purity
 target=enchantment
 auto=destroy
@@ -38059,6 +38190,16 @@ power=1
 toughness=2
 [/card]
 [card]
+name=Qumulox
+abilities=affinityartifact,flying
+text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Flying
+mana={6}{U}{U}
+type=Creature
+subtype=Beast
+power=5
+toughness=4
+[/card]
+[card]
 name=Rabble-Rouser
 auto=bloodthirst:1
 auto={R}{T}:thisforeach(power>=1) 1/0 all(creature[attacking]|mybattlefield)
@@ -38307,6 +38448,16 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Raging Spirit
+auto={2}:transforms(,artifact) ueot
+text={2}: Raging Spirit becomes colorless until end of turn.
+mana={3}{R}
+type=Creature
+subtype=Spirit
+power=3
+toughness=3
+[/card]
+[card]
 name=Ragnar
 auto={W}{U}{G}{T}:regenerate target(creature)
 text={G}{W}{U}, {T}: Regenerate target creature.
@@ -38893,6 +39044,16 @@ mana={R}{s;notatarget(land|mybattlefield)}
 type=Sorcery
 [/card]
 [card]
+name=Razor Golem
+abilities=affinityplains,vigilance
+text=Affinity for Plains (This spell costs {1} less to cast for each Plains you control.) -- Vigilance
+mana={6}
+type=Artifact Creature
+subtype=Golem
+power=3
+toughness=4
+[/card]
+[card]
 name=Razormane Masticore
 auto=first strike
 auto=upcost[{S(*|myhand)}] moveTo(graveyard)
@@ -39734,8 +39895,8 @@ type=Sorcery
 [card]
 name=Reveillark
 abilities=flying
-kicker={1}
-auto=kicker moveto(mygraveyard)
+other={5}{W}
+auto=alternative moveto(mygraveyard)
 auto=@movedTo(this|nonbattlezone) from(battlefield):may token(-152716111) && moveTo(myBattlefield) target(creature[power<=2]|mygraveyard)
 text=Flying -- When Reveillark leaves the battlefield, return up to two target creature cards with power 2 or less from your graveyard to the battlefield. -- Evoke {5}{W} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
 mana={4}{W}
@@ -41742,6 +41903,13 @@ power=7
 toughness=6
 [/card]
 [card]
+name=Scale of Chiss-Goria
+abilities=affinityartifacts,flash
+text=Flash -- Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- {T}: Target creature gets +0/+1 until end of turn.
+mana={3}
+type=Artifact
+[/card]
+[card]
 name=Scar
 target=creature
 auto=counter(-1/-1)
@@ -45919,6 +46087,16 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Somber Hoverguard
+abilities=affinityartifacts
+text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Flying
+mana={5}{U}
+type=Creature
+subtype=Drone
+power=3
+toughness=2
+[/card]
+[card]
 name=Somnomancer
 auto=may tap target(creature)
 text=When Somnomancer enters the battlefield, you may tap target creature.
@@ -46868,6 +47046,16 @@ mana={4}{R}
 type=Sorcery
 [/card]
 [card]
+name=Spire Golem
+abilities=affinityislands,flying
+text=Affinity for Islands (This spell costs {1} less to cast for each Island you control.) -- Flying
+mana={6}
+type=Artifact Creature
+subtype=Golem
+power=2
+toughness=4
+[/card]
+[card]
 name=Spirit Link
 target=creature
 auto=lifelink
@@ -49757,6 +49945,16 @@ mana={1}{G}
 type=Instant
 [/card]
 [card]
+name=Tangle Golem
+abilities=affinityforests
+text=Affinity for Forests (This spell costs {1} less to cast for each Forest you control.)
+mana={7}
+type=Artifact Creature
+subtype=Golem
+power=5
+toughness=4
+[/card]
+[card]
 name=Tangle Spider
 abilities=flash,reach
 text=Flash (You may cast this spell any time you could cast an instant.) -- Reach (This creature can block creatures with flying.)
@@ -50954,6 +51152,14 @@ mana={2}{U}
 type=Instant
 [/card]
 [card]
+name=Thoughtcast
+abilities=affinityartifacts
+auto=draw:2
+text=Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- Draw two cards.
+mana={4}{U}
+type=Sorcery
+[/card]
+[card]
 name=Thoughtlace
 alias=1227
 text=Target spell or permanent becomes blue. (Mana symbols on that permanent remain unchanged.)
@@ -51868,6 +52074,14 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Tooth of Chiss-Goria
+abilities=affinityartifacts,flash
+auto={T}:1/0 target(creature)
+text=Flash -- Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.) -- {T}: Target creature gets +1/+0 until end of turn.
+mana={3}
+type=Artifact
+[/card]
+[card]
 name=Tooth of Ramos
 auto={T}:Add {W}
 auto={S}:Add {W}
diff --git a/projects/mtg/bin/Res/sets/primitives/zethaddon.txt b/projects/mtg/bin/Res/sets/primitives/zethaddon.txt
index 242356742..9d85b467a 100644
--- a/projects/mtg/bin/Res/sets/primitives/zethaddon.txt
+++ b/projects/mtg/bin/Res/sets/primitives/zethaddon.txt
@@ -1987,15 +1987,6 @@ subtype=construct
 mana={2}{BW}{U}
 [/card]
 [card]
-name=Barl's Cage
-auto={3}:foreach(Barl's Cage|mybattlefield) counter(0/0,2,dontuntap) target(creature)
-auto=@each untap:counter(0/0,-1,dontuntap) all(creature[counter{0/0.1.dontuntap}])
-auto=@each endofturn: lord(creature[counter{0/0.1.dontuntap}]) doesnotuntap >
-text={3}: Target creature doesn't untap during its controller's next untap step.
-type=artifact
-mana={4}
-[/card]
-[card]
 name=Clock of Omens
 auto={0}:token(-2300933)
 text=Tap two untapped artifacts you control: Untap target artifact.
@@ -2320,40 +2311,6 @@ type=nothing
 auto=moveto(exile) all(this)
 [/card]
 [card]
-name=Fieldmist Borderpost
-autohand={1}:moveto(ownerhand) target(land|mybattlefield) asSorcery && token(-78710)
-auto=tap
-auto={t}:add{w}
-auto={t}:add{U}
-text=You may pay {1} and return a basic land you control to its owner's hand rather than pay Fieldmist Borderpost's mana cost. Fieldmist Borderpost enters the battlefield tapped. {t}: Add  or  to your mana pool.
-type=artifact
-mana={1}{w}{U}
-[/card]
-[card]
-name=alternate cost
-auto=moveto(mybattlefield) target(fieldmist borderpost|myhand)
-auto=moveto(exile) all(this)
-id=-78710
-type=nothing
-[/card]
-[card]
-name=Firewild Borderpost
-autohand={1}:moveto(ownerhand) target(land|mybattlefield) asSorcery && token(-78710)
-auto=tap
-auto={t}:add{R}
-auto={t}:add{G}
-text=You may pay {1} and return a basic land you control to its owner's hand rather than pay Firewild Borderpost's mana cost. Firewild Borderpost enters the battlefield tapped. {t}: Add  or  to your mana pool.
-type=artifact
-mana={1}{R}{G}
-[/card]
-[card]
-name=alternate cost
-auto=moveto(mybattlefield) target(Firewild Borderpost|myhand)
-auto=moveto(exile) all(this)
-id=-78711
-type=nothing
-[/card]
-[card]
 name=Flowstone Sculpture
 auto={2}{s(*|myhand)}:token(-987000) && counter(1/1,1) all(this)
 auto={2}{s(*|myhand)}:token(-987001) && counter(0/0,1,First Strike) all(this)
@@ -2394,48 +2351,6 @@ id=-987003
 type=nothing
 [/card]
 [card]
-name=Fool's Tome
-auto={2}{t}:aslongas(*|myhand) draw:1 <1
-text={2},{t} : Draw a card. Activate this ability only if you have no cards in hand.
-type=artifact
-mana={4}
-[/card]
-#reveal discard series
-[card]
-name=Ghastlord of Fugue
-auto=@damaged(player) from(this):counter(0/0,1,mycard) all(*|myhand) && moveto(myhand) all(*|opponenthand) && token(-58112) assorcery
-text=Ghastlord of Fugue is unblockable. Whenever Ghastlord of Fugue deals combat damage to a player, that player reveals his or her hand. You choose a card from it. That player exiles that card.
-type=creature
-subtype=spirit avatar
-abilities=unblockable
-power=4
-toughness=4
-mana={UB}{UB}{UB}{UB}{UB}
-[/card]
-[card]
-name=choose one card
-auto=counter(0/0,1,choice) target(*[-counter{0/0.1.mycard}]|myhand)
-auto=@movedto(this|exile):token(-58113)
-auto=moveto(exile) all(this)
-id=-58112
-type=nothing
-[/card]
-[card]
-name=destroy my choice
-auto=moveto(exile) all(*[counter{0/0.1.choice}]|myhand)
-auto=@movedto(this|exile):token(-58114)
-auto=moveto(exile) all(this)
-id=-58113
-type=nothing
-[/card]
-[card]
-name=return thier cards
-auto=moveto(opponenthand) all(*[-counter{0/0.1.mycard}]|myhand) && counter(0/0,-1,mycard) all(*|myhand)
-auto=@moveto(exile) all(this)
-id=-58114
-type=nothing
-[/card]
-[card]
 name=Treacherous Urge
 auto=counter(0/0,1,mycard) all(*|myhand) && moveto(myhand) all(*|opponenthand)
 auto=token(-13112)
@@ -4246,61 +4161,6 @@ name=My Poison Counter
 type=nothing
 [/card]
 [card]
-name=Marsh Viper
-auto=@damaged(player) from(this):token(16655488)*2 && aslongas(poison counter|opponentbattlefield) wingame >9
-type=creature
-text=Whenever Marsh Viper deals damage to an opponent, that player gets two poison counters. (A player with ten or more poison counters loses the game.)
-subtype=Snake
-power=1
-toughness=2
-mana={G){3}
-[/card]
-[card]
-name=Pit Scorpion
-auto=@damaged(player) from(this):token(16655488) && aslongas(poison counter|opponentbattlefield) wingame >9
-type=creature
-text=Whenever Pit Scorpion deals damage to a player, that player gets a poison counter. (A player with ten or more poison counters loses the game.)
-subtype=scorpion
-power=1
-toughness=1
-mana={B){2}
-[/card]
-[card]
-name=Virulent Sliver
-auto=@damaged(player) from(Sliver):token(16655488) && aslongas(poison counter|opponentbattlefield) wingame >9
-auto=@damaged(player) from(Sliver|opponentbattlefield):token(16655489) && aslongas(my poison counter|mybattlefield) losegame >9
-type=creature
-text=All Sliver creatures have poisonous 1. (Whenever a Sliver deals combat damage to a player, that player gets a poison counter. A player with ten or more poison counters loses the game.)
-subtype=sliver
-power=1
-toughness=1
-mana={G}
-[/card]
-[card]
-name=Snake Cult Initiation
-target=creature
-text=Enchanted creature has poisonous 3. (Whenever it deals combat damage to a player, that player gets three poison counters. A player with ten or more poison counters loses the game.)
-auto=@damaged(player) from(Mytgt):token(16655488)*3 && aslongas(poison counter|opponentbattlefield) wingame >9
-type=enchantment
-subtype=aura
-mana={3}{B}
-[/card]
-[card]
-name=Serpent Generator
-auto={4}{T}:token(16655490)
-text={4}{T}: Put a 1/1 colorless Snake artifact creature token onto the battlefield. This creature has "Whenever this creature deals damage to a player, that player gets a poison counter." (A player with ten or more poison counters loses the game.)
-type=Artifact
-mana={6)
-[/card]
-[card]
-name=Poison Snake
-auto=@damaged(player) from(this):token(16655488) && aslongas(poison counter|opponentbattlefield) wingame >9
-type=creature
-subtype=Token Snake
-power=1
-toughness=1
-[/card]
-[card]
 name=Greater Good
 auto=aslongas(creature[Power=0]|mybattlefield) lord(this) {0}:token(-122000)
 auto=aslongas(creature[Power=1]|mybattlefield) lord(this) {0}:token(-122001)
@@ -4562,14 +4422,6 @@ subtype=aura
 mana={4}{g}{w}
 [/card]
 [card]
-name=Overwhelming Force
-auto=@movedto(creature|graveyard):draw:1
-auto=destroy all(creature|opponentbattlefield)
-text=Destroy all creatures target opponent controls. Draw a card for each creature destroyed this way.
-type=Sorcery
-mana={6}{B}{B}
-[/card]
-[card]
 name=Organ Harvest
 auto=token(-12234)
 text=You and your teammates may sacrifice any number of creatures. For each creature sacrificed in this way, add oBoB to your mana pool.
@@ -4799,15 +4651,6 @@ toughness=0
 mana={4}{g}{G}
 [/card]
 [card]
-name=Last Laugh
-auto=@movedto(other enchantment,creature,land,artifact|graveyard) from(battlefield):Damage:1 all(creature,player)
-auto=aslongas(creature|battlefield) lord(this) bury <1
-auto=@movedto(other enchantment,creature,land,artifact|graveyard) from(battlefield):aslongas(creature|battlefield) lord(this) bury <1
-text=Whenever a permanent other than Last Laugh is put into a graveyard from the battlefield, Last Laugh deals 1 damage to each creature and each player. When no creatures are on the battlefield, sacrifice Last Laugh.
-type=enchantment
-mana={2}{B}{B}
-[/card]
-[card]
 name=Teysa, Orzhov Scion
 auto=@movedto(other creature[black]|graveyard) from(mybattlefield):token(Spirit,creature spirit token,1/1,white,flying)
 auto={0}:token(-12256)
diff --git a/projects/mtg/bin/Res/test/Frogmite.txt b/projects/mtg/bin/Res/test/Frogmite.txt
new file mode 100644
index 000000000..518beffe2
--- /dev/null
+++ b/projects/mtg/bin/Res/test/Frogmite.txt
@@ -0,0 +1,18 @@
+#Testing Frogmite (keyword:AFFINITY)
+#Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.)
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Mox Pearl,Seat of the Synod,Sol Ring
+hand:Frogmite
+manapool:{1}
+[PLAYER2]
+[DO]
+Frogmite
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Mox Pearl,Seat of the Synod,Sol Ring,Frogmite
+manapool:{0}
+[PLAYER2]
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 4d18b8ab7..ea52fd9b1 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -1,506 +1,2 @@
-########################
-#Generic engine features
-########################
-generic/attacks_each_turn.txt
-generic/cycling.txt
-generic/cycling2.txt
-generic/deathtouch.txt
-generic/doesnotuntap.txt
-generic/doesnotuntap2.txt
-generic/double_strike.txt
-generic/equip_landfall_buff.txt
-generic/equip_reach.txt
-generic/equip_shroud.txt
-generic/equip_shroud2.txt
-generic/equip_wither.txt
-generic/equipment_i252.txt
-generic/exalted.txt
-generic/exalted_i143.txt
-generic/exalted_i310.txt
-generic/fear.txt
-generic/fear_i147.txt
-generic/first_and_double_strike1_i187.txt
-generic/first_and_double_strike2_i187.txt
-generic/first_strike.txt
-generic/first_strike2.txt
-generic/first_strike3.txt
-generic/hybrid_mana.txt
-generic/hybrid_mana_2.txt
-generic/hybrid_mana_3.txt
-generic/kicker.txt
-generic/kicker2.txt
-generic/landwalk.txt
-generic/legendary.txt
-generic/level_up.txt
-generic/level_up2.txt
-generic/lord_counter.txt
-generic/lord_counter_any.txt
-generic/lifelink.txt
-generic/m10_blockers.txt
-generic/m10_blockers2.txt
-generic/must1.txt
-generic/must2.txt
-generic/nofizzle.txt
-generic/oneblocker.txt
-generic/persist.txt
-generic/persist2.txt
-generic/persist3.txt
-generic/phases.txt
-generic/rampage.txt
-generic/rampage2.txt
-generic/rampage3.txt
-generic/rampage_vs_first_strike.txt
-generic/regenerate.txt
-generic/regenerate_wither_i146.txt
-generic/sacrifice.txt
-generic/summoning_sickness.txt
-generic/tap_other_card_as_cost.txt
-generic/targetController_life.txt
-generic/targetController_life2.txt
-generic/targetController_damage.txt
-generic/thisforeach.txt
-generic/tokens.txt
-generic/tokens2.txt
-generic/trample.txt
-generic/trample_vs_indestructible.txt
-generic/trample_vs_multiblock.txt
-generic/triggers_at_movedto_i179.txt
-generic/wither.txt
-########################
-#Specific Cards
-########################
-act_of_treason.txt
-aegis_of_the_meek.txt
-aether_mutation.txt
-aether_flash.txt
-afflict.txt
-akron_legionnaire.txt
-alabaster_leech.txt
-alabaster_leech2.txt
-alluring_siren.txt
-Amugaba.txt
-anarchy.txt
-ancestors_chosen.txt
-angry_mob1.txt
-angry_mob2.txt
-angry_mob3.txt
-angry_mob4.txt
-angry_mob4b.txt
-angry_mob5.txt
-angry_mob7.txt
-animate_artifact.txt
-animate_artifact2.txt
-animate_dead.txt
-animate_dead2.txt
-animate_dead3.txt
-animated_legendaries1_i221.txt
-animated_legendaries2_i221.txt
-animated_legendaries3_i221.txt
-ankh_of_mishra.txt
-arcanis_the_omnipotent.txt
-arcanis_the_omnipotent2.txt
-arcbound.txt
-ardakar_wastes.txt
-ardent_soldier.txt
-argothian_enchantress.txt
-armadillo_cloak.txt
-ascendant_evincar.txt
-ascendant_evincar2.txt
-ascendant_evincar3.txt
-ashen_firebeast.txt
-ashen_firebeast2.txt
-aura_mutation.txt
-avarice_totem.txt
-aven_riftwatcher.txt
-aven_riftwatcher2.txt
-aysen_bureaucrats.txt
-balduvian_conjurer.txt
-baneslayer_angel.txt
-baneslayer_angel2.txt
-barbed_sliver.txt
-basal_sliver.txt
-beacon_of_creation.txt
-beacon_of_destruction.txt
-beacon_of_unrest.txt
-behemoth_sledge.txt
-behemoth_sledge2.txt
-behemoth_sledge3.txt
-behemoth_sledge4.txt
-behemoth_sledge5.txt
-belligerent_hatchling.txt
-benalish_knight.txt
-biorhythm.txt
-black_market.txt
-black_vise.txt
-blessed_wind.txt
-blessed_wine.txt
-blinking_spirit.txt
-blinkmoth_nexus.txt
-bloated_toad1.txt
-bloated_toad2.txt
-bloodfire_colossus.txt
-bloodhall_ooze.txt
-bloodscale_prowler.txt
-body_double.txt
-boggart_arsonists.txt
-borderland_behemoth.txt
-bottle_gnomes.txt
-bottle_gnomes2.txt
-brainstorm.txt
-bramblewood_paragon.txt
-brass_man.txt
-brass_man_i161.txt
-briarhorn.txt
-cage_of_hands.txt
-Call_to_Heel_1.txt
-Call_to_Heel_2.txt
-castle.txt
-cathodion.txt
-celestial_purge.txt
-chainbreaker.txt
-circle_of_protection.txt
-circle_of_protection_i211.txt
-civic_wayfinder.txt
-clone.txt
-clone2.txt
-clone3.txt
-cockatrice.txt
-cockatrice_i228.txt
-colossus_of_sardia1.txt
-colossus_of_sardia2.txt
-composite_golem.txt
-conservator.txt
-control_magic.txt
-control_magic2.txt
-control_magic3.txt
-control_magic4.txt
-corrupt.txt
-counsel_of_the_soratami.txt
-counterspell.txt
-counterspell2.txt
-counterspell3.txt
-counterspell4.txt
-cranial_plating.txt
-creature_bond.txt
-curiosity1_i217.txt
-curiosity2_i217.txt
-crimson_kobolds.txt
-crosis_s_catacombs_1.txt
-crosis_s_catacombs_2.txt
-crumble.txt
-crystal_rod_i172.txt
-dark_banishing.txt
-dauntless_escort.txt
-dauthi_embrace.txt
-death_grasp.txt
-death_ward.txt
-deja_vu.txt
-delusions_of_mediocrity.txt
-dingus_egg.txt
-dingus_staff_i153.txt
-divergent_growth.txt
-doomed_necromancer.txt
-double_strike_i145.txt
-double_strike2_i145.txt
-dragon_fodder.txt
-dragon_fodder2.txt
-dragon_whelp_i154.txt
-drain_life.txt
-dream_fracture_i142.txt
-drift_of_the_dead.txt
-dromad_purebred.txt
-dross_harvester.txt
-duskwalker.txt
-dust_corona.txt
-dwarven_warriors.txt
-ebony_horse.txt
-ekundu_cyclops1_i218.txt
-ekundu_cyclops2_i218.txt
-elvish_piper.txt
-elvish_promenade.txt
-emblem_of_the_warmind.txt
-enchanted evening.txt
-enervate.txt
-enchantress_s_presence.txt
-erg_raiders_i157.txt
-explore.txt
-fangren_pathcutter.txt
-farhaven_elf.txt
-farmstead.txt
-fastbond.txt
-fastbond2.txt
-fault_line.txt
-feral_hydra.txt
-fieldmist_borderpost.txt
-fire_tempest.txt
-firebreathing.txt
-fists_of_ironwood.txt
-flagstones.txt
-flame_fusillade_i265.txt
-flare.txt
-fledgling_imp.txt
-fledgling_imp2.txt
-fleshformer.txt
-flowstone_hellion.txt
-flowstone_slide.txt
-fog.txt
-fog_bank.txt
-foratog.txt
-force_of_nature.txt
-force_of_nature2.txt
-force_of_nature3.txt
-fountain_of_youth.txt
-fungus_sliver.txt
-gamble.txt
-gempalm_avenger.txt
-ghost_warden.txt
-glen_elendra_archmage_i222.txt
-giant_growth.txt
-giant_growth2.txt
-Glimmervoid.txt
-glimpse_the_unthinkable.txt
-gnarled_effigy.txt
-gnat_alley_creeper1.txt
-gnat_alley_creeper2.txt
-goblin_balloon_brigade.txt
-goblin_balloon_brigade2.txt
-goblin_gardener.txt
-goblin_king.txt
-goblin_lackey1.txt
-goblin_lackey2.txt
-goblin_lackey3.txt
-goblin_lackey4.txt
-goblin_offensive.txt
-goblin_razerunners.txt
-golgari_germination_i153.txt
-gravedigger.txt
-gravity_well.txt
-gravity_well2.txt
-great_defender.txt
-hannas_custody.txt
-harpoon_sniper.txt
-hellfire.txt
-helm_of_kaldra1.txt
-holy_day_i226.txt
-hope_charm_i267.txt
-hopping_automaton_i232.txt
-horned_helm.txt
-howl_from_beyond.txt
-howl_of_the_night_pack.txt
-hunting_pack.txt
-hurricane.txt
-hyalopterous_lemure.txt
-hymn_of_rebirth.txt
-hypnotic_specter.txt
-icatian_priest.txt
-imaginary_pet.txt
-immaculate_magistrate.txt
-incinerate.txt
-instill_energy_i166.txt
-iron_will_i270.txt
-ivy_elemental.txt
-jodahs_avenger.txt
-juggernaut.txt
-jump.txt
-juniper_order_ranger.txt
-karns_touch_i233.txt
-keldon_warlord.txt
-keldon_warlord2.txt
-kird_ape.txt
-kjeldoran_frostbeast1.txt
-kjeldoran_frostbeast2_i167.txt
-knight_captain_of_eos_i294.txt
-knight_captain_of_eos_i294_2.txt
-kormus_bell_i301.txt
-krosan_beast.txt
-krosan_beast2.txt
-kraken_eye.txt
-kraken_eye2.txt
-kraken_eye3.txt
-kraken_eye4.txt
-kudzu.txt
-kudzu2.txt
-kudzu_i168.txt
-leveler.txt
-lhurgoyf.txt
-liability.txt
-lifeforce.txt
-lifetap.txt
-lightmine_field1.txt
-lightmine_field2.txt
-living_artifact_i169.txt
-living_lands.txt
-lord_of_the_pit.txt
-lord_of_the_pit2.txt
-martial_coup.txt
-martial_coup2.txt
-master_decoy.txt
-master_of_etherium.txt
-masticore.txt
-masticore2.txt
-maze_of_ith.txt
-meekstone.txt
-memnarch.txt
-memory_erosion.txt
-millstone.txt
-misc01.txt
-moat.txt
-mobile_fort.txt
-mortuary.txt
-nantuko_husk.txt
-natural_order.txt
-necrogenesis.txt
-Nevinyrrals_Disk.txt
-Nevinyrrals_Disk2.txt
-nightmare.txt
-northern_paladin.txt
-northern_paladin2.txt
-Nyxathid.txt
-ondu_cleric.txt
-OneDozenEyes.txt
-orcish_artillery.txt
-orcish_lumberjack.txt
-overrun.txt
-paralysis.txt
-paralysis2.txt
-persuasion.txt
-phytohydra.txt
-plague_rats.txt
-plumes_of_peace_i260.txt
-pouncing_jaguar_i425.txt
-promise_of_bunrei_i305.txt
-prosperity.txt
-protomatter_powder.txt
-prowess_of_the_fair.txt
-prowess_of_the_fair2.txt
-prowess_of_the_fair3.txt
-pygmy_troll.txt
-pyknite_i426.txt
-pyroclasm.txt
-quilled_sliver.txt
-rain_of_filth_i206.txt
-rain_of_filth_i283.txt
-rakdos_pit_dragon_WITH_hellbent.txt
-rakdos_pit_dragon_WITHOUT_hellbent.txt
-rampant_growth.txt
-rancor.txt
-ray_of_command.txt
-ray_of_command_i176.txt
-reclusive_wight.txt
-reclusive_wight2.txt
-recover.txt
-regal_force.txt
-resounding_roar.txt
-resurrection.txt
-resuscitate_i210.txt
-righteous_cause.txt
-rockslide_elemental.txt
-rootwalla.txt
-royal_assassin.txt
-sacred_foundry_i275.txt
-safehold_duo.txt
-safe_passage.txt
-samite_healer.txt
-scourge_of_kher_ridges.txt
-scourge_of_kher_ridges2.txt
-scourglass.txt
-scouts_warning.txt
-scute_mob.txt
-sedge_sliver.txt
-seedcradle_witch.txt
-seismic_assault.txt
-seismic_spike_i191.txt
-selesnya_guildmage.txt
-shard_volley.txt
-silver_seraph_i300.txt
-skullcage0_i239.txt
-skullcage1_i239.txt
-skullcage2_i239.txt
-skullcage3_i239.txt
-skullcage4_i239.txt
-skullcage5_i239.txt
-skullcage6_i239.txt
-skullcage7_i239.txt
-skullclamp.txt
-shepherd_of_rot.txt
-shivan_hellkite.txt
-shock.txt
-shock2.txt
-siege_gang_commander.txt
-simic_initiate.txt
-slate_of_ancestry.txt
-sleeper_agent.txt
-slith_bloodletter.txt
-sneak_attack.txt
-soulblast.txt
-spark_elemental.txt
-sphinx_summoner.txt
-spirit_link.txt
-spitting_earth.txt
-spoils_of_evil.txt
-spore_frog.txt
-stasis.txt
-steelclad_serpent1.txt
-steelclad_serpent2.txt
-stillmoon_cavalier.txt
-stonebrow2.txt
-stonebrow_i159.txt
-stronghold_discipline.txt
-sword_to_plowshares.txt
-sylvan_scrying_i195.txt
-symbiotic_wurm.txt
-tanglesap.txt
-telekinetic_sliver.txt
-terror.txt
-terror2.txt
-thallid.txt
-thellon_of_havenwood.txt
-threaten.txt
-throne_of_bone.txt
-thunder-thrash_elder.txt
-titanic_ultimatum.txt
-tolsimir_wolfblood.txt
-torture.txt
-tranquil_domain.txt
-twinstrike.txt
-twinstrike2.txt
-twinstrike3.txt
-twitch.txt
-underworld_dreams.txt
-unearth1.txt
-unearth2.txt
-unearth3.txt
-unstable_mutation.txt
-unstable_mutation2.txt
-unwilling_recruit.txt
-urzas_lands.txt
-urzas_lands2.txt
-urzas_mine_i287.txt
-vampire_bats.txt
-vampiric_link.txt
-vine_dryad.txt
-volcanic_eruption.txt
-walking_wall.txt
-wall_of_diffusion.txt
-wall_of_diffusion2.txt
-warren_instigator.txt
-welkin_hawk.txt
-whispers_of_the_muse.txt
-white_knight1.txt
-windswept_heath.txt
-wrath_of_god.txt
-wrath_of_god2.txt
-wreak_havoc.txt
-Zombie_Infestation.txt
-zombie_master.txt
-zombify.txt
-########################
-#Momir Basic Tests
-########################
-momir/keldon_warlord.txt
-momir/overcost.txt
-########################
-#AI Tests
-########################
-#Removed until we can have these tests work on all machines :(
-#ai/goblin_artillery.txt
+frogmite.txt
+tangle_golem.txt
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/tangle_golem.txt b/projects/mtg/bin/Res/test/tangle_golem.txt
new file mode 100644
index 000000000..7c181047c
--- /dev/null
+++ b/projects/mtg/bin/Res/test/tangle_golem.txt
@@ -0,0 +1,18 @@
+#Testing Tangle Golem (keyword:AFFINITYFORESTS)
+#Affinity for Forests (This spell costs {1} less to cast for each Forest you control.)
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Forest,Forest,Forest,Forest
+hand:Tangle Golem
+manapool:{3}
+[PLAYER2]
+[DO]
+Tangle Golem
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Tangle Golem,Forest,Forest,Forest,Forest
+manapool:{0}
+[PLAYER2]
+[END]
\ No newline at end of file