(Re)Added 16 successfully tested cards based on rev2155.

Card list -> first comment. Optimized code for 9 cards (now 100%). Card list -> first comment Fixed issue355.
2010-08-09 14:35:18 +00:00
parent a3376bf08c
commit 9e549f3e88
2 changed files with 152 additions and 133 deletions
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -2126,20 +2126,6 @@ power=3
 toughness=5
 [/card]
 [card]
-name=Balduvian Horde
-auto=discard:1 controller
-#auto=aslongas(*|myHand) bury <1
-#Works due to a bug in WTH0.10
-#auto=@movedto(this|myBattlefield):aslongas(*|myHand) bury <1
-#Should work to be tested once the bug has been adressed
-text=When Balduvian Horde enters the battlefield, sacrifice it unless you discard a card at random.
-mana={2}{R}{R}
-type=Creature
-subtype=Human Barbarian
-power=5
-toughness=5
-[/card]
-[card]
 name=Balduvian Hydra
 text=Balduvian Hydra enters the battlefield with X +1/+0 counters on it. -- Remove a +1/+0 counter from Balduvian Hydra: Prevent the next 1 damage that would be dealt to Balduvian Hydra this turn. -- {R}{R}{R}: Put a +1/+0 counter on Balduvian Hydra. Activate this ability only during your upkeep.
 mana={X}{R}{R}
@@ -6324,16 +6310,6 @@ mana={2}{U}
 type=Enchantment
 [/card]
 [card]
-###this land cycle does not work! 0.12.1
-name=Coral Atoll
-auto=tap
-auto=moveTo(ownerhand) notatarget(island[-tapped]|myBattlefield)
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=@movedTo(island[-tapped]|myhand) from(myBattlefield):lord(coral atoll) {T}:Add{1}{U}
-text=Coral Atoll enters the battlefield tapped. -- When Coral Atoll enters the battlefield, sacrifice it unless you return an untapped Island you control to its owner's hand. -- {T}: Add {1}{U} to your mana pool.
-type=Land
-[/card]
-[card]
 name=Coral Fighters
 text=Whenever Coral Fighters attacks and isn't blocked, look at the top card of defending player's library. You may put that card on the bottom of that player's library.
 mana={1}{U}
@@ -6750,12 +6726,6 @@ power=6
 toughness=6
 [/card]
 [card]
-name=Crosis's Catacombs
-text=When Crosis's Catacombs enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {U}, {B}, or {R} to your mana pool.
-type=Land
-subtype=Lair
-[/card]
-[card]
 name=Crown of Ascension
 text=Enchant creature -- Enchanted creature has flying. -- Sacrifice Crown of Ascension: Enchanted creature and other creatures that share a creature type with it gain flying until end of turn.
 mana={1}{U}
@@ -7304,12 +7274,6 @@ power=6
 toughness=6
 [/card]
 [card]
-name=Darigaaz's Caldera
-text=When Darigaaz's Caldera enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {B}, {R}, or {G} to your mana pool.
-type=Land
-subtype=Lair
-[/card]
-[card]
 name=Dark Confidant
 text=At the beginning of your upkeep, reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost.
 mana={1}{B}
@@ -8834,16 +8798,6 @@ power=0
 toughness=5
 [/card]
 [card]
-###This land cycle does not work!
-name=Dormant Volcano
-auto=tap
-auto=aslongas(mountain[-tapped]|myBattlefield) moveTo(ownerhand) notatarget(mountain[-tapped]|myBattlefield)
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=@movedTo(mountain[-tapped]|myhand) from(myBattlefield):lord(dormant volcano) {T}:Add{1}{R}
-text=Dormant Volcano enters the battlefield tapped. -- When Dormant Volcano enters the battlefield, sacrifice it unless you return an untapped Mountain you control to its owner's hand. -- {T}: Add {1}{R} to your mana pool.
-type=Land
-[/card]
-[card]
 name=Dosan the Falling Leaf
 text=Players can cast spells only during their own turns.
 mana={1}{G}{G}
@@ -9190,15 +9144,6 @@ mana={X}{4}{B}
 type=Sorcery
 [/card]
 [card]
-name=Drekavac
-text=When Drekavac enters the battlefield, sacrifice it unless you discard a noncreature card.
-mana={1}{B}
-type=Creature
-subtype=Beast
-power=3
-toughness=3
-[/card]
-[card]
 name=Drelnoch
 text=Whenever Drelnoch becomes blocked, you may draw two cards.
 mana={4}{U}
@@ -9244,12 +9189,6 @@ power=6
 toughness=6
 [/card]
 [card]
-name=Dromar's Cavern
-text=When Dromar's Cavern enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {W}, {U}, or {B} to your mana pool.
-type=Land
-subtype=Lair
-[/card]
-[card]
 name=Droning Bureaucrats
 text={X}, {T}: Each creature with converted mana cost X can't attack or block this turn.
 mana={3}{W}
@@ -10747,16 +10686,6 @@ mana={0}
 type=Artifact
 [/card]
 [card]
-###This land cyclce does not work!
-name=Everglades
-auto=tap
-auto=aslongas(swamp[-tapped]|myBattlefield) moveTo(ownerhand) notatarget(swamp[-tapped]|myBattlefield)
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=@movedTo(swamp[-tapped]|myhand) from(myBattlefield):lord(everglades) {T}:Add{1}{B}
-text=Everglades enters the battlefield tapped. -- When Everglades enters the battlefield, sacrifice it unless you return an untapped Swamp you control to its owner's hand. -- {T}: Add {1}{B} to your mana pool.
-type=Land
-[/card]
-[card]
 name=Everglove Courier
 text=You may choose not to untap Everglove Courier during your untap step. -- {2}{G}, {T}: Target Elf creature gets +2/+2 and has trample for as long as Everglove Courier remains tapped.
 mana={2}{G}
@@ -18076,16 +18005,6 @@ power=5
 toughness=5
 [/card]
 [card]
-###This land cycle does not work!
-name=Karoo
-auto=tap
-auto=aslongas(plains[-tapped]|myBattlefield) moveTo(ownerhand) notatarget(plains[-tapped]|myBattlefield)
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=@movedTo(plains[-tapped]|myhand) from(myBattlefield):lord(karoo) {T}:Add{1}{W}
-text=Karoo enters the battlefield tapped. -- When Karoo enters the battlefield, sacrifice it unless you return an untapped Plains you control to its owner's hand. -- {T}: Add {1}{W} to your mana pool.
-type=Land
-[/card]
-[card]
 name=Karplusan Minotaur
 text=Cumulative upkeep - Flip a coin. (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.) -- Whenever you win a coin flip, Karplusan Minotaur deals 1 damage to target creature or player. -- Whenever you lose a coin flip, Karplusan Minotaur deals 1 damage to target creature or player of an opponent's choice.
 mana={2}{R}{R}
@@ -22162,18 +22081,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Minotaur Explorer
-auto=@movedto(this|myBattlefield):aslongas(*|myHand) bury <1
-auto=discard:1 controller
-#Reomved does not work in WTH 0.10 see also Balduvian Horde (ALL)
-text=When Minotaur Explorer enters the battlefield, sacrifice it unless you discard a card at random.
-mana={1}{R}
-type=Creature
-subtype=Minotaur Scout
-power=3
-toughness=3
-[/card]
-[card]
 name=Miracle Worker
 text={T}: Destroy target Aura attached to a creature you control.
 mana={W}
@@ -26332,17 +26239,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Pillaging Horde
-auto=discard:1
-###Cannot be coded right now! 0.10.1
-text=When Pillaging Horde enters the battlefield, sacrifice it unless you discard a card at random.
-mana={2}{R}{R}
-type=Creature
-subtype=Human Barbarian
-power=5
-toughness=5
-[/card]
-[card]
 name=Pillar Tombs of Aku
 text=At the beginning of each player's upkeep, that player may sacrifice a creature. If that player doesn't, he or she loses 5 life and you sacrifice Pillar Tombs of Aku.
 mana={2}{B}{B}
@@ -29646,20 +29542,11 @@ type=Sorcery
 [/card]
 [card]
 name=Rith's Charm
-auto=may destroy target(land[-basic])
-auto=may token(Saproling,creature saproling,1/1,green)*3
-####NOT 100% CODABLE YET!!
 text=Choose one - Destroy target nonbasic land; or put three 1/1 green Saproling creature tokens onto the battlefield; or prevent all damage a source of your choice would deal this turn.
 mana={R}{G}{W}
 type=Instant
 [/card]
 [card]
-name=Rith's Grove
-text=When Rith's Grove enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {R}, {G}, or {W} to your mana pool.
-type=Land
-subtype=Lair
-[/card]
-[card]
 name=Rith, the Awakener
 text=Flying -- Whenever Rith, the Awakener deals combat damage to a player, you may pay {2}{G}. If you do, choose a color, then put a 1/1 green Saproling creature token onto the battlefield for each permanent of that color.
 mana={3}{R}{G}{W}
@@ -38011,12 +37898,6 @@ power=6
 toughness=6
 [/card]
 [card]
-name=Treva's Ruins
-text=When Treva's Ruins enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {G}, {W}, or {U} to your mana pool.
-type=Land
-subtype=Lair
-[/card]
-[card]
 name=Trial // Error (Error)
 text=Counter target multicolored spell.
 mana={U}{B}
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -3212,6 +3212,17 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Balduvian Horde
+auto=aslongas(*|myHand) choice discard:1 controller oneshot
+auto=aslongas(*|myHand) choice bury oneshot
+text=When Balduvian Horde enters the battlefield, sacrifice it unless you discard a card at random.
+mana={2}{R}{R}
+type=Creature
+subtype=Human Barbarian
+power=5
+toughness=5
+[/card]
+[card]
 name=Balduvian Rage
 target=creature[attacking]
 auto=X/0
@@ -9045,6 +9056,15 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Coral Atoll
+auto=tap
+auto=aslongas(island[-tapped]|mybattlefield) moveto(myhand) target(island[-tapped]|mybattlefield) oneshot
+auto=moveto(mygraveyard) target(this|mybattlefield)
+auto={T}:Add{1}{U}
+text=Coral Atoll enters the battlefield tapped. -- When Coral Atoll enters the battlefield, sacrifice it unless you return an untapped Island you control to its owner's hand. -- {T}: Add {1}{U} to your mana pool.
+type=Land
+[/card]
+[card]
 name=Coral Eel
 mana={1}{U}
 type=Creature
@@ -9576,6 +9596,17 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Crosis's Catacombs
+auto=aslongas(land[-lair]|mybattlefield) moveto(myhand) target(land[-lair]|mybattlefield) oneshot
+auto=moveto(mygraveyard) target(this|mybattlefield)
+auto={T}:Add{U}
+auto={T}:Add{B}
+auto={T}:Add{R}
+text=When Crosis's Catacombs enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {U}, {B}, or {R} to your mana pool.
+type=Land
+subtype=Lair
+[/card]
+[card]
 name=Crosis's Charm
 auto=aslongas(*|battlefield) choice moveTo(ownerhand) target(*)
 auto=aslongas(creature[-black]|battlefield) choice bury target(creature[-black])
@@ -10176,6 +10207,17 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Darigaaz's Caldera
+auto=aslongas(land[-lair]|mybattlefield) moveto(myhand) target(land[-lair]|mybattlefield) oneshot
+auto=moveto(mygraveyard) target(this|mybattlefield)
+auto={T}:Add{B}
+auto={T}:Add{R}
+auto={T}:Add{G}
+text=When Darigaaz's Caldera enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {B}, {R}, or {G} to your mana pool.
+type=Land
+subtype=Lair
+[/card]
+[card]
 name=Darigaaz's Charm
 auto=aslongas(creature|mygraveyard) choice moveTo(myhand) target(creature|mygraveyard)
 auto=choice damage:3 target(creature,player)
@@ -12051,6 +12093,15 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Dormant Volcano
+auto=tap
+auto=aslongas(mountain[-tapped]|mybattlefield) moveto(myhand) target(mountain[-tapped]|mybattlefield) oneshot
+auto=moveto(mygraveyard) target(this|mybattlefield)
+auto={T}:Add{1}{R}
+text=Dormant Volcano enters the battlefield tapped. -- When Dormant Volcano enters the battlefield, sacrifice it unless you return an untapped Mountain you control to its owner's hand. -- {T}: Add {1}{R} to your mana pool.
+type=Land
+[/card]
+[card]
 name=Dosan's Oldest Chant
 auto=life:6 controller
 auto=draw:1 controller
@@ -12297,8 +12348,8 @@ type=Sorcery
 [card]
 name=Drake Familiar
 abilities=flying
+auto=aslongas(enchantment|mybattlefield) moveTo(ownerhand) notatarget(enchantment|battlefield) oneshot
 auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=moveTo(ownerhand) notatarget(enchantment|battlefield)
 text=Flying -- When Drake Familiar enters the battlefield, sacrifice it unless you return an enchantment to its owner's hand.
 mana={1}{U}
 type=Creature
@@ -12522,6 +12573,17 @@ toughness=1
 mana={1}{B}
 [/card]
 [card]
+name=Drekavac
+auto=aslongas(*[-creature]|myhand) (moveTo(graveyard) notatarget(*[-creature]|myhand) oneshot
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+text=When Drekavac enters the battlefield, sacrifice it unless you discard a noncreature card.
+mana={1}{B}
+type=Creature
+subtype=Beast
+power=3
+toughness=3
+[/card]
+[card]
 name=Drift of Phantasms
 abilities=defender,flying
 autohand={1}{U}{U}{S}:moveTo(myhand) target(*[manacost=3]|mylibrary) asSorcery
@@ -12606,6 +12668,17 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Dromar's Cavern
+auto=aslongas(land[-lair]|mybattlefield) moveto(myhand) target(land[-lair]|mybattlefield) oneshot
+auto=moveto(mygraveyard) target(this|mybattlefield)
+auto={T}:Add{W}
+auto={T}:Add{U}
+auto={T}:Add{B}
+text=When Dromar's Cavern enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {W}, {U}, or {B} to your mana pool.
+type=Land
+subtype=Lair
+[/card]
+[card]
 name=Dromar's Charm
 auto=choice life:5 controller
 auto=aslongas(*|stack) choice fizzle target(*|stack)
@@ -14606,6 +14679,15 @@ mana={2}{R}
 type=Sorcery
 [/card]
 [card]
+name=Everglades
+auto=tap
+auto=aslongas(swamp[-tapped]|mybattlefield) moveto(myhand) target(swamp[-tapped]|mybattlefield) oneshot
+auto=moveto(mygraveyard) target(this|mybattlefield)
+auto={T}:Add{1}{B}
+text=Everglades enters the battlefield tapped. -- When Everglades enters the battlefield, sacrifice it unless you return an untapped Swamp you control to its owner's hand. -- {T}: Add {1}{B} to your mana pool.
+type=Land
+[/card]
+[card]
 name=Evil Eye of Orms-by-Gore
 auto=lord(creature[-eye]|myBattlefield) cantattack
 auto=cantbeblockedby(creature[-wall])
@@ -15008,8 +15090,8 @@ type=Sorcery
 [/card]
 [card]
 name=Fallow Wurm
+auto=aslongas(land|myhand) moveTo(graveyard) notatarget(land|myhand) oneshot
 auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=moveTo(graveyard) notatarget(land|myhand)
 text=When Fallow Wurm enters the battlefield, sacrifice it unless you discard a land card.
 mana={2}{G}
 type=Creature
@@ -20485,8 +20567,8 @@ toughness=4
 [/card]
 [card]
 name=Harvest Wurm
+auto=aslongas(land[basic]|mygraveyard) moveTo(myhand) notatarget(land[basic]|mygraveyard) oneshot
 auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=moveTo(myhand) notatarget(land[basic]|mygraveyard)
 text=When Harvest Wurm enters the battlefield, sacrifice it unless you return a basic land card from your graveyard to your hand.
 mana={1}{G}
 type=Creature
@@ -21159,8 +21241,8 @@ type=Land
 [/card]
 [card]
 name=Hidden Horror
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=moveTo(graveyard) notatarget(creature|myhand)
+auto=moveTo(graveyard) target(this|myBattlefield) oneshot
+auto=aslongas(creature|myhand) moveTo(graveyard) target(creature|myhand) oneshot
 text=When Hidden Horror enters the battlefield, sacrifice it unless you discard a creature card.
 mana={1}{B}{B}
 type=Creature
@@ -24224,6 +24306,15 @@ mana={U}{U}
 type=Instant
 [/card]
 [card]
+name=Karoo
+auto=tap
+auto=aslongas(plains[-tapped]|mybattlefield) moveto(myhand) notatarget(plains[-tapped]|mybattlefield) oneshot
+auto=moveto(mygraveyard) notatarget(this|mybattlefield)
+auto={T}:Add{1}{W}
+text=Karoo enters the battlefield tapped. -- When Karoo enters the battlefield, sacrifice it unless you return an untapped Plains you control to its owner's hand. -- {T}: Add {1}{W} to your mana pool.
+type=Land
+[/card]
+[card]
 name=Karoo Meerkat
 abilities=protection from blue
 text=Protection from blue
@@ -28611,8 +28702,8 @@ type=Instant
 [/card]
 [card]
 name=Mercenary Knight
-auto=moveTo(mygraveyard) notatarget(this|myBattlefield)
-auto=moveTo(mygraveyard) notatarget(creature|myhand)
+auto=aslongas(creature|myhand) moveTo(graveyard) notatarget(creature|myhand) oneshot
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
 text=When Mercenary Knight enters the battlefield, sacrifice it unless you discard a creature card.
 mana={2}{B}
 type=Creature
@@ -29136,6 +29227,17 @@ mana={2}{B}{B}
 type=Sorcery
 [/card]
 [card]
+name=Minotaur Explorer
+auto=aslongas(*|myHand) choice discard:1 controller oneshot
+auto=aslongas(*|myHand) choice bury oneshot
+text=When Minotaur Explorer enters the battlefield, sacrifice it unless you discard a card at random.
+mana={1}{R}
+type=Creature
+subtype=Minotaur Scout
+power=3
+toughness=3
+[/card]
+[card]
 name=Minotaur Illusionist
 auto={1}{U}:shroud
 auto={R}{S}:thisforeach(power>=1) damage:1 target(creature)
@@ -30167,7 +30269,7 @@ toughness=1
 [/card]
 [card]
 name=Mox Diamond
-auto=moveTo(mygraveyard) notatarget(land|myhand)
+auto=aslongas(land|myhand) moveTo(mygraveyard) notatarget(land|myhand) oneshot
 auto=moveTo(mygraveyard) notatarget(this|myBattlefield)
 auto=@movedTo(land|mygraveyard) from(myhand):lord(mox diamond) {T}:Add{W} && lord(mox diamond) {T}:Add{U} && lord(mox diamond) {T}:Add{B} && lord(mox diamond) {T}:Add{R} && lord(mox diamond) {T}:Add{G}
 text=If Mox Diamond would enter the battlefield, you may discard a land card instead. If you do, put Mox Diamond onto the battlefield. If you don't, put it into its owner's graveyard. -- {T}: Add one mana of any color to your mana pool.
@@ -33781,6 +33883,17 @@ mana={1}{R}{R}
 type=Sorcery
 [/card]
 [card]
+name=Pillaging Horde
+auto=aslongas(*|myHand) choice discard:1 controller oneshot
+auto=aslongas(*|myHand) choice bury oneshot
+text=When Pillaging Horde enters the battlefield, sacrifice it unless you discard a card at random.
+mana={2}{R}{R}
+type=Creature
+subtype=Human Barbarian
+power=5
+toughness=5
+[/card]
+[card]
 name=Pillarfield Ox
 mana={3}{W}
 type=Creature
@@ -34031,8 +34144,8 @@ type=Enchantment
 [/card]
 [card]
 name=Plant Elemental
+auto=aslongas(forest|myBattlefield) (moveTo(graveyard) target(forest|myBattlefield) oneshot
 auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=moveTo(graveyard) notatarget(forest|myBattlefield)
 text=When Plant Elemental enters the battlefield, sacrifice it unless you sacrifice a Forest.
 mana={1}{G}
 type=Creature
@@ -37143,6 +37256,17 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Rith's Grove
+auto=aslongas(land[-lair]|mybattlefield) moveto(myhand) target(land[-lair]|mybattlefield) oneshot
+auto=moveto(mygraveyard) target(this|mybattlefield)
+auto={T}:Add{R}
+auto={T}:Add{G}
+auto={T}:Add{W}
+text=When Rith's Grove enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {R}, {G}, or {W} to your mana pool.
+type=Land
+subtype=Lair
+[/card]
+[card]
 name=Ritual of Restoration
 target=artifact|myGraveyard
 auto=moveto(myHand)
@@ -37386,7 +37510,8 @@ toughness=1
 [/card]
 [card]
 name=Rogue Elephant
-auto=moveTo(mygraveyard) notatarget(this,forest|myBattlefield)
+auto=aslongas(forest|myBattlefield) (moveTo(graveyard) target(forest|myBattlefield) oneshot
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
 text=When Rogue Elephant enters the battlefield, sacrifice it unless you sacrifice a Forest.
 mana={G}
 type=Creature
@@ -39003,7 +39128,8 @@ toughness=1
 [card]
 name=Scythe Tiger
 abilities=shroud
-auto=moveTo(mygraveyard) notatarget(this;land|myBattlefield)
+auto=aslongas(land|myBattlefield) (moveTo(graveyard) target(land|myBattlefield) oneshot
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
 text=Shroud (This creature can't be the target of spells or abilities.) -- When Scythe Tiger enters the battlefield, sacrifice it unless you sacrifice a land.
 mana={G}
 type=Creature
@@ -39253,7 +39379,7 @@ toughness=2
 [/card]
 [card]
 name=Sedraxis Alchemist
-auto=aslongas(*[blue]|myBattlefield) moveTo(ownerhand) target(*[-land])
+auto=aslongas(*[blue]|myBattlefield) moveTo(ownerhand) target(*[-land]) oneshot
 text=When Sedraxis Alchemist enters the battlefield, if you control a blue permanent, return target nonland permanent to its owner's hand.
 mana={2}{B}
 type=Creature
@@ -47221,8 +47347,8 @@ toughness=3
 [/card]
 [card]
 name=Thundering Wurm
+auto=aslongas(land|myhand) moveTo(graveyard) notatarget(land|myhand) oneshot
 auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=moveTo(graveyard) notatarget(land|myhand)
 text=When Thundering Wurm enters the battlefield, sacrifice it unless you discard a land card.
 mana={2}{G}
 type=Creature
@@ -48440,6 +48566,17 @@ id=-1111143
 type=nothing
 [/card]
 [card]
+name=Treva's Ruins
+auto=aslongas(land[-lair]|mybattlefield) moveto(myhand) target(land[-lair]|mybattlefield) oneshot
+auto=moveto(mygraveyard) target(this|mybattlefield)
+auto={T}:Add{G}
+auto={T}:Add{W}
+auto={T}:Add{U}
+text=When Treva's Ruins enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {G}, {W}, or {U} to your mana pool.
+type=Land
+subtype=Lair
+[/card]
+[card]
 name=Triassic Egg
 auto={3}{T}:counter(0/0,1,Hatchling)
 auto={C(0/0,-2,Hatchling)}{S}:moveTo(myBattlefield) target(creature|myhand,mygraveyard)
@@ -51178,7 +51315,8 @@ toughness=1
 [/card]
 [card]
 name=Vulshok War Boar
-auto=moveTo(ownergraveyard) target(artifact,vulshok war boar|myBattlefield)
+auto=aslongas(artifact|myBattlefield) moveTo(graveyard) notatarget(artifact|myBattlefield) oneshot
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
 text=When Vulshok War Boar enters the battlefield, sacrifice it unless you sacrifice an artifact.
 mana={2}{R}{R}
 type=Creature