diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index ec85aa0bd..7b04dee8c 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1996,7 +1996,7 @@ toughness=1
 [card]
 name=Angelic Favor
 restriction=during battle
-otherrestriction=mytypemin:1 type(plains)
+otherrestriction=type(plains|mybattlefield)~morethan~0
 other={T(creature|mybattlefield)} name(Tap an Untapped Creature)
 auto=token(Angel,Creature Angel,4/4,flying,unearth,white)
 text=If you control a Plains, you may tap an untapped creature you control rather than pay Angelic Favor's mana cost. -- Cast Angelic Favor only during combat. -- Put a 4/4 white Angel creature token with flying onto the battlefield. Exile it at the beginning of the next end step.
@@ -2469,6 +2469,8 @@ name=Arbor Elf
 auto={t}:untap target(forest)
 text={T}: Untap target Forest.
 mana={G}
+other={0}
+otherrestriction=type(land|mybattlefield)~equalto~1,type(land|opponentbattlefield)~equalto~1
 type=Creature
 subtype=Elf Druid
 power=1
@@ -3824,7 +3826,7 @@ toughness=2
 name=Avatar of Fury
 abilities=flying
 auto={R}:1/0
-otherrestriction=opponenttypemin:7 opponenttype(land)
+otherrestriction=type(land|opponentbattlefield)~morethan~7
 other={R}{R}
 text=If an opponent controls seven or more lands, Avatar of Fury costs {6} less to cast. -- Flying -- {R}: Avatar of Fury gets +1/+0 until end of turn.
 mana={6}{R}{R}
@@ -3836,7 +3838,7 @@ toughness=6
 [card]
 name=Avatar of Might
 abilities=trample
-otherrestriction=opponenttypemin:4 opponenttype(creature)
+otherrestriction=type(creature|opponentbattlefield)~morethan~type(creature|mybattlefield)
 other={G}{G}
 text=If an opponent controls at least four more creatures than you, Avatar of Might costs {6} less to cast. -- Trample (If this creature would deal enough damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player or planeswalker.)
 mana={6}{G}{G}
@@ -10925,7 +10927,7 @@ toughness=4
 name=Cho-Arrim Legate
 abilities=protection from black
 other={0} name(Cast without Paying its Mana Cost)
-otherrestriction=mytypemin:1 type(swamp) , opponenttypemin:1 opponenttype(plains)
+otherrestriction=type(plains|mybattlefield)~morethan~0,type(swamp|opponentbattlefield)~morethan~0
 text=Protection from black -- If an opponent controls a Swamp and you control a Plains, you may cast Cho-Arrim Legate without paying its mana cost.
 mana={2}{W}
 type=Creature
@@ -14285,7 +14287,7 @@ type=Enchantment
 [card]
 name=Dark Triumph
 auto=lord(creature|mybattlefield) 2/0 ueot
-otherrestriction=mytypemin:1 type(swamp)
+otherrestriction=type(swamp|mybattlefield)~morethan~0
 other={S(creature|mybattlefield)} name(Sacrifice a Creature)
 text=If you control a Swamp, you may sacrifice a creature rather than pay Dark Triumph's mana cost. -- Creatures you control get +2/+0 until end of turn.
 mana={4}{B}
@@ -15464,7 +15466,7 @@ toughness=1
 name=Deepwood Legate
 auto={B}:1/1
 other={0} name(Cast without Paying its Mana Cost)
-otherrestriction=mytypemin:1 type(swamp) , opponenttypemin:1 opponenttype(forest)
+otherrestriction=type(swamp|mybattlefield)~morethan~0,type(forest|opponentbattlefield)~morethan~0
 text=If an opponent controls a Forest and you control a Swamp, you may cast Deepwood Legate without paying its mana cost. -- {B}: Deepwood Legate gets +1/+1 until end of turn.
 mana={3}{B}
 type=Creature
@@ -32366,7 +32368,7 @@ name=Invigorate
 target=creature
 auto=4/4
 auto=alternative life:3 opponent
-otherrestriction=mytypemin:1 type(forest)
+otherrestriction=type(forest|mybattlefield)~morethan~0
 other={0} name(Have Opponent Gain 3 Life)
 text=If you control a Forest, you may have an opponent gain 3 life rather than pay Invigorate's mana cost. -- Target creature gets +4/+4 until end of turn.
 mana={2}{G}
@@ -35416,7 +35418,7 @@ name=Knight of the White Orchid
 abilities=first strike
 auto=alternative moveTo(mybattlefield) notatarget(plains|mylibrary)
 other={W}{W}
-otherrestriction=mytypemin:less type(land) , opponenttypemin:* opponenttype(land)
+otherrestriction=type(land|mybattlefield)~lessthan~type(land|opponentbattlefield)
 text=First strike -- When Knight of the White Orchid enters the battlefield, if an opponent controls more lands than you, you may search your library for a Plains card, put it onto the battlefield, then shuffle your library.
 mana={W}{W}
 type=Creature
@@ -36203,7 +36205,7 @@ toughness=1
 name=Kyren Legate
 abilities=haste
 other={0} name(Cast Without Paying its Manacost)
-otherrestriction=mytypemin:1 type(mountain) , opponenttypemin:1 opponenttype(plains)
+otherrestriction=type(mountain|mybattlefield)~morethan~0,type(plains|opponentbattlefield)~morethan~0
 text=Haste -- If an opponent controls a Plains and you control a Mountain, you may cast Kyren Legate without paying its mana cost.
 mana={1}{R}
 type=Creature
@@ -36457,7 +36459,7 @@ type=Instant
 name=Lashknife
 target=creature
 auto=first strike
-otherrestriction=mytypemin:1 type(plains)
+otherrestriction=type(plains|mybattlefield)~morethan~0
 other={T(creature|mybattlefield)} name(Tap an Untapped Creature)
 text=If you control a Plains, you may tap an untapped creature you control rather than pay Lashknife's mana cost. -- Enchant creature -- Enchanted creature has first strike.
 mana={1}{W}
@@ -39916,7 +39918,7 @@ toughness=3
 name=Massacre
 auto=lord(creature) -2/-2 ueot
 other={0} name(Cast without Paying its Mana Cost)
-otherrestriction=mytypemin:1 type(plains) , opponenttypemin:1 opponenttype(swamp)
+otherrestriction=type(plains|opponentbattlefield)~morethan~0,type(swamp|mybattlefield)~morethan~0
 text=If an opponent controls a Plains and you control a Swamp, you may cast Massacre without paying its mana cost. -- All creatures get -2/-2 until end of turn.
 mana={2}{B}{B}
 type=Sorcery
@@ -41646,7 +41648,7 @@ name=Mogg Salvage
 target=artifact
 auto=destroy
 other={0} name(Cast without Paying its Mana Cost)
-otherrestriction=mytypemin:1 type(island) , opponenttypemin:1 opponenttype(mountain)
+otherrestriction=type(island|opponentbattlefield)~morethan~0,type(mountain|mybattlefield)~morethan~0
 text=If an opponent controls an Island and you control a Mountain, you may cast Mogg Salvage without paying its mana cost. -- Destroy target artifact.
 mana={2}{R}
 type=Instant
@@ -45910,7 +45912,7 @@ type=Instant
 name=Orim's Cure
 target=creature,player
 auto=prevent:4
-otherrestriction=mytypemin:1 type(plains)
+otherrestriction=type(plains|mybattlefield)~morethan~0
 other={T(creature|mybattlefield)} name(Tap an Untapped Creature)
 text=If you control a Plains, you may tap an untapped creature you control rather than pay the mana cost of Orim's Cure. -- Prevent the next 4 damage that would be dealt to target creature or player this turn.
 mana={1}{W}
@@ -50895,7 +50897,7 @@ toughness=2
 [card]
 name=Ramosian Rally
 auto=lord(creature|mybattlefield) 1/1 ueot
-otherrestriction=mytypemin:1 type(plains)
+otherrestriction=type(plains|mybattlefield)~morethan~0
 other={T(creature[-tapped]|mybattlefield)} name(Tap an Untapped Creature)
 text=If you control a Plains, you may tap an untapped creature you control rather than pay Ramosian Rally's mana cost. -- Creatures you control get +1/+1 until end of turn.
 mana={3}{W}
@@ -51880,7 +51882,7 @@ name=Refreshing Rain
 target=player
 auto=life:6
 other={0} name(Cast without Paying its Mana Cost)
-otherrestriction=mytypemin:1 type(forest) , opponenttypemin:1 opponenttype(swamp)
+otherrestriction=type(forest|mybattlefield)~morethan~0,type(swamp|oppponentbattlefield)~morethan~0
 text=If an opponent controls a Swamp and you control a Forest, you may cast Refreshing Rain without paying its mana cost. -- Target player gains 6 life.
 mana={3}{G}
 type=Instant
@@ -52651,7 +52653,7 @@ type=Instant
 name=Reverent Silence
 auto=destroy all(enchantment)
 auto=alternative life:6 opponent
-otherrestriction=mytypemin:1 type(forest)
+otherrestriction=type(forest|mybattlefield)~morethan~0
 other={0} name(Cast without Paying its Mana Cost)
 text=If you control a Forest, you may have each other player gain 6 life rather than pay Reverent Silence's mana cost. -- Destroy all enchantments.
 mana={3}{G}
@@ -53862,7 +53864,7 @@ toughness=4
 name=Rouse
 target=creature
 auto=2/0
-otherrestriction=mytypemin:1 type(swamp)
+otherrestriction=type(swamp|mybattlefield)~morethan~0
 other={L}{L} name(Pay 2 Life)
 text=If you control a Swamp, you may pay 2 life rather than pay Rouse's mana cost. -- Target creature gets +2/+0 until end of turn.
 mana={1}{B}
@@ -54159,7 +54161,7 @@ toughness=2
 [card]
 name=Rushwood Legate
 other={0} name(Cast without Paying its Mana Cost)
-otherrestriction=mytypemin:1 type(forest) , opponenttypemin:1 opponenttype(island)
+otherrestriction=type(forest|mybattlefield)~morethan~0,type(island|mybattlefield)~morethan~0
 text=If an opponent controls an Island and you control a Forest, you may cast Rushwood Legate without paying its mana cost.
 mana={2}{G}
 type=Creature
@@ -54961,7 +54963,7 @@ toughness=1
 name=Saprazzan Legate
 abilities=flying
 other={0} name(Cast Without Paying its Mana Cost)
-otherrestriction=mytypemin:1 type(island) , opponenttypemin:1 opponenttype(mountain)
+otherrestriction=type(island|mybattlefield)~morethan~0,type(mountain|opponentbattlefield)~morethan~0
 text=Flying -- If an opponent controls a Mountain and you control an Island, you may cast Saprazzan Legate without paying its mana cost.
 mana={3}{U}
 type=Creature
@@ -58917,7 +58919,7 @@ toughness=4
 name=Sivvi's Ruse
 auto=preventalldamage to(creature|mybattlefield) ueot
 other={0} name(Cast without Paying its Mana Cost)
-otherrestriction=mytypemin:1 type(plains) , opponenttypemin:1 opponenttype(mountain)
+otherrestriction=type(plains|mybattlefield)~morethan~0,type(moutain|opponentbattlefield)~morethan~0
 text=If an opponent controls a Mountain and you control a Plains, you may cast Sivvi's Ruse without paying its mana cost. -- Prevent all damage that would be dealt this turn to creatures you control.
 mana={2}{W}{W}
 type=Instant
@@ -59639,7 +59641,7 @@ toughness=2
 [card]
 name=Skyshroud Cutter
 auto=alternative life:5 opponent
-otherrestriction=mytypemin:1 type(forest)
+otherrestriction=type(forest|mybattlefield)~morethan~0
 other={0} name(Have Opponent gain 5 Life)
 text=If you control a Forest, you may have each other player gain 5 life rather than pay Skyshroud Cutter's mana cost.
 mana={3}{G}
@@ -60491,7 +60493,7 @@ subtype=Swamp
 name=Snuff Out
 target=creature[-black]
 auto=bury
-otherrestriction=mytypemin:1 type(swamp)
+otherrestriction=type(swamp|mybattlefield)~morethan~0
 other={L}{L}{L}{L} name(Pay 4 Life)
 text=If you control a Swamp, you may pay 4 life rather than pay Snuff Out's mana cost. -- Destroy target nonblack creature. It can't be regenerated.
 mana={3}{B}
@@ -64129,7 +64131,7 @@ name=Submerge
 target=creature
 auto=moveTo(ownerlibrary)
 other={0} name(Cast without Paying its Mana Cost)
-otherrestriction=mytypemin:1 type(island) , opponenttypemin:1 opponenttype(forest)
+otherrestriction=type(island|mybattlefield)~morethan~0,type(forest|opponentbattlefield)~morethan~0
 text=If an opponent controls a Forest and you control an Island, you may cast Submerge without paying its mana cost. -- Put target creature on top of its owner's library.
 mana={4}{U}
 type=Instant
@@ -68191,7 +68193,7 @@ target=plains|mylibrary
 auto=moveTo(myhand)
 auto=alternative moveTo(myhand) notatarget(plains|mylibrary)
 other={W}
-otherrestriction=mytypemin:less type(land) , opponenttypemin:* opponenttype(land)
+otherrestriction=type(land|mybattlefield)~lessthan~type(land|opponentbattlefield)
 text=Search your library for a Plains card. If you control fewer lands than an opponent, you may search your library for an additional Plains card. Reveal those cards and put them into your hand. Then shuffle your library.
 mana={W}
 type=Instant