From 67666e850df53ba9f660a04b6ae3a9dc9fb1d310 Mon Sep 17 00:00:00 2001
From: Eduardo MG <punkeduard@gmail.com>
Date: Wed, 7 Aug 2024 23:41:50 -0600
Subject: [PATCH] Changes to _cards.dat to account for layouts

I had to modify how the _cards.dat files are created to incorporate variant layouts of adventures, aftermath, and split cards. They are now showing in the collection, but you will need to download the images again.
Rootless Yew
Repel Intruders
Resplendent Angel
Karn, Scion of Urza
---
 projects/mtg/bin/Res/sets/CLU/_cards.dat      |  35 +-
 projects/mtg/bin/Res/sets/LCC/_cards.dat      |  49 +-
 projects/mtg/bin/Res/sets/LCI/_cards.dat      | 122 ++---
 projects/mtg/bin/Res/sets/M3C/_cards.dat      |  14 +-
 projects/mtg/bin/Res/sets/MH3/_cards.dat      |  67 +--
 projects/mtg/bin/Res/sets/MKC/_cards.dat      |  31 +-
 projects/mtg/bin/Res/sets/MKM/_cards.dat      |  51 +-
 projects/mtg/bin/Res/sets/OTC/_cards.dat      |   9 +-
 projects/mtg/bin/Res/sets/OTP/_cards.dat      |  14 +-
 projects/mtg/bin/Res/sets/RVR/_cards.dat      |  72 +--
 projects/mtg/bin/Res/sets/SPG/_cards.dat      |  59 +-
 projects/mtg/bin/Res/sets/WOE/_cards.dat      | 504 +++---------------
 .../bin/Res/sets/primitives/borderline.txt    |  26 +-
 projects/mtg/bin/Res/sets/primitives/mtg.txt  |   4 +-
 .../bin/Res/sets/primitives/planeswalkers.txt |   2 +-
 15 files changed, 295 insertions(+), 764 deletions(-)

diff --git a/projects/mtg/bin/Res/sets/CLU/_cards.dat b/projects/mtg/bin/Res/sets/CLU/_cards.dat
index c1b588565..f15ff7f02 100644
--- a/projects/mtg/bin/Res/sets/CLU/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CLU/_cards.dat
@@ -925,31 +925,21 @@ id=651919
 rarity=M
 [/card]
 [card]
-primitive=Depose
+primitive=Depose // Deploy
 id=651920
 rarity=U
 [/card]
 [card]
-primitive=Deploy
-id=651920
-rarity=T
-[/card]
-[card]
 primitive=Dimir Guildmage
 id=651921
 rarity=U
 [/card]
 [card]
-primitive=Discovery
+primitive=Discovery // Dispersal
 id=651922
 rarity=U
 [/card]
 [card]
-primitive=Dispersal
-id=651922
-rarity=T
-[/card]
-[card]
 primitive=Duskmantle Seer
 id=651923
 rarity=M
@@ -995,26 +985,16 @@ id=651931
 rarity=R
 [/card]
 [card]
-primitive=Incubation
+primitive=Incubation // Incongruity
 id=651932
 rarity=U
 [/card]
 [card]
-primitive=Incongruity
-id=651932
-rarity=T
-[/card]
-[card]
-primitive=Integrity
+primitive=Integrity // Intervention
 id=651933
 rarity=U
 [/card]
 [card]
-primitive=Intervention
-id=651933
-rarity=T
-[/card]
-[card]
 primitive=Lavinia of the Tenth
 id=651934
 rarity=R
@@ -1070,16 +1050,11 @@ id=651944
 rarity=C
 [/card]
 [card]
-primitive=Status
+primitive=Status // Statue
 id=651945
 rarity=U
 [/card]
 [card]
-primitive=Statue
-id=651945
-rarity=T
-[/card]
-[card]
 primitive=Supreme Verdict
 id=651946
 rarity=R
diff --git a/projects/mtg/bin/Res/sets/LCC/_cards.dat b/projects/mtg/bin/Res/sets/LCC/_cards.dat
index 9cfac7951..16da0858d 100644
--- a/projects/mtg/bin/Res/sets/LCC/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LCC/_cards.dat
@@ -50,6 +50,16 @@ id=642472
 rarity=R
 [/card]
 [card]
+primitive=Altar of the Wretched
+id=642473
+rarity=R
+[/card]
+[card]
+primitive=Wretched Bonemass
+id=642473
+rarity=R
+[/card]
+[card]
 primitive=Ore-Rich Stalactite
 id=642475
 rarity=R
@@ -57,7 +67,7 @@ rarity=R
 [card]
 primitive=Cosmium Catalyst
 id=642476
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Contest of Claws
@@ -72,7 +82,7 @@ rarity=R
 [card]
 primitive=The Golden-Gear Colossus
 id=642479
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Xavier Sal, Infested Captain
@@ -87,7 +97,7 @@ rarity=M
 [card]
 primitive=Apex Observatory
 id=642482
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Paleontologist's Pick-Axe
@@ -97,7 +107,7 @@ rarity=M
 [card]
 primitive=Dinosaur Headdress
 id=642484
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Admiral Brass, Unsinkable
@@ -132,7 +142,7 @@ rarity=R
 [card]
 primitive=Wretched Bonemass
 id=642337
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Ore-Rich Stalactite
@@ -142,7 +152,7 @@ rarity=R
 [card]
 primitive=Cosmium Catalyst
 id=642339
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Contest of Claws
@@ -187,7 +197,7 @@ rarity=R
 [card]
 primitive=The Golden-Gear Colossus
 id=642348
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Wayta, Trainer Prodigy
@@ -212,7 +222,7 @@ rarity=M
 [card]
 primitive=Apex Observatory
 id=642353
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Paleontologist's Pick-Axe
@@ -222,7 +232,7 @@ rarity=M
 [card]
 primitive=Dinosaur Headdress
 id=642355
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Bronzebeak Foragers
@@ -300,16 +310,11 @@ id=640275
 rarity=R
 [/card]
 [card]
-primitive=Promise of Aclazotz
+primitive=Promise of Aclazotz // Foul Rebirth
 id=640276
 rarity=R
 [/card]
 [card]
-primitive=Foul Rebirth
-id=640276
-rarity=T
-[/card]
-[card]
 primitive=Skeleton Crew
 id=640277
 rarity=R
@@ -465,16 +470,11 @@ id=640043
 rarity=R
 [/card]
 [card]
-primitive=Promise of Aclazotz
+primitive=Promise of Aclazotz // Foul Rebirth
 id=640044
 rarity=R
 [/card]
 [card]
-primitive=Foul Rebirth
-id=640044
-rarity=T
-[/card]
-[card]
 primitive=Skeleton Crew
 id=640045
 rarity=R
@@ -765,16 +765,11 @@ id=640442
 rarity=R
 [/card]
 [card]
-primitive=Commit
+primitive=Commit // Memory
 id=640443
 rarity=R
 [/card]
 [card]
-primitive=Memory
-id=640443
-rarity=T
-[/card]
-[card]
 primitive=Coralhelm Commander
 id=640444
 rarity=R
diff --git a/projects/mtg/bin/Res/sets/LCI/_cards.dat b/projects/mtg/bin/Res/sets/LCI/_cards.dat
index cfac6cdbd..83a1a9776 100644
--- a/projects/mtg/bin/Res/sets/LCI/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LCI/_cards.dat
@@ -37,7 +37,7 @@ rarity=U
 [card]
 primitive=Cosmium Kiln
 id=636697
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Cosmium Blast
@@ -142,7 +142,7 @@ rarity=M
 [card]
 primitive=Temple of Civilization
 id=636718
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Oltec Archaeologists
@@ -162,7 +162,7 @@ rarity=C
 [card]
 primitive=Oteclan Levitator
 id=636722
-rarity=T
+rarity=C
 [/card]
 [card]
 primitive=Petrify
@@ -202,7 +202,7 @@ rarity=U
 [card]
 primitive=Bladewheel Chariot
 id=636730
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Thousand Moons Crackshot
@@ -222,7 +222,7 @@ rarity=R
 [card]
 primitive=Barracks of the Thousand
 id=636734
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Tinker's Tote
@@ -237,7 +237,7 @@ rarity=R
 [card]
 primitive=Sandswirl Wanderglyph
 id=636737
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Vanguard of the Rose
@@ -272,7 +272,7 @@ rarity=R
 [card]
 primitive=Braided Quipu
 id=636744
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Chart a Course
@@ -317,7 +317,7 @@ rarity=M
 [card]
 primitive=Locus of Enlightenment
 id=636753
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=The Everflowing Well
@@ -327,7 +327,7 @@ rarity=R
 [card]
 primitive=The Myriad Pools
 id=636755
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Frilled Cave-Wurm
@@ -352,7 +352,7 @@ rarity=C
 [card]
 primitive=Iceberg Titan
 id=636760
-rarity=T
+rarity=C
 [/card]
 [card]
 primitive=Kitesail Larcenist
@@ -367,7 +367,7 @@ rarity=U
 [card]
 primitive=Guidestone Compass
 id=636763
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Malcolm, Alluring Scoundrel
@@ -397,7 +397,7 @@ rarity=M
 [card]
 primitive=Temple of Cyclical Time
 id=636769
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Orazca Puzzle-Door
@@ -482,7 +482,7 @@ rarity=U
 [card]
 primitive=Watertight Gondola
 id=636786
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Waterwind Scout
@@ -512,7 +512,7 @@ rarity=M
 [card]
 primitive=Temple of the Dead
 id=636792
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Acolyte of Aclazotz
@@ -617,7 +617,7 @@ rarity=U
 [card]
 primitive=Shadows' Lair
 id=636813
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Greedy Freebooter
@@ -712,7 +712,7 @@ rarity=R
 [card]
 primitive=The Tomb of Aclazotz
 id=636832
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Terror Tide
@@ -727,7 +727,7 @@ rarity=C
 [card]
 primitive=Consuming Sepulcher
 id=636835
-rarity=T
+rarity=C
 [/card]
 [card]
 primitive=Visage of Dread
@@ -737,7 +737,7 @@ rarity=U
 [card]
 primitive=Dread Osseosaur
 id=636837
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Vito's Inquisitor
@@ -772,7 +772,7 @@ rarity=R
 [card]
 primitive=Tecutlan, the Searing Rift
 id=636844
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Brazen Blademaster
@@ -827,7 +827,7 @@ rarity=R
 [card]
 primitive=Dire Blunderbuss
 id=636855
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Dowsing Device
@@ -837,7 +837,7 @@ rarity=U
 [card]
 primitive=Geode Grotto
 id=636857
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Dreadmaw's Ire
@@ -887,7 +887,7 @@ rarity=C
 [card]
 primitive=Sovereign's Macuahuitl
 id=636867
-rarity=T
+rarity=C
 [/card]
 [card]
 primitive=Inti, Seneschal of the Sun
@@ -907,7 +907,7 @@ rarity=M
 [card]
 primitive=Temple of Power
 id=636871
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Panicked Altisaur
@@ -942,7 +942,7 @@ rarity=U
 [card]
 primitive=Mastercraft Raptor
 id=636878
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Scytheclaw Raptor
@@ -1067,7 +1067,7 @@ rarity=R
 [card]
 primitive=Itlimoc, Cradle of the Sun
 id=636903
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Huatli, Poet of Unity
@@ -1077,7 +1077,7 @@ rarity=M
 [card]
 primitive=Roar of the Fifth People
 id=636905
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Huatli's Final Strike
@@ -1112,7 +1112,7 @@ rarity=U
 [card]
 primitive=Jadeheart Attendant
 id=636912
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Jadelight Spelunker
@@ -1127,7 +1127,7 @@ rarity=C
 [card]
 primitive=Kaslem's Strider
 id=636915
-rarity=T
+rarity=C
 [/card]
 [card]
 primitive=Malamet Battle Glyph
@@ -1167,7 +1167,7 @@ rarity=M
 [card]
 primitive=Temple of Cultivation
 id=636923
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Over the Edge
@@ -1237,7 +1237,7 @@ rarity=U
 [card]
 primitive=Mycoid Maze
 id=636937
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Walk with the Ancestors
@@ -1305,16 +1305,11 @@ id=636950
 rarity=U
 [/card]
 [card]
-primitive=Kellan, Daring Traveler
+primitive=Kellan, Daring Traveler // Journey On
 id=636951
 rarity=R
 [/card]
 [card]
-primitive=Journey On
-id=636951
-rarity=T
-[/card]
-[card]
 primitive=Kutzil, Malamet Exemplar
 id=636952
 rarity=U
@@ -1327,7 +1322,7 @@ rarity=U
 [card]
 primitive=Master's Manufactory
 id=636954
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Molten Collapse
@@ -1447,7 +1442,7 @@ rarity=R
 [card]
 primitive=The Core
 id=636978
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=The Millennium Calendar
@@ -1482,7 +1477,7 @@ rarity=U
 [card]
 primitive=Sunbird Effigy
 id=636985
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Swashbuckler's Whip
@@ -1507,7 +1502,7 @@ rarity=R
 [card]
 primitive=The Grim Captain
 id=636990
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Treasure Map
@@ -1517,7 +1512,7 @@ rarity=R
 [card]
 primitive=Treasure Cove
 id=636992
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Captivating Cave
@@ -1667,7 +1662,7 @@ rarity=M
 [card]
 primitive=Roar of the Fifth People
 id=636504
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Abuelo, Ancestral Echo
@@ -1757,7 +1752,7 @@ rarity=R
 [card]
 primitive=The Grim Captain
 id=636522
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Ojer Taq, Deepest Foundation
@@ -1767,7 +1762,7 @@ rarity=M
 [card]
 primitive=Temple of Civilization
 id=639431
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Ojer Pakpatiq, Deepest Epoch
@@ -1777,7 +1772,7 @@ rarity=M
 [card]
 primitive=Temple of Cyclical Time
 id=639433
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Aclazotz, Deepest Betrayal
@@ -1787,7 +1782,7 @@ rarity=M
 [card]
 primitive=Temple of the Dead
 id=639435
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Ojer Axonil, Deepest Might
@@ -1797,7 +1792,7 @@ rarity=M
 [card]
 primitive=Temple of Power
 id=639437
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Ojer Kaslem, Deepest Growth
@@ -1807,7 +1802,7 @@ rarity=M
 [card]
 primitive=Temple of Cultivation
 id=639439
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=The Ancient One
@@ -1917,7 +1912,7 @@ rarity=M
 [card]
 primitive=Roar of the Fifth People
 id=639266
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=The Skullspore Nexus
@@ -1925,16 +1920,11 @@ id=639267
 rarity=M
 [/card]
 [card]
-primitive=Kellan, Daring Traveler
+primitive=Kellan, Daring Traveler // Journey On
 id=639268
 rarity=R
 [/card]
 [card]
-primitive=Journey On
-id=639268
-rarity=T
-[/card]
-[card]
 primitive=Molten Collapse
 id=639269
 rarity=R
@@ -2017,7 +2007,7 @@ rarity=R
 [card]
 primitive=Barracks of the Thousand
 id=639755
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Unstable Glyphbridge
@@ -2027,7 +2017,7 @@ rarity=R
 [card]
 primitive=Sandswirl Wanderglyph
 id=639757
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Warden of the Inner Sky
@@ -2042,7 +2032,7 @@ rarity=R
 [card]
 primitive=Braided Quipu
 id=639760
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Deeproot Pilgrimage
@@ -2057,7 +2047,7 @@ rarity=M
 [card]
 primitive=Locus of Enlightenment
 id=639763
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=The Everflowing Well
@@ -2067,7 +2057,7 @@ rarity=R
 [card]
 primitive=The Myriad Pools
 id=639765
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Kitesail Larcenist
@@ -2112,7 +2102,7 @@ rarity=R
 [card]
 primitive=The Tomb of Aclazotz
 id=639774
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Terror Tide
@@ -2127,7 +2117,7 @@ rarity=R
 [card]
 primitive=Tecutlan, the Searing Rift
 id=639777
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Dire Flail
@@ -2137,7 +2127,7 @@ rarity=R
 [card]
 primitive=Dire Blunderbuss
 id=639779
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Hit the Mother Lode
@@ -2172,7 +2162,7 @@ rarity=R
 [card]
 primitive=Itlimoc, Cradle of the Sun
 id=639786
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Intrepid Paleontologist
@@ -2212,7 +2202,7 @@ rarity=R
 [card]
 primitive=The Core
 id=639794
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=The Millennium Calendar
@@ -2237,7 +2227,7 @@ rarity=R
 [card]
 primitive=Treasure Cove
 id=639799
-rarity=T
+rarity=R
 [/card]
 [card]
 primitive=Sunken Citadel
diff --git a/projects/mtg/bin/Res/sets/M3C/_cards.dat b/projects/mtg/bin/Res/sets/M3C/_cards.dat
index 28d1b032e..56f975b89 100644
--- a/projects/mtg/bin/Res/sets/M3C/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M3C/_cards.dat
@@ -2,7 +2,7 @@
 author=Wagic Team
 name=Modern Horizons 3 Commander
 year=2024-06-14
-total=392
+total=399
 [/meta]
 [card]
 primitive=Disa the Restless
@@ -475,11 +475,6 @@ id=665382
 rarity=R
 [/card]
 [card]
-primitive=Hideous Taskmaster
-id=665383
-rarity=R
-[/card]
-[card]
 primitive=Overclocked Electromancer
 id=665384
 rarity=R
@@ -1150,16 +1145,11 @@ id=665674
 rarity=C
 [/card]
 [card]
-primitive=Find
+primitive=Find // Finality
 id=665675
 rarity=R
 [/card]
 [card]
-primitive=Finality
-id=665675
-rarity=T
-[/card]
-[card]
 primitive=Garruk, Apex Predator
 id=665676
 rarity=M
diff --git a/projects/mtg/bin/Res/sets/MH3/_cards.dat b/projects/mtg/bin/Res/sets/MH3/_cards.dat
index 5fce217db..2c43ded79 100644
--- a/projects/mtg/bin/Res/sets/MH3/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MH3/_cards.dat
@@ -980,7 +980,12 @@ id=662347
 rarity=C
 [/card]
 [card]
-primitive=Ondu Knotmaster // Throw a Line
+primitive=Ondu Knotmaster
+id=662348
+rarity=U
+[/card]
+[card]
+primitive=Throw a Line
 id=662348
 rarity=U
 [/card]
@@ -1192,7 +1197,7 @@ rarity=M
 [card]
 primitive=Ajani, Nacatl Avenger
 id=661754
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Razorgrass Ambush
@@ -1202,7 +1207,7 @@ rarity=U
 [card]
 primitive=Razorgrass Field
 id=661755
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Witch Enchanter
@@ -1212,7 +1217,7 @@ rarity=U
 [card]
 primitive=Witch-Blessed Meadow
 id=661757
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Hydroelectric Specimen
@@ -1222,7 +1227,7 @@ rarity=U
 [card]
 primitive=Hydroelectric Laboratory
 id=661759
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Sink into Stupor
@@ -1232,7 +1237,7 @@ rarity=U
 [card]
 primitive=Soporific Springs
 id=661761
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Tamiyo, Inquisitive Student
@@ -1242,7 +1247,7 @@ rarity=M
 [card]
 primitive=Tamiyo, Seasoned Scholar
 id=661764
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Boggart Trawler
@@ -1252,7 +1257,7 @@ rarity=U
 [card]
 primitive=Boggart Bog
 id=661765
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Fell the Profane
@@ -1262,7 +1267,7 @@ rarity=U
 [card]
 primitive=Fell Mire
 id=661767
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Sorin of House Markov
@@ -1272,7 +1277,7 @@ rarity=M
 [card]
 primitive=Sorin, Ravenous Neonate
 id=661770
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Pinnacle Monk
@@ -1282,7 +1287,7 @@ rarity=U
 [card]
 primitive=Mystic Peak
 id=661771
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Ral, Monsoon Mage
@@ -1292,7 +1297,7 @@ rarity=M
 [card]
 primitive=Ral, Leyline Prodigy
 id=661774
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Sundering Eruption
@@ -1302,7 +1307,7 @@ rarity=U
 [card]
 primitive=Volcanic Fissure
 id=661775
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Bridgeworks Battle
@@ -1312,7 +1317,7 @@ rarity=U
 [card]
 primitive=Tanglespan Bridgeworks
 id=661777
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Disciple of Freyalise
@@ -1322,7 +1327,7 @@ rarity=U
 [card]
 primitive=Garden of Freyalise
 id=661779
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Grist, Voracious Larva
@@ -1332,7 +1337,7 @@ rarity=M
 [card]
 primitive=Grist, the Plague Swarm
 id=661782
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Bloodsoaked Insight
@@ -1342,7 +1347,7 @@ rarity=U
 [card]
 primitive=Sanguine Morass
 id=661783
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Drowner of Truth
@@ -1352,7 +1357,7 @@ rarity=U
 [card]
 primitive=Drowned Jungle
 id=661785
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Glasswing Grace
@@ -1362,7 +1367,7 @@ rarity=U
 [card]
 primitive=Age-Graced Chapel
 id=661787
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Legion Leadership
@@ -1372,7 +1377,7 @@ rarity=U
 [card]
 primitive=Legion Stronghold
 id=661789
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Revitalizing Repast
@@ -1382,7 +1387,7 @@ rarity=U
 [card]
 primitive=Old-Growth Grove
 id=661791
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Rush of Inspiration
@@ -1392,7 +1397,7 @@ rarity=U
 [card]
 primitive=Crackling Falls
 id=661793
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Strength of the Harvest
@@ -1402,7 +1407,7 @@ rarity=U
 [card]
 primitive=Haven of the Harvest
 id=661795
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Stump Stomp
@@ -1412,7 +1417,7 @@ rarity=U
 [card]
 primitive=Burnwillow Clearing
 id=661797
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Suppression Ray
@@ -1422,7 +1427,7 @@ rarity=U
 [card]
 primitive=Orderly Plaza
 id=661799
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Waterlogged Teachings
@@ -1432,7 +1437,7 @@ rarity=U
 [card]
 primitive=Inundated Archive
 id=661801
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Angel of the Ruins
@@ -2342,7 +2347,7 @@ rarity=M
 [card]
 primitive=Ajani, Nacatl Avenger
 id=661309
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Tamiyo, Inquisitive Student
@@ -2352,7 +2357,7 @@ rarity=M
 [card]
 primitive=Tamiyo, Seasoned Scholar
 id=661311
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Sorin of House Markov
@@ -2362,7 +2367,7 @@ rarity=M
 [card]
 primitive=Sorin, Ravenous Neonate
 id=661313
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Ral, Monsoon Mage
@@ -2372,7 +2377,7 @@ rarity=M
 [card]
 primitive=Ral, Leyline Prodigy
 id=661315
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Grist, Voracious Larva
@@ -2382,7 +2387,7 @@ rarity=M
 [card]
 primitive=Grist, the Plague Swarm
 id=661317
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Argent Dais
diff --git a/projects/mtg/bin/Res/sets/MKC/_cards.dat b/projects/mtg/bin/Res/sets/MKC/_cards.dat
index eef5f7cb1..894c0d8f2 100644
--- a/projects/mtg/bin/Res/sets/MKC/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MKC/_cards.dat
@@ -285,16 +285,11 @@ id=650154
 rarity=R
 [/card]
 [card]
-primitive=Dusk
+primitive=Dusk // Dawn
 id=650155
 rarity=R
 [/card]
 [card]
-primitive=Dawn
-id=650155
-rarity=T
-[/card]
-[card]
 primitive=Elspeth, Sun's Champion
 id=650156
 rarity=M
@@ -387,7 +382,7 @@ rarity=R
 [card]
 primitive=Seal of Cleansing
 id=650174
-rarity=U
+rarity=C
 [/card]
 [card]
 primitive=Search the Premises
@@ -1000,16 +995,11 @@ id=650296
 rarity=M
 [/card]
 [card]
-primitive=Connive
+primitive=Connive // Concoct
 id=650297
 rarity=R
 [/card]
 [card]
-primitive=Concoct
-id=650297
-rarity=T
-[/card]
-[card]
 primitive=Decimate
 id=650298
 rarity=R
@@ -1025,16 +1015,11 @@ id=650300
 rarity=U
 [/card]
 [card]
-primitive=Discovery
+primitive=Discovery // Dispersal
 id=650301
 rarity=U
 [/card]
 [card]
-primitive=Dispersal
-id=650301
-rarity=T
-[/card]
-[card]
 primitive=Disinformation Campaign
 id=650302
 rarity=U
@@ -1057,7 +1042,7 @@ rarity=M
 [card]
 primitive=Hydroid Krasis
 id=650306
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Koma, Cosmos Serpent
@@ -1067,7 +1052,7 @@ rarity=M
 [card]
 primitive=Lazav, the Multifarious
 id=650308
-rarity=R
+rarity=M
 [/card]
 [card]
 primitive=Lonis, Cryptozoologist
@@ -1242,7 +1227,7 @@ rarity=U
 [card]
 primitive=Azorius Chancery
 id=650343
-rarity=C
+rarity=U
 [/card]
 [card]
 primitive=Bojuka Bog
@@ -1362,7 +1347,7 @@ rarity=R
 [card]
 primitive=Lonely Sandbar
 id=650367
-rarity=U
+rarity=C
 [/card]
 [card]
 primitive=Mossfire Valley
diff --git a/projects/mtg/bin/Res/sets/MKM/_cards.dat b/projects/mtg/bin/Res/sets/MKM/_cards.dat
index 97ffc18fa..916ac2ae1 100644
--- a/projects/mtg/bin/Res/sets/MKM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MKM/_cards.dat
@@ -2,7 +2,7 @@
 author=Wagic Team
 name=Murders at Karlov Manor
 year=2024-02-09
-total=451
+total=457
 [/meta]
 [card]
 primitive=Case of the Shattered Pact
@@ -1060,16 +1060,11 @@ id=646767
 rarity=M
 [/card]
 [card]
-primitive=Kellan, Inquisitive Prodigy
+primitive=Kellan, Inquisitive Prodigy // Tail the Suspect
 id=646768
 rarity=R
 [/card]
 [card]
-primitive=Tail the Suspect
-id=646768
-rarity=T
-[/card]
-[card]
 primitive=Kraul Whipcracker
 id=646834
 rarity=U
@@ -1235,56 +1230,31 @@ id=646799
 rarity=R
 [/card]
 [card]
-primitive=Cease
+primitive=Cease // Desist
 id=646800
 rarity=U
 [/card]
 [card]
-primitive=Desist
-id=646800
-rarity=T
-[/card]
-[card]
-primitive=Flotsam
+primitive=Flotsam // Jetsam
 id=646801
 rarity=U
 [/card]
 [card]
-primitive=Jetsam
-id=646801
-rarity=T
-[/card]
-[card]
-primitive=Fuss
+primitive=Fuss // Bother
 id=646802
 rarity=U
 [/card]
 [card]
-primitive=Bother
-id=646802
-rarity=T
-[/card]
-[card]
-primitive=Hustle
+primitive=Hustle // Bustle
 id=646803
 rarity=U
 [/card]
 [card]
-primitive=Bustle
-id=646803
-rarity=T
-[/card]
-[card]
-primitive=Push
+primitive=Push // Pull
 id=646804
 rarity=U
 [/card]
 [card]
-primitive=Pull
-id=646804
-rarity=T
-[/card]
-[card]
 primitive=Cryptex
 id=646805
 rarity=R
@@ -1700,16 +1670,11 @@ id=649313
 rarity=R
 [/card]
 [card]
-primitive=Kellan, Inquisitive Prodigy
+primitive=Kellan, Inquisitive Prodigy // Tail the Suspect
 id=649885
 rarity=R
 [/card]
 [card]
-primitive=Tail the Suspect
-id=649885
-rarity=T
-[/card]
-[card]
 primitive=Kaya, Spirits' Justice
 id=649712
 rarity=M
diff --git a/projects/mtg/bin/Res/sets/OTC/_cards.dat b/projects/mtg/bin/Res/sets/OTC/_cards.dat
index df7bf70e1..1c7c19cd6 100644
--- a/projects/mtg/bin/Res/sets/OTC/_cards.dat
+++ b/projects/mtg/bin/Res/sets/OTC/_cards.dat
@@ -1150,16 +1150,11 @@ id=658673
 rarity=R
 [/card]
 [card]
-primitive=Heaven
+primitive=Heaven // Earth
 id=658674
 rarity=R
 [/card]
 [card]
-primitive=Earth
-id=658674
-rarity=T
-[/card]
-[card]
 primitive=Hostage Taker
 id=658675
 rarity=R
@@ -1447,7 +1442,7 @@ rarity=R
 [card]
 primitive=Dimir Aqueduct
 id=658732
-rarity=C
+rarity=U
 [/card]
 [card]
 primitive=Dragonskull Summit
diff --git a/projects/mtg/bin/Res/sets/OTP/_cards.dat b/projects/mtg/bin/Res/sets/OTP/_cards.dat
index fba5a084b..8147711f5 100644
--- a/projects/mtg/bin/Res/sets/OTP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/OTP/_cards.dat
@@ -195,16 +195,11 @@ id=657783
 rarity=U
 [/card]
 [card]
-primitive=Crime
-id=658275
+primitive=Crime // Punishment
+id=657784
 rarity=M
 [/card]
 [card]
-primitive=Punishment
-id=658275
-rarity=T
-[/card]
-[card]
 primitive=Cruel Ultimatum
 id=657785
 rarity=R
@@ -380,6 +375,11 @@ id=658274
 rarity=M
 [/card]
 [card]
+primitive=Crime // Punishment
+id=658275
+rarity=M
+[/card]
+[card]
 primitive=Fractured Identity
 id=658276
 rarity=M
diff --git a/projects/mtg/bin/Res/sets/RVR/_cards.dat b/projects/mtg/bin/Res/sets/RVR/_cards.dat
index f788af6c4..1330d5dce 100644
--- a/projects/mtg/bin/Res/sets/RVR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RVR/_cards.dat
@@ -2,7 +2,7 @@
 author=Wagic Team
 name=Ravnica Remastered
 year=2024-01-12
-total=477
+total=541
 [/meta]
 [card]
 primitive=Karn, the Great Creator
@@ -1200,106 +1200,56 @@ id=643246
 rarity=C
 [/card]
 [card]
-primitive=Warrant
+primitive=Warrant // Warden
 id=643247
 rarity=R
 [/card]
 [card]
-primitive=Warden
-id=643247
-rarity=T
-[/card]
-[card]
-primitive=Revival
+primitive=Revival // Revenge
 id=643248
 rarity=R
 [/card]
 [card]
-primitive=Revenge
-id=643248
-rarity=T
-[/card]
-[card]
-primitive=Connive
+primitive=Connive // Concoct
 id=643249
 rarity=R
 [/card]
 [card]
-primitive=Concoct
-id=643249
-rarity=T
-[/card]
-[card]
-primitive=Expansion
+primitive=Expansion // Explosion
 id=643250
 rarity=R
 [/card]
 [card]
-primitive=Explosion
-id=643250
-rarity=T
-[/card]
-[card]
-primitive=Bedeck
+primitive=Bedeck // Bedazzle
 id=643251
 rarity=R
 [/card]
 [card]
-primitive=Bedazzle
-id=643251
-rarity=T
-[/card]
-[card]
-primitive=Find
+primitive=Find // Finality
 id=643252
 rarity=R
 [/card]
 [card]
-primitive=Finality
-id=643252
-rarity=T
-[/card]
-[card]
-primitive=Thrash
+primitive=Thrash // Threat
 id=643253
 rarity=R
 [/card]
 [card]
-primitive=Threat
-id=643253
-rarity=T
-[/card]
-[card]
-primitive=Response
+primitive=Response // Resurgence
 id=643254
 rarity=R
 [/card]
 [card]
-primitive=Resurgence
-id=643254
-rarity=T
-[/card]
-[card]
-primitive=Assure
+primitive=Assure // Assemble
 id=643255
 rarity=R
 [/card]
 [card]
-primitive=Assemble
-id=643255
-rarity=T
-[/card]
-[card]
-primitive=Repudiate
+primitive=Repudiate // Replicate
 id=643256
 rarity=R
 [/card]
 [card]
-primitive=Replicate
-id=643256
-rarity=T
-[/card]
-[card]
 primitive=Azorius Signet
 id=643257
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/SPG/_cards.dat b/projects/mtg/bin/Res/sets/SPG/_cards.dat
index e276aa956..d5079342c 100644
--- a/projects/mtg/bin/Res/sets/SPG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SPG/_cards.dat
@@ -2,7 +2,7 @@
 author=Wagic Team
 name=Special Guests
 year=2023-11-17
-total=60
+total=71
 [/meta]
 [card]
 primitive=Lord of Atlantis
@@ -150,16 +150,11 @@ id=660837
 rarity=M
 [/card]
 [card]
-primitive=Brazen Borrower
+primitive=Brazen Borrower // Petty Theft
 id=660838
 rarity=M
 [/card]
 [card]
-primitive=Petty Theft
-id=660838
-rarity=T
-[/card]
-[card]
 primitive=Desertion
 id=660839
 rarity=M
@@ -249,3 +244,53 @@ primitive=Endurance
 id=666645
 rarity=M
 [/card]
+[card]
+primitive=Swords to Plowshares
+id=672824
+rarity=M
+[/card]
+[card]
+primitive=Ledger Shredder
+id=672825
+rarity=M
+[/card]
+[card]
+primitive=Rat Colony
+id=672826
+rarity=M
+[/card]
+[card]
+primitive=Relentless Rats
+id=672827
+rarity=M
+[/card]
+[card]
+primitive=Kindred Charge
+id=672828
+rarity=M
+[/card]
+[card]
+primitive=Sylvan Tutor
+id=672829
+rarity=M
+[/card]
+[card]
+primitive=Toski, Bearer of Secrets
+id=672830
+rarity=M
+[/card]
+[card]
+primitive=Frogmite
+id=672831
+rarity=M
+[/card]
+[card]
+primitive=Sword of Fire and Ice
+id=672832
+rarity=M
+[/card]
+[card]
+primitive=Secluded Courtyard
+id=672833
+rarity=M
+[/card]
diff --git a/projects/mtg/bin/Res/sets/WOE/_cards.dat b/projects/mtg/bin/Res/sets/WOE/_cards.dat
index 73b29af31..2b719c13b 100644
--- a/projects/mtg/bin/Res/sets/WOE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/WOE/_cards.dat
@@ -20,16 +20,11 @@ id=629504
 rarity=C
 [/card]
 [card]
-primitive=Besotted Knight
+primitive=Besotted Knight // Betroth the Beast
 id=629505
 rarity=C
 [/card]
 [card]
-primitive=Betroth the Beast
-id=629505
-rarity=T
-[/card]
-[card]
 primitive=Break the Spell
 id=629506
 rarity=C
@@ -40,16 +35,11 @@ id=629507
 rarity=C
 [/card]
 [card]
-primitive=Cheeky House-Mouse
+primitive=Cheeky House-Mouse // Squeak By
 id=629508
 rarity=U
 [/card]
 [card]
-primitive=Squeak By
-id=629508
-rarity=T
-[/card]
-[card]
 primitive=Cooped Up
 id=629509
 rarity=C
@@ -200,31 +190,21 @@ id=629538
 rarity=C
 [/card]
 [card]
-primitive=Virtue of Loyalty
+primitive=Virtue of Loyalty // Ardenvale Fealty
 id=629539
 rarity=M
 [/card]
 [card]
-primitive=Ardenvale Fealty
-id=629539
-rarity=T
-[/card]
-[card]
 primitive=Werefox Bodyguard
 id=629540
 rarity=R
 [/card]
 [card]
-primitive=Aquatic Alchemist
+primitive=Aquatic Alchemist // Bubble Up
 id=629541
 rarity=C
 [/card]
 [card]
-primitive=Bubble Up
-id=629541
-rarity=T
-[/card]
-[card]
 primitive=Archive Dragon
 id=629542
 rarity=U
@@ -235,16 +215,11 @@ id=629543
 rarity=M
 [/card]
 [card]
-primitive=Beluna's Gatekeeper
+primitive=Beluna's Gatekeeper // Entry Denied
 id=629544
 rarity=C
 [/card]
 [card]
-primitive=Entry Denied
-id=629544
-rarity=T
-[/card]
-[card]
 primitive=Bitter Chill
 id=629545
 rarity=U
@@ -285,26 +260,16 @@ id=629552
 rarity=U
 [/card]
 [card]
-primitive=Galvanic Giant
+primitive=Galvanic Giant // Storm Reading
 id=629553
 rarity=U
 [/card]
 [card]
-primitive=Storm Reading
-id=629553
-rarity=T
-[/card]
-[card]
-primitive=Horned Loch-Whale
+primitive=Horned Loch-Whale // Lagoon Breach
 id=629554
 rarity=R
 [/card]
 [card]
-primitive=Lagoon Breach
-id=629554
-rarity=T
-[/card]
-[card]
 primitive=Ice Out
 id=629555
 rarity=C
@@ -350,26 +315,16 @@ id=629563
 rarity=C
 [/card]
 [card]
-primitive=Obyra's Attendants
+primitive=Obyra's Attendants // Desperate Parry
 id=629564
 rarity=C
 [/card]
 [card]
-primitive=Desperate Parry
-id=629564
-rarity=T
-[/card]
-[card]
-primitive=Picklock Prankster
+primitive=Picklock Prankster // Free the Fae
 id=629565
 rarity=U
 [/card]
 [card]
-primitive=Free the Fae
-id=629565
-rarity=T
-[/card]
-[card]
 primitive=Quick Study
 id=629566
 rarity=C
@@ -420,26 +375,16 @@ id=629575
 rarity=U
 [/card]
 [card]
-primitive=Vantress Transmuter
+primitive=Vantress Transmuter // Croaking Curse
 id=629576
 rarity=C
 [/card]
 [card]
-primitive=Croaking Curse
-id=629576
-rarity=T
-[/card]
-[card]
-primitive=Virtue of Knowledge
+primitive=Virtue of Knowledge // Vantress Visions
 id=629577
 rarity=M
 [/card]
 [card]
-primitive=Vantress Visions
-id=629577
-rarity=T
-[/card]
-[card]
 primitive=Water Wings
 id=629578
 rarity=C
@@ -475,16 +420,11 @@ id=629584
 rarity=C
 [/card]
 [card]
-primitive=Conceited Witch
+primitive=Conceited Witch // Price of Beauty
 id=629585
 rarity=C
 [/card]
 [card]
-primitive=Price of Beauty
-id=629585
-rarity=T
-[/card]
-[card]
 primitive=Dream Spoilers
 id=629586
 rarity=U
@@ -520,26 +460,16 @@ id=629592
 rarity=C
 [/card]
 [card]
-primitive=Fell Horseman
+primitive=Fell Horseman // Deathly Ride
 id=629593
 rarity=C
 [/card]
 [card]
-primitive=Deathly Ride
-id=629593
-rarity=T
-[/card]
-[card]
-primitive=Gumdrop Poisoner
+primitive=Gumdrop Poisoner // Tempt with Treats
 id=629594
 rarity=R
 [/card]
 [card]
-primitive=Tempt with Treats
-id=629594
-rarity=T
-[/card]
-[card]
 primitive=High Fae Negotiator
 id=629595
 rarity=U
@@ -645,16 +575,11 @@ id=629615
 rarity=U
 [/card]
 [card]
-primitive=Virtue of Persistence
+primitive=Virtue of Persistence // Locthwain Scorn
 id=629616
 rarity=M
 [/card]
 [card]
-primitive=Locthwain Scorn
-id=629616
-rarity=T
-[/card]
-[card]
 primitive=Voracious Vermin
 id=629617
 rarity=C
@@ -680,16 +605,11 @@ id=629621
 rarity=U
 [/card]
 [card]
-primitive=Bellowing Bruiser
+primitive=Bellowing Bruiser // Beat a Path
 id=629622
 rarity=C
 [/card]
 [card]
-primitive=Beat a Path
-id=629622
-rarity=T
-[/card]
-[card]
 primitive=Bespoke Battlegarb
 id=629623
 rarity=C
@@ -745,16 +665,11 @@ id=629633
 rarity=R
 [/card]
 [card]
-primitive=Grabby Giant
+primitive=Grabby Giant // That's Mine
 id=629634
 rarity=C
 [/card]
 [card]
-primitive=That's Mine
-id=629634
-rarity=T
-[/card]
-[card]
 primitive=Grand Ball Guest
 id=629635
 rarity=C
@@ -765,16 +680,11 @@ id=629636
 rarity=C
 [/card]
 [card]
-primitive=Hearth Elemental
+primitive=Hearth Elemental // Stoke Genius
 id=629637
 rarity=U
 [/card]
 [card]
-primitive=Stoke Genius
-id=629637
-rarity=T
-[/card]
-[card]
 primitive=Imodane, the Pyrohammer
 id=629638
 rarity=R
@@ -795,16 +705,11 @@ id=629641
 rarity=C
 [/card]
 [card]
-primitive=Minecart Daredevil
+primitive=Minecart Daredevil // Ride the Rails
 id=629642
 rarity=C
 [/card]
 [card]
-primitive=Ride the Rails
-id=629642
-rarity=T
-[/card]
-[card]
 primitive=Monstrous Rage
 id=629643
 rarity=U
@@ -815,16 +720,11 @@ id=629644
 rarity=R
 [/card]
 [card]
-primitive=Ratcatcher Trainee
+primitive=Ratcatcher Trainee // Pest Problem
 id=629645
 rarity=C
 [/card]
 [card]
-primitive=Pest Problem
-id=629645
-rarity=T
-[/card]
-[card]
 primitive=Realm-Scorcher Hellkite
 id=629646
 rarity=M
@@ -875,31 +775,21 @@ id=629655
 rarity=U
 [/card]
 [card]
-primitive=Two-Headed Hunter
+primitive=Two-Headed Hunter // Twice the Rage
 id=629656
 rarity=U
 [/card]
 [card]
-primitive=Twice the Rage
-id=629656
-rarity=T
-[/card]
-[card]
 primitive=Unruly Catapult
 id=629657
 rarity=C
 [/card]
 [card]
-primitive=Virtue of Courage
+primitive=Virtue of Courage // Embereth Blaze
 id=629658
 rarity=M
 [/card]
 [card]
-primitive=Embereth Blaze
-id=629658
-rarity=T
-[/card]
-[card]
 primitive=Witch's Mark
 id=629659
 rarity=C
@@ -915,16 +805,11 @@ id=629661
 rarity=U
 [/card]
 [card]
-primitive=Beanstalk Wurm
+primitive=Beanstalk Wurm // Plant Beans
 id=629662
 rarity=C
 [/card]
 [card]
-primitive=Plant Beans
-id=629662
-rarity=T
-[/card]
-[card]
 primitive=Bestial Bloodline
 id=629663
 rarity=C
@@ -935,16 +820,11 @@ id=629664
 rarity=M
 [/card]
 [card]
-primitive=Bramble Familiar
+primitive=Bramble Familiar // Fetch Quest
 id=629665
 rarity=R
 [/card]
 [card]
-primitive=Fetch Quest
-id=629665
-rarity=T
-[/card]
-[card]
 primitive=Brave the Wilds
 id=629666
 rarity=C
@@ -970,16 +850,11 @@ id=629670
 rarity=R
 [/card]
 [card]
-primitive=Ferocious Werefox
+primitive=Ferocious Werefox // Guard Change
 id=629671
 rarity=C
 [/card]
 [card]
-primitive=Guard Change
-id=629671
-rarity=T
-[/card]
-[card]
 primitive=Graceful Takedown
 id=629672
 rarity=U
@@ -995,16 +870,11 @@ id=629674
 rarity=C
 [/card]
 [card]
-primitive=Hollow Scavenger
+primitive=Hollow Scavenger // Bakery Raid
 id=629675
 rarity=C
 [/card]
 [card]
-primitive=Bakery Raid
-id=629675
-rarity=T
-[/card]
-[card]
 primitive=Howling Galefang
 id=629676
 rarity=U
@@ -1065,16 +935,11 @@ id=629687
 rarity=C
 [/card]
 [card]
-primitive=Stormkeld Vanguard
+primitive=Stormkeld Vanguard // Bear Down
 id=629688
 rarity=U
 [/card]
 [card]
-primitive=Bear Down
-id=629688
-rarity=T
-[/card]
-[card]
 primitive=Tanglespan Lookout
 id=629689
 rarity=U
@@ -1120,16 +985,11 @@ id=629697
 rarity=C
 [/card]
 [card]
-primitive=Virtue of Strength
+primitive=Virtue of Strength // Garenbrig Growth
 id=629698
 rarity=M
 [/card]
 [card]
-primitive=Garenbrig Growth
-id=629698
-rarity=T
-[/card]
-[card]
 primitive=Welcome to Sweettooth
 id=629699
 rarity=U
@@ -1240,226 +1100,116 @@ id=629720
 rarity=R
 [/card]
 [card]
-primitive=Beluna Grandsquall
+primitive=Beluna Grandsquall // Seek Thrills
 id=629721
 rarity=M
 [/card]
 [card]
-primitive=Seek Thrills
-id=629721
-rarity=T
-[/card]
-[card]
-primitive=Callous Sell-Sword
+primitive=Callous Sell-Sword // Burn Together
 id=629722
 rarity=U
 [/card]
 [card]
-primitive=Burn Together
-id=629722
-rarity=T
-[/card]
-[card]
-primitive=Cruel Somnophage
+primitive=Cruel Somnophage // Can't Wake Up
 id=629723
 rarity=R
 [/card]
 [card]
-primitive=Can't Wake Up
-id=629723
-rarity=T
-[/card]
-[card]
-primitive=Decadent Dragon
+primitive=Decadent Dragon // Expensive Taste
 id=629724
 rarity=R
 [/card]
 [card]
-primitive=Expensive Taste
-id=629724
-rarity=T
-[/card]
-[card]
-primitive=Devouring Sugarmaw
+primitive=Devouring Sugarmaw // Have for Dinner
 id=629725
 rarity=R
 [/card]
 [card]
-primitive=Have for Dinner
-id=629725
-rarity=T
-[/card]
-[card]
-primitive=Elusive Otter
+primitive=Elusive Otter // Grove's Bounty
 id=629726
 rarity=R
 [/card]
 [card]
-primitive=Grove's Bounty
-id=629726
-rarity=T
-[/card]
-[card]
-primitive=Frolicking Familiar
+primitive=Frolicking Familiar // Blow Off Steam
 id=629727
 rarity=U
 [/card]
 [card]
-primitive=Blow Off Steam
-id=629727
-rarity=T
-[/card]
-[card]
-primitive=Gingerbread Hunter
+primitive=Gingerbread Hunter // Puny Snack
 id=629728
 rarity=U
 [/card]
 [card]
-primitive=Puny Snack
-id=629728
-rarity=T
-[/card]
-[card]
-primitive=Heartflame Duelist
+primitive=Heartflame Duelist // Heartflame Slash
 id=629729
 rarity=R
 [/card]
 [card]
-primitive=Heartflame Slash
-id=629729
-rarity=T
-[/card]
-[card]
-primitive=Imodane's Recruiter
+primitive=Imodane's Recruiter // Train Troops
 id=629730
 rarity=U
 [/card]
 [card]
-primitive=Train Troops
-id=629730
-rarity=T
-[/card]
-[card]
-primitive=Kellan, the Fae-Blooded
+primitive=Kellan, the Fae-Blooded // Birthright Boon
 id=629731
 rarity=M
 [/card]
 [card]
-primitive=Birthright Boon
-id=629731
-rarity=T
-[/card]
-[card]
-primitive=Mosswood Dreadknight
+primitive=Mosswood Dreadknight // Dread Whispers
 id=629732
 rarity=R
 [/card]
 [card]
-primitive=Dread Whispers
-id=629732
-rarity=T
-[/card]
-[card]
-primitive=Picnic Ruiner
+primitive=Picnic Ruiner // Stolen Goodies
 id=629733
 rarity=U
 [/card]
 [card]
-primitive=Stolen Goodies
-id=629733
-rarity=T
-[/card]
-[card]
-primitive=Pollen-Shield Hare
+primitive=Pollen-Shield Hare // Hare Raising
 id=629734
 rarity=R
 [/card]
 [card]
-primitive=Hare Raising
-id=629734
-rarity=T
-[/card]
-[card]
-primitive=Questing Druid
+primitive=Questing Druid // Seek the Beast
 id=629735
 rarity=R
 [/card]
 [card]
-primitive=Seek the Beast
-id=629735
-rarity=T
-[/card]
-[card]
-primitive=Scalding Viper
+primitive=Scalding Viper // Steam Clean
 id=629736
 rarity=R
 [/card]
 [card]
-primitive=Steam Clean
-id=629736
-rarity=T
-[/card]
-[card]
-primitive=Shrouded Shepherd
+primitive=Shrouded Shepherd // Cleave Shadows
 id=629737
 rarity=U
 [/card]
 [card]
-primitive=Cleave Shadows
-id=629737
-rarity=T
-[/card]
-[card]
-primitive=Spellscorn Coven
+primitive=Spellscorn Coven // Take It Back
 id=629738
 rarity=U
 [/card]
 [card]
-primitive=Take It Back
-id=629738
-rarity=T
-[/card]
-[card]
-primitive=Tempest Hart
+primitive=Tempest Hart // Scan the Clouds
 id=629739
 rarity=U
 [/card]
 [card]
-primitive=Scan the Clouds
-id=629739
-rarity=T
-[/card]
-[card]
-primitive=Threadbind Clique
+primitive=Threadbind Clique // Rip the Seams
 id=629740
 rarity=U
 [/card]
 [card]
-primitive=Rip the Seams
-id=629740
-rarity=T
-[/card]
-[card]
-primitive=Twining Twins
+primitive=Twining Twins // Swift Spiral
 id=629741
 rarity=R
 [/card]
 [card]
-primitive=Swift Spiral
-id=629741
-rarity=T
-[/card]
-[card]
-primitive=Woodland Acolyte
+primitive=Woodland Acolyte // Mend the Wilds
 id=629742
 rarity=U
 [/card]
 [card]
-primitive=Mend the Wilds
-id=629742
-rarity=T
-[/card]
-[card]
 primitive=Agatha's Soul Cauldron
 id=629743
 rarity=M
@@ -1635,221 +1385,116 @@ id=631639
 rarity=L
 [/card]
 [card]
-primitive=Virtue of Loyalty
+primitive=Virtue of Loyalty // Ardenvale Fealty
 id=632229
 rarity=M
 [/card]
 [card]
-primitive=Ardenvale Fealty
-id=632229
-rarity=T
-[/card]
-[card]
-primitive=Horned Loch-Whale
+primitive=Horned Loch-Whale // Lagoon Breach
 id=632230
 rarity=R
 [/card]
 [card]
-primitive=Lagoon Breach
-id=632230
-rarity=T
-[/card]
-[card]
-primitive=Virtue of Knowledge
+primitive=Virtue of Knowledge // Vantress Visions
 id=632231
 rarity=M
 [/card]
 [card]
-primitive=Vantress Visions
-id=632231
-rarity=T
-[/card]
-[card]
-primitive=Gumdrop Poisoner
+primitive=Gumdrop Poisoner // Tempt with Treats
 id=632232
 rarity=R
 [/card]
 [card]
-primitive=Tempt with Treats
-id=632232
-rarity=T
-[/card]
-[card]
-primitive=Virtue of Persistence
+primitive=Virtue of Persistence // Locthwain Scorn
 id=632233
 rarity=M
 [/card]
 [card]
-primitive=Locthwain Scorn
-id=632233
-rarity=T
-[/card]
-[card]
-primitive=Virtue of Courage
+primitive=Virtue of Courage // Embereth Blaze
 id=632234
 rarity=M
 [/card]
 [card]
-primitive=Embereth Blaze
-id=632234
-rarity=T
-[/card]
-[card]
-primitive=Bramble Familiar
+primitive=Bramble Familiar // Fetch Quest
 id=632235
 rarity=R
 [/card]
 [card]
-primitive=Fetch Quest
-id=632235
-rarity=T
-[/card]
-[card]
-primitive=Virtue of Strength
+primitive=Virtue of Strength // Garenbrig Growth
 id=632236
 rarity=M
 [/card]
 [card]
-primitive=Garenbrig Growth
-id=632236
-rarity=T
-[/card]
-[card]
-primitive=Beluna Grandsquall
+primitive=Beluna Grandsquall // Seek Thrills
 id=632237
 rarity=M
 [/card]
 [card]
-primitive=Seek Thrills
-id=632237
-rarity=T
-[/card]
-[card]
-primitive=Cruel Somnophage
+primitive=Cruel Somnophage // Can't Wake Up
 id=632238
 rarity=R
 [/card]
 [card]
-primitive=Can't Wake Up
-id=632238
-rarity=T
-[/card]
-[card]
-primitive=Decadent Dragon
+primitive=Decadent Dragon // Expensive Taste
 id=632239
 rarity=R
 [/card]
 [card]
-primitive=Expensive Taste
-id=632239
-rarity=T
-[/card]
-[card]
-primitive=Devouring Sugarmaw
+primitive=Devouring Sugarmaw // Have for Dinner
 id=632240
 rarity=R
 [/card]
 [card]
-primitive=Have for Dinner
-id=632240
-rarity=T
-[/card]
-[card]
-primitive=Elusive Otter
+primitive=Elusive Otter // Grove's Bounty
 id=632241
 rarity=R
 [/card]
 [card]
-primitive=Grove's Bounty
-id=632241
-rarity=T
-[/card]
-[card]
-primitive=Heartflame Duelist
+primitive=Heartflame Duelist // Heartflame Slash
 id=632242
 rarity=R
 [/card]
 [card]
-primitive=Heartflame Slash
-id=632242
-rarity=T
-[/card]
-[card]
-primitive=Kellan, the Fae-Blooded
+primitive=Kellan, the Fae-Blooded // Birthright Boon
 id=632243
 rarity=M
 [/card]
 [card]
-primitive=Birthright Boon
-id=632243
-rarity=T
-[/card]
-[card]
-primitive=Mosswood Dreadknight
+primitive=Mosswood Dreadknight // Dread Whispers
 id=632244
 rarity=R
 [/card]
 [card]
-primitive=Dread Whispers
-id=632244
-rarity=T
-[/card]
-[card]
-primitive=Pollen-Shield Hare
+primitive=Pollen-Shield Hare // Hare Raising
 id=632245
 rarity=R
 [/card]
 [card]
-primitive=Hare Raising
-id=632245
-rarity=T
-[/card]
-[card]
-primitive=Questing Druid
+primitive=Questing Druid // Seek the Beast
 id=632246
 rarity=R
 [/card]
 [card]
-primitive=Seek the Beast
-id=632246
-rarity=T
-[/card]
-[card]
-primitive=Scalding Viper
+primitive=Scalding Viper // Steam Clean
 id=632247
 rarity=R
 [/card]
 [card]
-primitive=Steam Clean
-id=632247
-rarity=T
-[/card]
-[card]
-primitive=Twining Twins
+primitive=Twining Twins // Swift Spiral
 id=632248
 rarity=R
 [/card]
 [card]
-primitive=Swift Spiral
-id=632248
-rarity=T
-[/card]
-[card]
 primitive=Ashiok, Wicked Manipulator
 id=631790
 rarity=M
 [/card]
 [card]
-primitive=Kellan, the Fae-Blooded
+primitive=Kellan, the Fae-Blooded // Birthright Boon
 id=631710
 rarity=M
 [/card]
 [card]
-primitive=Birthright Boon
-id=631710
-rarity=T
-[/card]
-[card]
 primitive=Eriette of the Charmed Apple
 id=631718
 rarity=M
@@ -1955,16 +1600,11 @@ id=632080
 rarity=R
 [/card]
 [card]
-primitive=Intrepid Trufflesnout
+primitive=Intrepid Trufflesnout // Go Hog Wild
 id=632081
 rarity=U
 [/card]
 [card]
-primitive=Go Hog Wild
-id=632081
-rarity=T
-[/card]
-[card]
 primitive=Provisions Merchant
 id=632082
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index aeaf242bf..cef4fbd28 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -14812,7 +14812,7 @@ subtype=Cave
 [/card]
 [card]
 name=Captivating Crew
-auto={3}{R}:name(gain control) target(creature|opponentbattlefield) transforms((,newability[moveTo(opponentbattlefield)],newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot asSorcery
+auto={3}{R}:name(gain control) target(creature|opponentbattlefield) moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(previousbattlefield)],newability[untap],haste)) ueot)! asSorcery
 text={3}{R}: Gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn. Activate this ability only any time you could cast a sorcery.
 mana={3}{R}
 type=Creature
@@ -39425,7 +39425,7 @@ name=Gadrak, the Crown-Scourge
 abilities=flying
 auto=aslongas(artifact|myBattlefield) cantattack <4
 auto=aslongas(artifact|myBattlefield) cantpwattack <4
-auto=@each my endofturn:foreach(creature[-token;fresh]|graveyard) _TREASURE_
+auto=@each my endofturn:_TREASURE_*bothalldeadcreature
 text=Flying -- Gadrak, the Crown-Scourge can't attack unless you control four or more artifacts. -- At the beginning of your end step, create a Treasure token for each nontoken creature that died this turn. (It's an artifact with " {T}, Sacrifice this artifact: Add one mana of any color.")
 mana={2}{R}
 type=Legendary Creature
@@ -65056,7 +65056,7 @@ type=Sorcery
 [/card]
 [card]
 name=Mayhem Devil
-auto=@sacrificed(*|battlefield):damage:1 target(anytarget)
+auto=@sacrificed(*|battlefield):target(anytarget) damage:1
 text=Whenever a player sacrifices a permanent, Mayhem Devil deals 1 damage to any target.
 mana={1}{B}{R}
 type=Creature
@@ -84275,13 +84275,10 @@ type=Sorcery
 [/card]
 [card]
 name=Repel Intruders
-other={3}{U} name(Pay blue mana)
-auto=if paid(alternative) then target(creature|stack) fizzle
-kicker={U}
-auto=kicker ifnot paid(alternative) then target(creature|stack) fizzle
-auto=ifnot paid(alternative) then token(Kithkin Soldier,creature kithkin soldier,1/1,white)*2
-text=Put two 1/1 white Kithkin Soldier creature tokens onto the battlefield if {W} was spent to cast Repel Intruders. Counter up to one target creature spell if {U} was spent to cast Repel Intruders. (Do both if {W}{U} was spent.)
-mana={3}{W}
+auto=if spent({U}) then target(creature|stack) fizzle
+auto=if spent({W}) then token(Kithkin Soldier,creature kithkin soldier,1/1,white)*2
+text=Create two 1/1 white Kithkin Soldier creature tokens if {W} was spent to cast this spell. Counter up to one target creature spell if {U} was spent to cast this spell. (Do both if {W}{U} was spent.)
+mana={3}{WU}
 type=Instant
 [/card]
 [card]
@@ -84548,7 +84545,7 @@ toughness=3
 [card]
 name=Resplendent Angel
 abilities=flying
-auto=@each endofturn restriction{compare(lifegain)~morethan~5}:create(angel:creature angel:4/4:white:flying:vigilance)
+auto=@each endofturn restriction{compare(lifegain)~morethan~4}:create(angel:creature angel:4/4:white:flying:vigilance)
 auto={3}{W}{W}{W}:2/2 && lifelink ueot
 text=Flying -- At the beginning of each end step, if you gained 5 or more life this turn, create a 4/4 white Angel creature token with flying and vigilance. -- {3}{W}{W}{W}: Until end of turn, Resplendent Angel gets +2/+2 and gains lifelink.
 mana={1}{W}{W}
@@ -86942,8 +86939,7 @@ toughness=4
 [/card]
 [card]
 name=Rootless Yew
-abilities=trample
-auto=_DIES_name(Put creature in hand) target(creature[power>=6]|mygraveyard) moveto(ownerHand) and!( shuffle )!
+auto=_DIES_ability$!choice name() name(power 6 or greater) target(creature[power>=6]|mylibrary) moveto(ownerHand) _ choice name(toughness 6 or greater) target(creature[toughness>=6]|mylibrary) moveto(ownerHand)!$ controller
 text=When Rootless Yew dies, search your library for a creature card with power or toughness 6 or greater, reveal it, put it into your hand, then shuffle.
 mana={3}{G}{G}
 type=Creature
@@ -107216,8 +107212,8 @@ toughness=4
 name=The Reaver Cleaver
 auto=teach(creature) 1/1
 auto=teach(creature) trample
-auto=teach(creature) transforms((,newability[@combatdamaged(player) from(this):_TREASURE_*thatmuch]))
-auto=teach(creature) transforms((,newability[@combatdamaged(planeswalker) from(this):_TREASURE_*thatmuch]))
+auto=@combatdamaged(player) from(mytgt):_TREASURE_*thatmuch
+auto=@combatdamaged(planeswalker) from(mytgt):_TREASURE_*thatmuch
 auto={3}:equip
 text=Equipped creature gets +1/+1 and has trample and "Whenever this creature deals combat damage to a player or planeswalker, create that many Treasure tokens." -- Equip {3}
 mana={2}{R}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index ae1b9edcb..6199eeb7e 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -54830,8 +54830,8 @@ toughness=1
 [/card]
 [card]
 name=Hissing Iguanar
-auto=@movedTo(graveyard) from(other creature|battlefield):may damage:1 target(player)
-text=Whenever another creature dies, you may have Hissing Iguanar deal 1 damage to target player.
+auto=@movedTo(other creature|graveyard) from(battlefield):may damage:1 target(player,planeswalker)
+text=Whenever another creature dies, you may have Hissing Iguanar deal 1 damage to target player or planeswalker.
 mana={2}{R}
 type=Creature
 subtype=Lizard
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index bfb4cd35a..07873f70c 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -1724,7 +1724,7 @@ name=Karn, Scion of Urza
 aicode=activate target(*[zpos<=1]|myLibrary) moveto(ownerHand) && target(*[zpos<=1]|myLibrary) moveto(ownerExile)
 auto=counter(0/0,5,loyalty)
 auto={C(0/0,1,Loyalty)}:name(+1: Reveal two exile one and put in hand) reveal:2 optionone name(Look at the top two cards) target(*|reveal) moveto(myHand) optiononeend optiontwo name(Exile) target(*|reveal) moveTo(myExile) optiontwoend revealend
-auto={C(0/0,-3,Loyalty)}:name(-3: Return a exile card to your hand) moveTo(myHand) target(*|myExile)
+auto={C(0/0,-1,Loyalty)}:name(-1: Return a exiled card to your hand) moveTo(myHand) target(*|myExile)
 auto={C(0/0,-2,Loyalty)}:name(-2: Create a 0/0 Construct) token(Construct,Artifact Creature Construct,0/0) and!( transforms((,newability[foreach(artifact|mybattlefield) 1/1])) forever )!
 text=+1: Reveal the top two cards of your library. An opponent chooses one of them. Put that card into your hand and exile the other with a silver counter on it. -- −1: Put a card you own with a silver counter on it from exile into your hand. -- −2: Create a 0/0 colorless Construct artifact creature token with "This creature gets +1/+1 for each artifact you control."
 mana={4}