update mana producer

change && to andability

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -838,8 +838,8 @@ toughness=5
 [card]
 name=Adarkar Wastes
 auto={T}:Add{1}
-auto={T}:Add{W} && Damage:1 controller
-auto={T}:Add{U} && Damage:1 controller
+auto={T}:Add{W} and!( damage:1 controller )!
+auto={T}:Add{U} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {W} or {U} to your mana pool. Adarkar Wastes deals 1 damage to you.
 type=Land
 [/card]
@@ -3663,7 +3663,7 @@ text=Look at the top five cards of your library. You may reveal a colorless card
 [/card]
 [card]
 name=Ancient Tomb
-auto={T}:Add{2} && Damage:2 controller
+auto={T}:Add{2} and!( damage:2 controller )!
 text={T}: Add {2} to your mana pool. Ancient Tomb deals 2 damage to you.
 type=Land
 [/card]
@@ -6723,11 +6723,11 @@ type=Instant
 [/card]
 [card]
 name=Astrolabe
-auto={1}{T}{S}:Add{W}{W} && phaseaction[upkeep once] draw:1 controller
-auto={1}{T}{S}:Add{U}{U} && phaseaction[upkeep once] draw:1 controller
-auto={1}{T}{S}:Add{B}{B} && phaseaction[upkeep once] draw:1 controller
-auto={1}{T}{S}:Add{R}{R} && phaseaction[upkeep once] draw:1 controller
-auto={1}{T}{S}:Add{G}{G} && phaseaction[upkeep once] draw:1 controller
+auto={1}{T}{S}:Add{W}{W} and!( phaseaction[upkeep once] draw:1 controller )!
+auto={1}{T}{S}:Add{U}{U} and!( phaseaction[upkeep once] draw:1 controller )!
+auto={1}{T}{S}:Add{B}{B} and!( phaseaction[upkeep once] draw:1 controller )!
+auto={1}{T}{S}:Add{R}{R} and!( phaseaction[upkeep once] draw:1 controller )!
+auto={1}{T}{S}:Add{G}{G} and!( phaseaction[upkeep once] draw:1 controller )!
 text={1}, {T}, Sacrifice Astrolabe: Add two mana of any one color to your mana pool. Draw a card at the beginning of the next turn's upkeep.
 mana={3}
 type=Artifact
@@ -9058,7 +9058,7 @@ toughness=3
 [/card]
 [card]
 name=Barbarian Ring
-auto={T}:Add{R} && damage:1 controller
+auto={T}:Add{R} and!( damage:1 controller )!
 auto=aslongas(*|mygraveyard) {R}{T}{S}:damage:2 target(creature,player) >6
 text={T}: Add {R} to your mana pool. Barbarian Ring deals 1 damage to you. -- Threshold - {R}, {T}, Sacrifice Barbarian Ring: Barbarian Ring deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard.
 type=Land
@@ -9102,11 +9102,11 @@ type=Enchantment
 [/card]
 [card]
 name=Barbed Sextant
-auto={1}{T}{S}:Add{W} && phaseaction[upkeep once] draw:1 controller
-auto={1}{T}{S}:Add{U} && phaseaction[upkeep once] draw:1 controller
-auto={1}{T}{S}:Add{B} && phaseaction[upkeep once] draw:1 controller
-auto={1}{T}{S}:Add{R} && phaseaction[upkeep once] draw:1 controller
-auto={1}{T}{S}:Add{G} && phaseaction[upkeep once] draw:1 controller
+auto={1}{T}{S}:Add{W} and!( phaseaction[upkeep once] draw:1 controller )!
+auto={1}{T}{S}:Add{U} and!( phaseaction[upkeep once] draw:1 controller )!
+auto={1}{T}{S}:Add{B} and!( phaseaction[upkeep once] draw:1 controller )!
+auto={1}{T}{S}:Add{R} and!( phaseaction[upkeep once] draw:1 controller )!
+auto={1}{T}{S}:Add{G} and!( phaseaction[upkeep once] draw:1 controller )!
 text={1}, {T}, Sacrifice Barbed Sextant: Add one mana of any color to your mana pool. Draw a card at the beginning of the next turn's upkeep.
 mana={1}
 type=Artifact
@@ -9762,8 +9762,8 @@ type=Enchantment
 [card]
 name=Battlefield Forge
 auto={T}:Add{1}
-auto={T}:Add{R} && Damage:1 controller
-auto={T}:Add{W} && Damage:1 controller
+auto={T}:Add{R} and!( damage:1 controller )!
+auto={T}:Add{W} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {R} or {W} to your mana pool. Battlefield Forge deals 1 damage to you.
 type=Land
 [/card]
@@ -15394,8 +15394,8 @@ type=Sorcery
 [card]
 name=Brushland
 auto={T}:Add{1}
-auto={T}:Add{G} && Damage:1 controller
-auto={T}:Add{W} && Damage:1 controller
+auto={T}:Add{G} and!( damage:1 controller )!
+auto={T}:Add{W} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {G} or {W} to your mana pool. Brushland deals 1 damage to you.
 type=Land
 [/card]
@@ -16071,7 +16071,7 @@ toughness=5
 [/card]
 [card]
 name=Cabal Pit
-auto={T}:Add{B} && damage:1 controller
+auto={T}:Add{B} and!( damage:1 controller )!
 auto=aslongas(*|mygraveyard) {B}{T}{S}:-2/-2 target(creature) >6
 text={T}: Add {B} to your mana pool. Cabal Pit deals 1 damage to you. -- Threshold - {B}, {T}, Sacrifice Cabal Pit: Target creature gets -2/-2 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
 type=Land
@@ -16322,8 +16322,8 @@ toughness=2
 name=Caldera Lake
 auto=tap(noevent)
 auto={T}:Add{1}
-auto={T}:Add{U} && damage:1 controller
-auto={T}:Add{R} && damage:1 controller
+auto={T}:Add{U} and!( damage:1 controller )!
+auto={T}:Add{R} and!( damage:1 controller )!
 text=Caldera Lake enters the battlefield tapped. -- {T}: Add {1} to your mana pool. -- {T}: Add {U} or {R} to your mana pool. Caldera Lake deals 1 damage to you.
 type=Land
 [/card]
@@ -17778,8 +17778,8 @@ toughness=5
 [card]
 name=Caves of Koilos
 auto={T}:Add{1}
-auto={T}:Add{W} && Damage:1 controller
-auto={T}:Add{B} && Damage:1 controller
+auto={T}:Add{W} and!( damage:1 controller )!
+auto={T}:Add{B} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {W} or {B} to your mana pool. Caves of Koilos deals 1 damage to you.
 type=Land
 [/card]
@@ -18026,7 +18026,7 @@ toughness=3
 [/card]
 [card]
 name=Centaur Garden
-auto={T}:Add{G} && damage:1 controller
+auto={T}:Add{G} and!( damage:1 controller )!
 auto=aslongas(*|mygraveyard) {G}{T}{S}:3/3 target(creature) >6
 text={T}: Add {G} to your mana pool. Centaur Garden deals 1 damage to you. -- Threshold - {G}, {T}, Sacrifice Centaur Garden: Target creature gets +3/+3 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
 type=Land
@@ -18147,7 +18147,7 @@ toughness=2
 [/card]
 [card]
 name=Cephalid Coliseum
-auto={T}:Add{U} && damage:1 controller
+auto={T}:Add{U} and!( damage:1 controller )!
 auto=aslongas(*|mygraveyard) {U}{T}{S}:name(discard 3 cards) target(player) ability$!draw:3 _ choice target(<3>*|myhand) reject!$ targetedplayer >6
 text={T}: Add {U} to your mana pool. Cephalid Coliseum deals 1 damage to you. -- Threshold - {U}, {T}, Sacrifice Cephalid Coliseum: Target player draws three cards, then discards three cards. Activate this ability only if seven or more cards are in your graveyard.
 type=Land
@@ -19610,11 +19610,11 @@ type=Artifact
 [/card]
 [card]
 name=Chromatic Sphere
-auto={1}{T}{S}:Add{G} && Draw:1 controller
-auto={1}{T}{S}:Add{R} && Draw:1 controller
-auto={1}{T}{S}:Add{U} && Draw:1 controller
-auto={1}{T}{S}:Add{B} && Draw:1 controller
-auto={1}{T}{S}:Add{W} && Draw:1 controller
+auto={1}{T}{S}:Add{G} and!( draw:1 controller )!
+auto={1}{T}{S}:Add{R} and!( draw:1 controller )!
+auto={1}{T}{S}:Add{U} and!( draw:1 controller )!
+auto={1}{T}{S}:Add{B} and!( draw:1 controller )!
+auto={1}{T}{S}:Add{W} and!( draw:1 controller )!
 text={1}, {T}, Sacrifice Chromatic Sphere: Add one mana of any color to your mana pool. Draw a card.
 mana={1}
 type=Artifact
@@ -19825,8 +19825,8 @@ toughness=4
 [card]
 name=Cinder Marsh
 auto={T}:Add{1}
-auto={T}:Add{B} && frozen
-auto={T}:Add{R} && frozen
+auto={T}:Add{B} and!( frozen )!
+auto={T}:Add{R} and!( frozen )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {B} or {R} to your mana pool. Cinder Marsh doesn't untap during your next untap step.
 type=Land
 [/card]
@@ -20810,8 +20810,8 @@ toughness=2
 [card]
 name=Cloudcrest Lake
 auto={T}:Add{1}
-auto={T}:Add{W} && frozen
-auto={T}:Add{U} && frozen
+auto={T}:Add{W} and!( frozen )!
+auto={T}:Add{U} and!( frozen )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {W} or {U} to your mana pool. Cloudcrest Lake doesn't untap during your next untap step.
 type=Land
 [/card]
@@ -26041,7 +26041,7 @@ type=Land
 [/card]
 [card]
 name=Darkwater Egg
-auto={2}{T}{S}:Add{U}{B} && Draw:1
+auto={2}{T}{S}:Add{U}{B} and!( draw:1 controller )!
 text={2}, {T}, Sacrifice Darkwater Egg: Add {U}{B} to your mana pool. Draw a card.
 mana={1}
 type=Artifact
@@ -34688,7 +34688,7 @@ toughness=2
 [/card]
 [card]
 name=Elves of Deep Shadow
-auto={T}:Add{B} && damage:1 controller
+auto={T}:Add{B} and!( damage:1 controller )!
 text={T}: Add {B} to your mana pool. Elves of Deep Shadow deals 1 damage to you.
 mana={G}
 type=Creature
@@ -44974,16 +44974,11 @@ type=Artifact
 [card]
 name=Gemstone Mine
 auto=counter(0/0,3,Mining)
-auto=this(counter{0/0,1,Mining}>1) {T}{C(0/0,-1,Mining)}:Add{G}
-auto=this(counter{0/0,1,Mining}>1) {T}{C(0/0,-1,Mining)}:Add{R}
-auto=this(counter{0/0,1,Mining}>1) {T}{C(0/0,-1,Mining)}:Add{U}
-auto=this(counter{0/0,1,Mining}>1) {T}{C(0/0,-1,Mining)}:Add{B}
-auto=this(counter{0/0,1,Mining}>1) {T}{C(0/0,-1,Mining)}:Add{W}
-auto=this(counter{0/0,1,Mining}=1) {T}{C(0/0,-1,Mining)}:Add{G} && sacrifice
-auto=this(counter{0/0,1,Mining}=1) {T}{C(0/0,-1,Mining)}:Add{R} && sacrifice
-auto=this(counter{0/0,1,Mining}=1) {T}{C(0/0,-1,Mining)}:Add{U} && sacrifice
-auto=this(counter{0/0,1,Mining}=1) {T}{C(0/0,-1,Mining)}:Add{B} && sacrifice
-auto=this(counter{0/0,1,Mining}=1) {T}{C(0/0,-1,Mining)}:Add{W} && sacrifice
+auto={T}{C(0/0,-1,Mining)}:Add{G} and!( this(counter{0/0.1.Mining}<1) sacrifice oneshot )!
+auto={T}{C(0/0,-1,Mining)}:Add{R} and!( this(counter{0/0.1.Mining}<1) sacrifice oneshot )!
+auto={T}{C(0/0,-1,Mining)}:Add{U} and!( this(counter{0/0.1.Mining}<1) sacrifice oneshot )!
+auto={T}{C(0/0,-1,Mining)}:Add{B} and!( this(counter{0/0.1.Mining}<1) sacrifice oneshot )!
+auto={T}{C(0/0,-1,Mining)}:Add{W} and!( this(counter{0/0.1.Mining}<1) sacrifice oneshot )!
 text=Gemstone Mine enters the battlefield with three mining counters on it. -- {T}, Remove a mining counter from Gemstone Mine: Add one mana of any color to your mana pool. If there are no mining counters on Gemstone Mine, sacrifice it.
 type=Land
 [/card]
@@ -49008,11 +49003,11 @@ toughness=3
 name=Grand Coliseum
 auto=tap(noevent)
 auto={T}:Add{1}
-auto={T}:Add{B} && damage:1 controller
-auto={T}:Add{G} && damage:1 controller
-auto={T}:Add{R} && damage:1 controller
-auto={T}:Add{U} && damage:1 controller
-auto={T}:Add{W} && damage:1 controller
+auto={T}:Add{B} and!( damage:1 controller )!
+auto={T}:Add{G} and!( damage:1 controller )!
+auto={T}:Add{R} and!( damage:1 controller )!
+auto={T}:Add{U} and!( damage:1 controller )!
+auto={T}:Add{W} and!( damage:1 controller )!
 text=Grand Coliseum enters the battlefield tapped. -- {T}: Add {1} to your mana pool. -- {T}: Add one mana of any color to your mana pool. Grand Coliseum deals 1 damage to you.
 type=Land
 [/card]
@@ -50602,8 +50597,8 @@ type=Instant
 [card]
 name=Grove of the Burnwillows
 auto={T}:Add{1}
-auto={T}:Add{R} && life:1 opponent
-auto={T}:Add{G} && life:1 opponent
+auto={T}:Add{R} and!( life:1 opponent )!
+auto={T}:Add{G} and!( life:1 opponent )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {R} or {G} to your mana pool. Each opponent gains 1 life.
 type=Land
 [/card]
@@ -54017,8 +54012,7 @@ type=Instant
 name=Hickory Woodlot
 auto=tap(noevent)
 auto=counter(0/0,2,Depletion)
-auto=this(counter{0/0,1,Depletion}>1) {T}{C(0/0,-1,Depletion)}:Add{G}{G}
-auto=this(counter{0/0,1,Depletion}=1) {T}{C(0/0,-1,Depletion)}:Add{G}{G} && sacrifice
+auto={T}{C(0/0,-1,Depletion)}:Add{G}{G} and!( this(counter{0/0.1.Depletion}<1) sacrifice oneshot )!
 text=Hickory Woodlot enters the battlefield tapped with two depletion counters on it. -- {T}, Remove a depletion counter from Hickory Woodlot: Add {G}{G} to your mana pool. If there are no depletion counters on Hickory Woodlot, sacrifice it.
 type=Land
 [/card]
@@ -61358,8 +61352,8 @@ type=Land
 [card]
 name=Karplusan Forest
 auto={T}:Add{1}
-auto={T}:Add{R} && Damage:1 controller
-auto={T}:Add{G} && Damage:1 controller
+auto={T}:Add{R} and!( damage:1 controller )!
+auto={T}:Add{G} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {R} or {G} to your mana pool. Karplusan Forest deals 1 damage to you.
 type=Land
 [/card]
@@ -65116,8 +65110,8 @@ toughness=1
 [card]
 name=Lantern-Lit Graveyard
 auto={T}:Add{1}
-auto={T}:Add{B} && frozen
-auto={T}:Add{R} && frozen
+auto={T}:Add{B} and!( frozen )!
+auto={T}:Add{R} and!( frozen )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {B} or {R} to your mana pool. Lantern-Lit Graveyard doesn't untap during your next untap step.
 type=Land
 [/card]
@@ -67162,11 +67156,11 @@ toughness=1
 [/card]
 [card]
 name=Lion's Eye Diamond
-auto={S}:Add{W}{W}{W} && reject all(*|myhand)
-auto={S}:Add{U}{U}{U} && reject all(*|myhand)
-auto={S}:Add{B}{B}{B} && reject all(*|myhand)
-auto={S}:Add{R}{R}{R} && reject all(*|myhand)
-auto={S}:Add{G}{G}{G} && reject all(*|myhand)
+auto={S}:Add{W}{W}{W} and!( reject all(*|myhand) )!
+auto={S}:Add{U}{U}{U} and!( reject all(*|myhand) )!
+auto={S}:Add{B}{B}{B} and!( reject all(*|myhand) )!
+auto={S}:Add{R}{R}{R} and!( reject all(*|myhand) )!
+auto={S}:Add{G}{G}{G} and!( reject all(*|myhand) )!
 text=Sacrifice Lion's Eye Diamond, Discard your hand: Add three mana of any one color to your mana pool. Activate this ability only any time you could cast an instant.
 mana={0}
 type=Artifact
@@ -67497,8 +67491,8 @@ toughness=1
 [card]
 name=Llanowar Wastes
 auto={T}:Add{1}
-auto={T}:Add{B} && Damage:1 controller
-auto={T}:Add{G} && Damage:1 controller
+auto={T}:Add{B} and!( damage:1 controller )!
+auto={T}:Add{G} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {B} or {G} to your mana pool. Llanowar Wastes deals 1 damage to you.
 type=Land
 [/card]
@@ -74910,8 +74904,8 @@ toughness=3
 [card]
 name=Mogg Hollows
 auto={T}:Add{1}
-auto={T}:Add{R} && frozen
-auto={T}:Add{G} && frozen
+auto={T}:Add{R} and!( frozen )!
+auto={T}:Add{G} and!( frozen )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {R} or {G} to your mana pool. Mogg Hollows doesn't untap during your next untap step.
 type=Land
 [/card]
@@ -76173,7 +76167,7 @@ toughness=1
 [/card]
 [card]
 name=Mossfire Egg
-auto={2}{T}{S}:Add{R}{G} && Draw:1
+auto={2}{T}{S}:Add{R}{G} and!( draw:1 controller )!
 text={2}, {T}, Sacrifice Mossfire Egg: Add {R}{G} to your mana pool. Draw a card.
 mana={1}
 type=Artifact
@@ -76750,10 +76744,9 @@ toughness=4
 [/card]
 [card]
 name=Murmuring Bosk
-auto=tap(noevent)
-auto=aslongas(treefolk|myhand) untap
-auto={T}:Add{W} && damage:1 controller
-auto={T}:Add{B} && damage:1 controller
+auto=if type(treefolk|myhand)~lessthan~1 then tap(noevent)
+auto={T}:Add{W} and!( damage:1 controller )!
+auto={T}:Add{B} and!( damage:1 controller )!
 text=({T}: Add {G} to your mana pool.) -- As Murmuring Bosk enters the battlefield, you may reveal a Treefolk card from your hand. If you don't, Murmuring Bosk enters the battlefield tapped. -- {T}: Add {W} or {B} to your mana pool. Murmuring Bosk deals 1 damage to you.
 type=Land
 subtype=Forest
@@ -80117,7 +80110,7 @@ type=Land
 [/card]
 [card]
 name=Nomad Stadium
-auto={T}:Add{W} && damage:1 controller
+auto={T}:Add{W} and!( damage:1 controller )!
 auto=aslongas(*|mygraveyard) {W}{T}{S}:life:4 >6
 text={T}: Add {W} to your mana pool. Nomad Stadium deals 1 damage to you. -- Threshold - {W}, {T}, Sacrifice Nomad Stadium: You gain 4 life. Activate this ability only if seven or more cards are in your graveyard.
 type=Land
@@ -84497,8 +84490,7 @@ toughness=1
 name=Peat Bog
 auto=tap(noevent)
 auto=counter(0/0,2,Depletion)
-auto=this(counter{0/0,1,Depletion}>1) {T}{C(0/0,-1,Depletion)}:Add{B}{B}
-auto=this(counter{0/0,1,Depletion}=1) {T}{C(0/0,-1,Depletion)}:Add{B}{B} && sacrifice
+auto={T}{C(0/0,-1,Depletion)}:Add{B}{B} and!( this(counter{0/0.1.Depletion}<1) sacrifice oneshot )!
 text=Peat Bog enters the battlefield tapped with two depletion counters on it. -- {T}, Remove a depletion counter from Peat Bog: Add {B}{B} to your mana pool. If there are no depletion counters on Peat Bog, sacrifice it.
 type=Land
 [/card]
@@ -86309,16 +86301,16 @@ toughness=1
 name=Pine Barrens
 auto=tap(noevent)
 auto={T}:Add{1}
-auto={T}:Add{B} && damage:1 controller
-auto={T}:Add{G} && damage:1 controller
+auto={T}:Add{B} and!( damage:1 controller )!
+auto={T}:Add{G} and!( damage:1 controller )!
 text=Pine Barrens enters the battlefield tapped. -- {T}: Add {1} to your mana pool. -- {T}: Add {B} or {G} to your mana pool. Pine Barrens deals 1 damage to you.
 type=Land
 [/card]
 [card]
 name=Pinecrest Ridge
 auto={T}:Add{1}
-auto={T}:Add{R} && frozen
-auto={T}:Add{G} && frozen
+auto={T}:Add{R} and!( frozen )!
+auto={T}:Add{G} and!( frozen )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {R} or {G} to your mana pool. Pinecrest Ridge doesn't untap during your next untap step.
 type=Land
 [/card]
@@ -88365,7 +88357,7 @@ toughness=4
 [/card]
 [card]
 name=Pristine Talisman
-auto={T}:add{1} && life:1
+auto={T}:add{1} and!( life:1 )!
 text={T}: Add {1} to your mana pool.You gain 1 life.
 mana={3}
 type=Artifact
@@ -93186,8 +93178,7 @@ type=Sorcery
 name=Remote Farm
 auto=tap(noevent)
 auto=counter(0/0,2,Depletion)
-auto=this(counter{0/0,1,Depletion}>1) {T}{C(0/0,-1,Depletion)}:Add{W}{W}
-auto=this(counter{0/0,1,Depletion}=1) {T}{C(0/0,-1,Depletion)}:Add{W}{W} && sacrifice
+auto={T}{C(0/0,-1,Depletion)}:Add{W}{W} and!( this(counter{0/0.1.Depletion}<1) sacrifice oneshot )!
 text=Remote Farm enters the battlefield tapped with two depletion counters on it. -- {T}, Remove a depletion counter from Remote Farm: Add {W}{W} to your mana pool. If there are no depletion counters on Remote Farm, sacrifice it.
 type=Land
 [/card]
@@ -96155,8 +96146,8 @@ toughness=2
 [card]
 name=Rootwater Depths
 auto={T}:Add{1}
-auto={T}:Add{U} && frozen
-auto={T}:Add{B} && frozen
+auto={T}:Add{U} and!( frozen )!
+auto={T}:Add{B} and!( frozen )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {U} or {B} to your mana pool. Rootwater Depths doesn't untap during your next untap step.
 type=Land
 [/card]
@@ -97794,8 +97785,8 @@ toughness=3
 name=Salt Flats
 auto=tap(noevent)
 auto={T}:Add{1}
-auto={T}:Add{W} && damage:1 controller
-auto={T}:Add{B} && damage:1 controller
+auto={T}:Add{W} and!( damage:1 controller )!
+auto={T}:Add{B} and!( damage:1 controller )!
 text=Salt Flats enters the battlefield tapped. -- {T}: Add {1} to your mana pool. -- {T}: Add {W} or {B} to your mana pool. Salt Flats deals 1 damage to you.
 type=Land
 [/card]
@@ -98249,8 +98240,7 @@ type=Artifact
 name=Sandstone Needle
 auto=tap(noevent)
 auto=counter(0/0,2,Depletion)
-auto=this(counter{0/0,1,Depletion}>1) {T}{C(0/0,-1,Depletion)}:Add{R}{R}
-auto=this(counter{0/0,1,Depletion}=1) {T}{C(0/0,-1,Depletion)}:Add{R}{R} && sacrifice
+auto={T}{C(0/0,-1,Depletion)}:Add{R}{R} and!( this(counter{0/0.1.Depletion}<1) sacrifice oneshot )!
 text=Sandstone Needle enters the battlefield tapped with two depletion counters on it. -- {T}, Remove a depletion counter from Sandstone Needle: Add {R}{R} to your mana pool. If there are no depletion counters on Sandstone Needle, sacrifice it.
 type=Land
 [/card]
@@ -98524,8 +98514,7 @@ toughness=2
 name=Saprazzan Skerry
 auto=tap(noevent)
 auto=counter(0/0,2,Depletion)
-auto=this(counter{0/0,1,Depletion}>1) {T}{C(0/0,-1,Depletion)}:Add{U}{U}
-auto=this(counter{0/0,1,Depletion}=1) {T}{C(0/0,-1,Depletion)}:Add{U}{U} && sacrifice
+auto={T}{C(0/0,-1,Depletion)}:Add{U}{U} and!( this(counter{0/0.1.Depletion}<1) sacrifice oneshot )!
 text=Saprazzan Skerry enters the battlefield tapped with two depletion counters on it. -- {T}, Remove a depletion counter from Saprazzan Skerry: Add {U}{U} to your mana pool. If there are no depletion counters on Saprazzan Skerry, sacrifice it.
 type=Land
 [/card]
@@ -98999,8 +98988,8 @@ toughness=1
 name=Scabland
 auto=tap(noevent)
 auto={T}:Add{1}
-auto={T}:Add{R} && damage:1 controller
-auto={T}:Add{W} && damage:1 controller
+auto={T}:Add{R} and!( damage:1 controller )!
+auto={T}:Add{W} and!( damage:1 controller )!
 text=Scabland enters the battlefield tapped. -- {T}: Add {1} to your mana pool. -- {T}: Add {R} or {W} to your mana pool. Scabland deals 1 damage to you.
 type=Land
 [/card]
@@ -102580,7 +102569,7 @@ toughness=1
 [/card]
 [card]
 name=Shadowblood Egg
-auto={2}{T}{S}:Add{B}{R} && draw:1
+auto={2}{T}{S}:Add{B}{R} and!( draw:1 controller )!
 text={2}, {T}, Sacrifice Shadowblood Egg: Add {B}{R} to your mana pool. Draw a card.
 mana={1}
 type=Artifact
@@ -103689,8 +103678,8 @@ toughness=1
 [card]
 name=Shivan Reef
 auto={T}:Add{1}
-auto={T}:Add{U} && Damage:1 controller
-auto={T}:Add{R} && Damage:1 controller
+auto={T}:Add{U} and!( damage:1 controller )!
+auto={T}:Add{R} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {U} or {R} to your mana pool. Shivan Reef deals 1 damage to you.
 type=Land
 [/card]
@@ -106427,7 +106416,7 @@ toughness=4
 [/card]
 [card]
 name=Skycloud Egg
-auto={2}{T}{S}:Add{W}{U} && draw:1
+auto={2}{T}{S}:Add{W}{U} and!( draw:1 controller )!
 text={2}, {T}, Sacrifice Skycloud Egg: Add {W}{U} to your mana pool. Draw a card.
 mana={1}
 type=Artifact
@@ -106776,8 +106765,8 @@ toughness=1
 name=Skyshroud Forest
 auto=tap(noevent)
 auto={T}:Add{1}
-auto={T}:Add{U} && damage:1 controller
-auto={T}:Add{G} && damage:1 controller
+auto={T}:Add{U} and!( damage:1 controller )!
+auto={T}:Add{G} and!( damage:1 controller )!
 text=Skyshroud Forest enters the battlefield tapped. -- {T}: Add {1} to your mana pool. -- {T}: Add {U} or {G} to your mana pool. Skyshroud Forest deals 1 damage to you.
 type=Land
 [/card]
@@ -114614,8 +114603,8 @@ type=Instant
 [card]
 name=Sulfurous Springs
 auto={T}:Add{1}
-auto={T}:Add{B} && Damage:1 controller
-auto={T}:Add{R} && Damage:1 controller
+auto={T}:Add{B} and!( damage:1 controller )!
+auto={T}:Add{R} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {B} or {R} to your mana pool. Sulfurous Springs deals 1 damage to you.
 type=Land
 [/card]
@@ -114959,7 +114948,7 @@ toughness=2
 [/card]
 [card]
 name=Sungrass Egg
-auto={2}{T}{S}:Add{G}{W} && draw:1
+auto={2}{T}{S}:Add{G}{W} and!( draw:1 controller )!
 text={2}, {T}, Sacrifice Sungrass Egg: Add {G}{W} to your mana pool. Draw a card.
 mana={1}
 type=Artifact
@@ -116807,8 +116796,8 @@ toughness=2
 [card]
 name=Talisman of Dominance
 auto={T}:Add{1}
-auto={T}:Add{U} && damage:1 controller
-auto={T}:Add{B} && damage:1 controller
+auto={T}:Add{U} and!( damage:1 controller )!
+auto={T}:Add{B} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {U} or {B} to your mana pool. Talisman of Dominance deals 1 damage to you.
 mana={2}
 type=Artifact
@@ -116816,8 +116805,8 @@ type=Artifact
 [card]
 name=Talisman of Impulse
 auto={T}:Add{1}
-auto={T}:Add{R} && damage:1 controller
-auto={T}:Add{G} && damage:1 controller
+auto={T}:Add{R} and!( damage:1 controller )!
+auto={T}:Add{G} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {R} or {G} to your mana pool. Talisman of Impulse deals 1 damage to you.
 mana={2}
 type=Artifact
@@ -116825,8 +116814,8 @@ type=Artifact
 [card]
 name=Talisman of Indulgence
 auto={T}:Add{1}
-auto={T}:Add{B} && damage:1 controller
-auto={T}:Add{R} && damage:1 controller
+auto={T}:Add{B} and!( damage:1 controller )!
+auto={T}:Add{R} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {B} or {R} to your mana pool. Talisman of Indulgence deals 1 damage to you.
 mana={2}
 type=Artifact
@@ -116834,8 +116823,8 @@ type=Artifact
 [card]
 name=Talisman of Progress
 auto={T}:Add{1}
-auto={T}:Add{W} && damage:1 controller
-auto={T}:Add{U} && damage:1 controller
+auto={T}:Add{W} and!( damage:1 controller )!
+auto={T}:Add{U} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {W} or {U} to your mana pool. Talisman of Progress deals 1 damage to you.
 mana={2}
 type=Artifact
@@ -116843,8 +116832,8 @@ type=Artifact
 [card]
 name=Talisman of Unity
 auto={T}:Add{1}
-auto={T}:Add{G} && damage:1 controller
-auto={T}:Add{W} && damage:1 controller
+auto={T}:Add{G} and!( damage:1 controller )!
+auto={T}:Add{W} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {G} or {W} to your mana pool. Talisman of Unity deals 1 damage to you.
 mana={2}
 type=Artifact
@@ -117227,11 +117216,11 @@ toughness=1+*
 [card]
 name=Tarnished Citadel
 auto={T}:Add{1}
-auto={T}:Add{B} && Damage:3 controller
-auto={T}:Add{G} && Damage:3 controller
-auto={T}:Add{R} && Damage:3 controller
-auto={T}:Add{U} && Damage:3 controller
-auto={T}:Add{W} && Damage:3 controller
+auto={T}:Add{B} and!( damage:3 controller )!
+auto={T}:Add{G} and!( damage:3 controller )!
+auto={T}:Add{R} and!( damage:3 controller )!
+auto={T}:Add{U} and!( damage:3 controller )!
+auto={T}:Add{W} and!( damage:3 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add one mana of any color to your mana pool. Tarnished Citadel deals 3 damage to you.
 type=Land
 [/card]
@@ -118793,8 +118782,8 @@ toughness=3
 [card]
 name=Thalakos Lowlands
 auto={T}:Add{1}
-auto={T}:Add{W} && frozen
-auto={T}:Add{U} && frozen
+auto={T}:Add{W} and!( frozen )!
+auto={T}:Add{U} and!( frozen )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {W} or {U} to your mana pool. Thalakos Lowlands doesn't untap during your next untap step.
 type=Land
 [/card]
@@ -119360,6 +119349,7 @@ toughness=4
 [/card]
 [card]
 name=Think Tank
+aicode=activate may moveto(ownergraveyard) all(*[zpos=1]|mylibrary)
 auto=@each my upkeep:name(Look) reveal:1 optionone name(Put On Top) target(*|reveal) moveto(mylibrary) optiononeend optiontwo name(put in graveyard) target(<1>*|reveal) moveto(mygraveyard) optiontwoend revealend
 text=At the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard.
 mana={2}{U}
@@ -119825,6 +119815,7 @@ type=Enchantment
 [/card]
 [card]
 name=Thoughtpicker Witch
+aicode=activate transforms((,newability[choice all(*[zpos=2]|targetedpersonslibrary) moveto(exile)],newability[choice all(*[zpos=1]|targetedpersonslibrary) moveto(exile)])) ueot
 auto={1}{s(creature|mybattlefield}:target(opponent) reveal:2 optionone name(Put in exile) target(*|reveal) moveto(ownerexile) optiononeend optiontwo name(put back) all(*|reveal) moveto(ownerlibrary) optiontwoend revealend
 text={1}, Sacrifice a creature: Look at the top two cards of target opponent's library, then exile one of them.
 mana={B}
@@ -121559,8 +121550,8 @@ type=Land
 [/card]
 [card]
 name=Tomb of Urami
-auto={T}:add{B} && aslongas(ogre|myBattlefield) damage:1 controller <1
-auto={2}{B}{B}{T}:moveTo(mygraveyard) all(land|myBattlefield) && token(Urami,Legendary Creature Demon Spirit, 5/5,flying,black)
+auto={T}:add{B} and!( if type(ogre|myBattlefield)~lessthan~1 then damage:1 controller )!
+auto={2}{B}{B}{T}{saclands}:token(Urami,Legendary Creature Demon Spirit, 5/5,flying,black)
 text={T}: Add {B} to your mana pool. Tomb of Urami deals 1 damage to you if you don't control an Ogre. -- {2}{B}{B}, {T}, Sacrifice all lands you control: Put a legendary 5/5 black Demon Spirit creature token with flying named Urami onto the battlefield.
 type=Legendary Land
 [/card]
@@ -122603,8 +122594,8 @@ type=Land
 [card]
 name=Tranquil Garden
 auto={T}:Add{1}
-auto={T}:Add{G} && frozen
-auto={T}:Add{W} && frozen
+auto={T}:Add{G} and!( frozen )!
+auto={T}:Add{W} and!( frozen )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {G} or {W} to your mana pool. Tranquil Garden doesn't untap during your next untap step.
 type=Land
 [/card]
@@ -125028,8 +125019,8 @@ toughness=2
 [card]
 name=Underground River
 auto={T}:Add{1}
-auto={T}:Add{U} && Damage:1 controller
-auto={T}:Add{B} && Damage:1 controller
+auto={T}:Add{U} and!( damage:1 controller )!
+auto={T}:Add{B} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {U} or {B} to your mana pool. Underground River deals 1 damage to you.
 type=Land
 [/card]
@@ -125132,11 +125123,11 @@ type=Enchantment
 [/card]
 [card]
 name=Undiscovered Paradise
-auto={T}:Add{G} && phaseaction[myupkeep sourceinplay] moveTo(ownerhand)
-auto={T}:Add{W} && phaseaction[myupkeep sourceinplay] moveTo(ownerhand)
-auto={T}:Add{U} && phaseaction[myupkeep sourceinplay] moveTo(ownerhand)
-auto={T}:Add{B} && phaseaction[myupkeep sourceinplay] moveTo(ownerhand)
-auto={T}:Add{R} && phaseaction[myupkeep sourceinplay] moveTo(ownerhand)
+auto={T}:Add{G} and!( phaseaction[my untap sourceinplay] moveTo(ownerhand) )!
+auto={T}:Add{W} and!( phaseaction[my untap sourceinplay] moveTo(ownerhand) )!
+auto={T}:Add{U} and!( phaseaction[my untap sourceinplay] moveTo(ownerhand) )!
+auto={T}:Add{B} and!( phaseaction[my untap sourceinplay] moveTo(ownerhand) )!
+auto={T}:Add{R} and!( phaseaction[my untap sourceinplay] moveTo(ownerhand) )!
 text={T}: Add one mana of any color to your mana pool. During your next untap step, as you untap your permanents, return Undiscovered Paradise to its owner's hand.
 type=Land
 [/card]
@@ -126801,8 +126792,8 @@ toughness=0
 [card]
 name=Vec Townships
 auto={T}:Add{1}
-auto={T}:Add{G} && frozen
-auto={T}:Add{W} && frozen
+auto={T}:Add{G} and!( frozen )!
+auto={T}:Add{W} and!( frozen )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {G} or {W} to your mana pool. Vec Townships doesn't untap during your next untap step.
 type=Land
 [/card]
@@ -131685,8 +131676,8 @@ toughness=3
 [card]
 name=Waterveil Cavern
 auto={T}:Add{1}
-auto={T}:Add{U} && frozen
-auto={T}:Add{B} && frozen
+auto={T}:Add{U} and!( frozen )!
+auto={T}:Add{B} and!( frozen )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {U} or {B} to your mana pool. Waterveil Cavern doesn't untap during your next untap step.
 type=Land
 [/card]
@@ -134047,7 +134038,7 @@ type=Sorcery
 [card]
 name=Witch Engine
 abilities=swampwalk
-auto={T}:Add{B}{B}{B}{B} && moveTo(opponentBattlefield)
+auto={T}:Add{B}{B}{B}{B} and!( moveTo(opponentBattlefield) )!
 text=Swampwalk -- {T}: Add {B}{B}{B}{B} to your mana pool. Target opponent gains control of Witch Engine. (Activate this ability only any time you could cast an instant.)
 mana={5}{B}
 type=Creature
@@ -135557,8 +135548,8 @@ toughness=2
 [card]
 name=Yavimaya Coast
 auto={T}:Add{1}
-auto={T}:Add{G} && Damage:1 controller
-auto={T}:Add{U} && Damage:1 controller
+auto={T}:Add{G} and!( damage:1 controller )!
+auto={T}:Add{U} and!( damage:1 controller )!
 text={T}: Add {1} to your mana pool. -- {T}: Add {G} or {U} to your mana pool. Yavimaya Coast deals 1 damage to you.
 type=Land
 [/card]