From 9dd5807caec9031a289b3537366867f850a2e272 Mon Sep 17 00:00:00 2001
From: valfieri <vittorio.alfieri@leonardocompany.com>
Date: Sun, 22 Sep 2019 11:33:06 +0200
Subject: [PATCH] Added TPR set and improved Android Downloader.

---
 .../src/net/wagic/utils/ImgDownloader.java    |    4 +-
 projects/mtg/bin/Res/sets/TPR/_cards.dat      | 1351 +++++++++++++++++
 .../bin/Res/sets/primitives/borderline.txt    |   40 +
 .../bin/Res/sets/primitives/unsupported.txt   |   30 -
 4 files changed, 1394 insertions(+), 31 deletions(-)
 create mode 100644 projects/mtg/bin/Res/sets/TPR/_cards.dat

diff --git a/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java b/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java
index 68042934b..ad70501be 100644
--- a/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java
+++ b/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java
@@ -819,7 +819,7 @@ public class ImgDownloader {
         else if (id.equals("48096t"))
             tokenurl = "https://deckmaster.info/images/cards/CNS/-89-hr.jpg";
         else if(id.equals("423817t") || id.equals("423700t") || id.equals("183017t") || id.equals("383129t") ||
-                id.equals("6164t") || id.equals("456522t") || id.equals("456545t"))
+                id.equals("6164t") || id.equals("456522t") || id.equals("456545t") || id.equals("397624t"))
             tokenurl = "https://deckmaster.info/images/cards/MBS/-216-hr.jpg";
         else if (id.equals("140233t") || id.equals("191239t") || id.equals("205957t") || id.equals("423797t"))
             tokenurl = "https://deckmaster.info/images/cards/M11/-234-hr.jpg";
@@ -1018,6 +1018,8 @@ public class ImgDownloader {
             tokenurl = "https://i.pinimg.com/564x/5d/68/d6/5d68d67bef76bf90588a4afdc39dc60e.jpg";
         else if (id.equals("439538t"))
             tokenurl = "https://i.pinimg.com/originals/da/e3/31/dae3312aa1f15f876ebd363898847e23.jpg";
+        else if(id.equals("397656t"))
+            tokenurl = "https://i.pinimg.com/originals/3c/f4/55/3cf45588a840361b54a95141b335b76c.jpg";
         else if (id.equals("3421t") || id.equals("15434t"))
             tokenurl = "https://www.mtg.onl/static/3c152b4fc1c64e3ce21022f53ec16559/4d406/PROXY_Cat_G_1_1.jpg";
         else if (id.equals("73976t"))
diff --git a/projects/mtg/bin/Res/sets/TPR/_cards.dat b/projects/mtg/bin/Res/sets/TPR/_cards.dat
new file mode 100644
index 000000000..94039cba8
--- /dev/null
+++ b/projects/mtg/bin/Res/sets/TPR/_cards.dat
@@ -0,0 +1,1351 @@
+[meta]
+author=Wagic Team
+name=Tempest Remastered
+year=2015-05-06
+total=269
+[/meta]
+[card]
+primitive=Angelic Blessing
+id=397647
+rarity=C
+[/card]
+[card]
+primitive=Angelic Protector
+id=397598
+rarity=U
+[/card]
+[card]
+primitive=Anoint
+id=397397
+rarity=C
+[/card]
+[card]
+primitive=Armor Sliver
+id=397515
+rarity=C
+[/card]
+[card]
+primitive=Armored Pegasus
+id=397411
+rarity=C
+[/card]
+[card]
+primitive=Avenging Angel
+id=397621
+rarity=U
+[/card]
+[card]
+primitive=Bandage
+id=397620
+rarity=C
+[/card]
+[card]
+primitive=Cataclysm
+id=397399
+rarity=M
+[/card]
+[card]
+primitive=Charging Paladin
+id=397634
+rarity=C
+[/card]
+[card]
+primitive=Conviction
+id=397603
+rarity=C
+[/card]
+[card]
+primitive=Disenchant
+id=397544
+rarity=C
+[/card]
+[card]
+primitive=Exalted Dragon
+id=397601
+rarity=R
+[/card]
+[card]
+primitive=Field of Souls
+id=397645
+rarity=R
+[/card]
+[card]
+primitive=Gallantry
+id=397554
+rarity=U
+[/card]
+[card]
+primitive=Gerrard's Battle Cry
+id=397481
+rarity=R
+[/card]
+[card]
+primitive=Humility
+id=397614
+rarity=M
+[/card]
+[card]
+primitive=Kor Chant
+id=397541
+rarity=U
+[/card]
+[card]
+primitive=Master Decoy
+id=397588
+rarity=C
+[/card]
+[card]
+primitive=Mounted Archers
+id=397510
+rarity=C
+[/card]
+[card]
+primitive=Nomads en-Kor
+id=397520
+rarity=C
+[/card]
+[card]
+primitive=Orim, Samite Healer
+id=397460
+rarity=R
+[/card]
+[card]
+primitive=Pacifism
+id=397528
+rarity=U
+[/card]
+[card]
+primitive=Paladin en-Vec
+id=397600
+rarity=R
+[/card]
+[card]
+primitive=Pegasus Stampede
+id=397430
+rarity=U
+[/card]
+[card]
+primitive=Repentance
+id=397644
+rarity=U
+[/card]
+[card]
+primitive=Shackles
+id=397403
+rarity=C
+[/card]
+[card]
+primitive=Shaman en-Kor
+id=397648
+rarity=R
+[/card]
+[card]
+primitive=Smite
+id=397527
+rarity=C
+[/card]
+[card]
+primitive=Soltari Champion
+id=397487
+rarity=U
+[/card]
+[card]
+primitive=Soltari Lancer
+id=397483
+rarity=C
+[/card]
+[card]
+primitive=Soltari Monk
+id=397592
+rarity=U
+[/card]
+[card]
+primitive=Soltari Priest
+id=397657
+rarity=U
+[/card]
+[card]
+primitive=Soltari Trooper
+id=397452
+rarity=C
+[/card]
+[card]
+primitive=Spirit en-Kor
+id=397638
+rarity=C
+[/card]
+[card]
+primitive=Spirit Mirror
+id=397646
+rarity=R
+[/card]
+[card]
+primitive=Standing Troops
+id=397627
+rarity=C
+[/card]
+[card]
+primitive=Staunch Defenders
+id=397552
+rarity=C
+[/card]
+[card]
+primitive=Wall of Essence
+id=397439
+rarity=U
+[/card]
+[card]
+primitive=Warrior en-Kor
+id=397402
+rarity=U
+[/card]
+[card]
+primitive=Winds of Rath
+id=397606
+rarity=R
+[/card]
+[card]
+primitive=Youthful Knight
+id=397413
+rarity=C
+[/card]
+[card]
+primitive=Capsize
+id=397492
+rarity=U
+[/card]
+[card]
+primitive=Counterspell
+id=397612
+rarity=U
+[/card]
+[card]
+primitive=Curiosity
+id=397447
+rarity=U
+[/card]
+[card]
+primitive=Dismiss
+id=397545
+rarity=U
+[/card]
+[card]
+primitive=Dream Halls
+id=397553
+rarity=M
+[/card]
+[card]
+primitive=Dream Prowler
+id=397558
+rarity=U
+[/card]
+[card]
+primitive=Ephemeron
+id=397565
+rarity=R
+[/card]
+[card]
+primitive=Fighting Drake
+id=397491
+rarity=U
+[/card]
+[card]
+primitive=Forbid
+id=397532
+rarity=R
+[/card]
+[card]
+primitive=Gaseous Form
+id=397497
+rarity=C
+[/card]
+[card]
+primitive=Hammerhead Shark
+id=397472
+rarity=C
+[/card]
+[card]
+primitive=Horned Turtle
+id=397526
+rarity=C
+[/card]
+[card]
+primitive=Intuition
+id=397633
+rarity=R
+[/card]
+[card]
+primitive=Killer Whale
+id=397618
+rarity=U
+[/card]
+[card]
+primitive=Legacy's Allure
+id=397409
+rarity=R
+[/card]
+[card]
+primitive=Legerdemain
+id=397503
+rarity=U
+[/card]
+[card]
+primitive=Mana Leak
+id=397471
+rarity=C
+[/card]
+[card]
+primitive=Mawcor
+id=397511
+rarity=R
+[/card]
+[card]
+primitive=Meditate
+id=397394
+rarity=R
+[/card]
+[card]
+primitive=Merfolk Looter
+id=397427
+rarity=C
+[/card]
+[card]
+primitive=Mnemonic Sliver
+id=397643
+rarity=C
+[/card]
+[card]
+primitive=Rootwater Hunter
+id=397607
+rarity=U
+[/card]
+[card]
+primitive=Scrivener
+id=397587
+rarity=C
+[/card]
+[card]
+primitive=Sea Monster
+id=397516
+rarity=C
+[/card]
+[card]
+primitive=Shadow Rift
+id=397405
+rarity=C
+[/card]
+[card]
+primitive=Sift
+id=397514
+rarity=C
+[/card]
+[card]
+primitive=Silver Wyvern
+id=397484
+rarity=R
+[/card]
+[card]
+primitive=Spell Blast
+id=397501
+rarity=C
+[/card]
+[card]
+primitive=Thalakos Drifters
+id=397630
+rarity=U
+[/card]
+[card]
+primitive=Thalakos Scout
+id=397474
+rarity=C
+[/card]
+[card]
+primitive=Thalakos Seer
+id=397525
+rarity=C
+[/card]
+[card]
+primitive=Time Ebb
+id=397608
+rarity=C
+[/card]
+[card]
+primitive=Time Warp
+id=397391
+rarity=M
+[/card]
+[card]
+primitive=Tradewind Rider
+id=397576
+rarity=R
+[/card]
+[card]
+primitive=Twitch
+id=397420
+rarity=C
+[/card]
+[card]
+primitive=Volrath's Curse
+id=397637
+rarity=U
+[/card]
+[card]
+primitive=Wayward Soul
+id=397593
+rarity=C
+[/card]
+[card]
+primitive=Whispers of the Muse
+id=397548
+rarity=C
+[/card]
+[card]
+primitive=Wind Dancer
+id=397478
+rarity=U
+[/card]
+[card]
+primitive=Wind Drake
+id=397626
+rarity=C
+[/card]
+[card]
+primitive=Winged Sliver
+id=397579
+rarity=C
+[/card]
+[card]
+primitive=Cannibalize
+id=397631
+rarity=U
+[/card]
+[card]
+primitive=Carnophage
+id=397570
+rarity=C
+[/card]
+[card]
+primitive=Clot Sliver
+id=397636
+rarity=C
+[/card]
+[card]
+primitive=Coercion
+id=397509
+rarity=C
+[/card]
+[card]
+primitive=Coffin Queen
+id=397562
+rarity=R
+[/card]
+[card]
+primitive=Commander Greven il-Vec
+id=397539
+rarity=R
+[/card]
+[card]
+primitive=Corpse Dance
+id=397625
+rarity=R
+[/card]
+[card]
+primitive=Crovax the Cursed
+id=397613
+rarity=R
+[/card]
+[card]
+primitive=Cursed Flesh
+id=397412
+rarity=C
+[/card]
+[card]
+primitive=Dark Banishing
+id=397458
+rarity=C
+[/card]
+[card]
+primitive=Dark Ritual
+id=397401
+rarity=C
+[/card]
+[card]
+primitive=Dauthi Horror
+id=397594
+rarity=C
+[/card]
+[card]
+primitive=Dauthi Jackal
+id=397473
+rarity=C
+[/card]
+[card]
+primitive=Dauthi Marauder
+id=397395
+rarity=U
+[/card]
+[card]
+primitive=Dauthi Slayer
+id=397417
+rarity=U
+[/card]
+[card]
+primitive=Dauthi Warlord
+id=397508
+rarity=U
+[/card]
+[card]
+primitive=Death Pits of Rath
+id=397493
+rarity=R
+[/card]
+[card]
+primitive=Death Stroke
+id=397559
+rarity=C
+[/card]
+[card]
+primitive=Death's Duet
+id=397632
+rarity=C
+[/card]
+[card]
+primitive=Diabolic Edict
+id=397522
+rarity=C
+[/card]
+[card]
+primitive=Dungeon Shade
+id=397500
+rarity=C
+[/card]
+[card]
+primitive=Evincar's Justice
+id=397615
+rarity=U
+[/card]
+[card]
+primitive=Fugue
+id=397502
+rarity=U
+[/card]
+[card]
+primitive=Gravedigger
+id=397518
+rarity=C
+[/card]
+[card]
+primitive=Kezzerdrix
+id=397470
+rarity=R
+[/card]
+[card]
+primitive=Lab Rats
+id=397640
+rarity=C
+[/card]
+[card]
+primitive=Living Death
+id=397523
+rarity=M
+[/card]
+[card]
+primitive=Necrologia
+id=397595
+rarity=R
+[/card]
+[card]
+primitive=Rats of Rath
+id=397611
+rarity=C
+[/card]
+[card]
+primitive=Reanimate
+id=397423
+rarity=U
+[/card]
+[card]
+primitive=Recurring Nightmare
+id=397441
+rarity=M
+[/card]
+[card]
+primitive=Revenant
+id=397475
+rarity=U
+[/card]
+[card]
+primitive=Sarcomancy
+id=397586
+rarity=U
+[/card]
+[card]
+primitive=Screeching Harpy
+id=397507
+rarity=U
+[/card]
+[card]
+primitive=Serpent Warrior
+id=397652
+rarity=C
+[/card]
+[card]
+primitive=Skyshroud Vampire
+id=397655
+rarity=U
+[/card]
+[card]
+primitive=Spinal Graft
+id=397609
+rarity=C
+[/card]
+[card]
+primitive=Stronghold Assassin
+id=397450
+rarity=R
+[/card]
+[card]
+primitive=Thrull Surgeon
+id=397393
+rarity=C
+[/card]
+[card]
+primitive=Vampire Hounds
+id=397477
+rarity=C
+[/card]
+[card]
+primitive=Wall of Souls
+id=397551
+rarity=U
+[/card]
+[card]
+primitive=Aftershock
+id=397641
+rarity=C
+[/card]
+[card]
+primitive=Anarchist
+id=397533
+rarity=C
+[/card]
+[card]
+primitive=Barbed Sliver
+id=397524
+rarity=C
+[/card]
+[card]
+primitive=Canyon Wildcat
+id=397566
+rarity=C
+[/card]
+[card]
+primitive=Craven Giant
+id=397583
+rarity=C
+[/card]
+[card]
+primitive=Deadshot
+id=397549
+rarity=U
+[/card]
+[card]
+primitive=Fanning the Flames
+id=397555
+rarity=R
+[/card]
+[card]
+primitive=Flame Wave
+id=397629
+rarity=R
+[/card]
+[card]
+primitive=Flowstone Blade
+id=397494
+rarity=C
+[/card]
+[card]
+primitive=Flowstone Mauler
+id=397617
+rarity=U
+[/card]
+[card]
+primitive=Flowstone Wyvern
+id=397581
+rarity=U
+[/card]
+[card]
+primitive=Furnace Brood
+id=397436
+rarity=C
+[/card]
+[card]
+primitive=Goblin Bombardment
+id=397584
+rarity=U
+[/card]
+[card]
+primitive=Kindle
+id=397431
+rarity=C
+[/card]
+[card]
+primitive=Lightning Blast
+id=397444
+rarity=C
+[/card]
+[card]
+primitive=Lowland Giant
+id=397572
+rarity=C
+[/card]
+[card]
+primitive=Mage il-Vec
+id=397599
+rarity=U
+[/card]
+[card]
+primitive=Magmasaur
+id=397434
+rarity=R
+[/card]
+[card]
+primitive=Maniacal Rage
+id=397568
+rarity=C
+[/card]
+[card]
+primitive=Mogg Conscripts
+id=397404
+rarity=C
+[/card]
+[card]
+primitive=Mogg Fanatic
+id=397498
+rarity=C
+[/card]
+[card]
+primitive=Mogg Flunkies
+id=397534
+rarity=C
+[/card]
+[card]
+primitive=Mogg Infestation
+id=397418
+rarity=R
+[/card]
+[card]
+primitive=Mogg Maniac
+id=397480
+rarity=U
+[/card]
+[card]
+primitive=Ogre Shaman
+id=397465
+rarity=R
+[/card]
+[card]
+primitive=Pandemonium
+id=397575
+rarity=R
+[/card]
+[card]
+primitive=Rathi Dragon
+id=397602
+rarity=R
+[/card]
+[card]
+primitive=Renegade Warlord
+id=397463
+rarity=U
+[/card]
+[card]
+primitive=Rolling Thunder
+id=397419
+rarity=U
+[/card]
+[card]
+primitive=Sabertooth Wyvern
+id=397628
+rarity=U
+[/card]
+[card]
+primitive=Sandstone Warrior
+id=397464
+rarity=C
+[/card]
+[card]
+primitive=Searing Touch
+id=397530
+rarity=U
+[/card]
+[card]
+primitive=Seething Anger
+id=397651
+rarity=C
+[/card]
+[card]
+primitive=Shadowstorm
+id=397537
+rarity=U
+[/card]
+[card]
+primitive=Shard Phoenix
+id=397414
+rarity=M
+[/card]
+[card]
+primitive=Shatter
+id=397429
+rarity=C
+[/card]
+[card]
+primitive=Spellshock
+id=397489
+rarity=U
+[/card]
+[card]
+primitive=Spitting Hydra
+id=397642
+rarity=R
+[/card]
+[card]
+primitive=Starke of Rath
+id=397432
+rarity=M
+[/card]
+[card]
+primitive=Stun
+id=397466
+rarity=C
+[/card]
+[card]
+primitive=Wall of Diffusion
+id=397560
+rarity=C
+[/card]
+[card]
+primitive=Aluren
+id=397389
+rarity=R
+[/card]
+[card]
+primitive=Canopy Spider
+id=397437
+rarity=C
+[/card]
+[card]
+primitive=Carnassid
+id=397506
+rarity=U
+[/card]
+[card]
+primitive=Crashing Boars
+id=397512
+rarity=U
+[/card]
+[card]
+primitive=Elven Rite
+id=397428
+rarity=C
+[/card]
+[card]
+primitive=Elvish Fury
+id=397622
+rarity=C
+[/card]
+[card]
+primitive=Endangered Armodon
+id=397407
+rarity=C
+[/card]
+[card]
+primitive=Harrow
+id=397415
+rarity=C
+[/card]
+[card]
+primitive=Heartwood Dryad
+id=397488
+rarity=C
+[/card]
+[card]
+primitive=Heartwood Giant
+id=397440
+rarity=R
+[/card]
+[card]
+primitive=Hermit Druid
+id=397556
+rarity=U
+[/card]
+[card]
+primitive=Horned Sliver
+id=397390
+rarity=C
+[/card]
+[card]
+primitive=Krakilin
+id=397521
+rarity=R
+[/card]
+[card]
+primitive=Lowland Basilisk
+id=397398
+rarity=U
+[/card]
+[card]
+primitive=Manabond
+id=397461
+rarity=R
+[/card]
+[card]
+primitive=Mirri, Cat Warrior
+id=397392
+rarity=R
+[/card]
+[card]
+primitive=Mulch
+id=397563
+rarity=C
+[/card]
+[card]
+primitive=Muscle Sliver
+id=397442
+rarity=C
+[/card]
+[card]
+primitive=Needle Storm
+id=397499
+rarity=U
+[/card]
+[card]
+primitive=Oath of Druids
+id=397400
+rarity=M
+[/card]
+[card]
+primitive=Overrun
+id=397574
+rarity=U
+[/card]
+[card]
+primitive=Provoke
+id=397604
+rarity=C
+[/card]
+[card]
+primitive=Rampant Growth
+id=397623
+rarity=C
+[/card]
+[card]
+primitive=Reality Anchor
+id=397421
+rarity=C
+[/card]
+[card]
+primitive=Recycle
+id=397573
+rarity=R
+[/card]
+[card]
+primitive=Rootbreaker Wurm
+id=397567
+rarity=U
+[/card]
+[card]
+primitive=Rootwalla
+id=397580
+rarity=C
+[/card]
+[card]
+primitive=Skyshroud Elf
+id=397435
+rarity=C
+[/card]
+[card]
+primitive=Skyshroud Troll
+id=397589
+rarity=C
+[/card]
+[card]
+primitive=Spike Breeder
+id=397406
+rarity=U
+[/card]
+[card]
+primitive=Spike Colony
+id=397457
+rarity=C
+[/card]
+[card]
+primitive=Spike Feeder
+id=397486
+rarity=U
+[/card]
+[card]
+primitive=Spike Hatcher
+id=397591
+rarity=R
+[/card]
+[card]
+primitive=Spined Wurm
+id=397454
+rarity=C
+[/card]
+[card]
+primitive=Survival of the Fittest
+id=397535
+rarity=M
+[/card]
+[card]
+primitive=Trained Armodon
+id=397448
+rarity=C
+[/card]
+[card]
+primitive=Tranquility
+id=397519
+rarity=U
+[/card]
+[card]
+primitive=Verdant Force
+id=397577
+rarity=R
+[/card]
+[card]
+primitive=Verdant Touch
+id=397496
+rarity=U
+[/card]
+[card]
+primitive=Verdigris
+id=397538
+rarity=C
+[/card]
+[card]
+primitive=Wall of Blossoms
+id=397479
+rarity=U
+[/card]
+[card]
+primitive=Acidic Sliver
+id=397564
+rarity=U
+[/card]
+[card]
+primitive=Crystalline Sliver
+id=397513
+rarity=U
+[/card]
+[card]
+primitive=Dracoplasm
+id=397485
+rarity=R
+[/card]
+[card]
+primitive=Hibernation Sliver
+id=397495
+rarity=U
+[/card]
+[card]
+primitive=Selenia, Dark Angel
+id=397639
+rarity=R
+[/card]
+[card]
+primitive=Sliver Queen
+id=397585
+rarity=M
+[/card]
+[card]
+primitive=Soltari Guerrillas
+id=397650
+rarity=R
+[/card]
+[card]
+primitive=Spined Sliver
+id=397578
+rarity=U
+[/card]
+[card]
+primitive=Vhati il-Dal
+id=397504
+rarity=R
+[/card]
+[card]
+primitive=Victual Sliver
+id=397416
+rarity=U
+[/card]
+[card]
+primitive=Wood Sage
+id=397455
+rarity=R
+[/card]
+[card]
+primitive=Bottle Gnomes
+id=397557
+rarity=C
+[/card]
+[card]
+primitive=Coat of Arms
+id=397422
+rarity=R
+[/card]
+[card]
+primitive=Coiled Tinviper
+id=397396
+rarity=C
+[/card]
+[card]
+primitive=Cursed Scroll
+id=397653
+rarity=M
+[/card]
+[card]
+primitive=Emmessi Tome
+id=397542
+rarity=U
+[/card]
+[card]
+primitive=Erratic Portal
+id=397649
+rarity=R
+[/card]
+[card]
+primitive=Grindstone
+id=397443
+rarity=M
+[/card]
+[card]
+primitive=Jinxed Idol
+id=397505
+rarity=R
+[/card]
+[card]
+primitive=Lotus Petal
+id=397468
+rarity=U
+[/card]
+[card]
+primitive=Metallic Sliver
+id=397569
+rarity=C
+[/card]
+[card]
+primitive=Mindless Automaton
+id=397449
+rarity=R
+[/card]
+[card]
+primitive=Mox Diamond
+id=397482
+rarity=M
+[/card]
+[card]
+primitive=Patchwork Gnomes
+id=397408
+rarity=C
+[/card]
+[card]
+primitive=Phyrexian Hulk
+id=397571
+rarity=U
+[/card]
+[card]
+primitive=Skyshaper
+id=397424
+rarity=C
+[/card]
+[card]
+primitive=Telethopter
+id=397462
+rarity=C
+[/card]
+[card]
+primitive=Thopter Squadron
+id=397624
+rarity=R
+[/card]
+[card]
+primitive=Volrath's Laboratory
+id=397656
+rarity=R
+[/card]
+[card]
+primitive=Caldera Lake
+id=397490
+rarity=U
+[/card]
+[card]
+primitive=Cinder Marsh
+id=397547
+rarity=U
+[/card]
+[card]
+primitive=City of Traitors
+id=397543
+rarity=R
+[/card]
+[card]
+primitive=Maze of Shadows
+id=397445
+rarity=U
+[/card]
+[card]
+primitive=Mogg Hollows
+id=397459
+rarity=U
+[/card]
+[card]
+primitive=Pine Barrens
+id=397425
+rarity=U
+[/card]
+[card]
+primitive=Rootwater Depths
+id=397536
+rarity=U
+[/card]
+[card]
+primitive=Salt Flats
+id=397590
+rarity=U
+[/card]
+[card]
+primitive=Scabland
+id=397438
+rarity=U
+[/card]
+[card]
+primitive=Skyshroud Forest
+id=397616
+rarity=U
+[/card]
+[card]
+primitive=Stalking Stones
+id=397410
+rarity=U
+[/card]
+[card]
+primitive=Thalakos Lowlands
+id=397446
+rarity=U
+[/card]
+[card]
+primitive=Vec Townships
+id=397451
+rarity=U
+[/card]
+[card]
+primitive=Volrath's Stronghold
+id=397619
+rarity=M
+[/card]
+[card]
+primitive=Wasteland
+id=397531
+rarity=R
+[/card]
+[card]
+primitive=Plains
+id=397550
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=397469
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=397610
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=397433
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=397456
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=397476
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=397596
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=397654
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=397529
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=397635
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=397426
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=397467
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=397605
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=397561
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=397546
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=397597
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=397540
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=397453
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=397582
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=397517
+rarity=L
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index d09d1c9b6..28386f564 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -11,6 +11,46 @@ power=5
 toughness=5
 [/card]
 [card]
+name=Coat of Arms
+auto=lord(creature|battlefield) foreach(other creature[share!type!]|battlefield) 1/1
+text=Each creature gets +1/+1 for each other creature on the battlefield that shares at least one creature type with it. (For example, it two Goblin Warriors and a Goblin Shaman are on the battlefield, each gets +2/+2.)
+mana={5}
+type=Artifact
+[/card]
+[card]
+name=Cannibalize
+auto=choice name(Opponent's creatures) moveTo(exile) target(creature|opponentbattlefield) && counter(1/1,2) target(other creature|oppponentbattlefield)
+auto=choice name(my creatures) moveTo(exile) target(creature|mybattlefield) && counter(1/1,2) target(other creature|mybattlefield)
+text=Choose two target creatures controlled by the same player. Exile one of those creatures and put two +1/+1 counters on the other.
+mana={1}{B}
+type=Sorcery
+[/card]
+[card]
+name=Recycle
+auto=phasealter(remove,draw,controller)
+auto=@movedTo(*[-land]|mystack):draw:1
+auto=hmodifer:-5 controller
+text=Skip your draw step. / Whenever you cast a spell, draw a card. / Your maximum hand size is two.
+mana={4}{G}{G}
+type=Enchantment
+[/card]
+[card]
+name=Humility
+auto=lord(creature|battlefield) loseabilities forever
+auto=lord(creature|battlefield) transforms((,setpower=0,settoughness=1)) forever
+text=All creatures loses all abilities and have base power and toughness 1/1.
+mana={2}{W}{W}
+type=Enchantment
+[/card]
+[card]
+name=Dream Halls
+auto={D(*|myhand)}: castcard(restricted) lord(*[share!color!][-land]|myhand) controller oneshot
+auto={D(*|opponenthand)}: castcard(restricted) lord(*[share!color!][-land]|opponenthand) opponent oneshot
+text=Rather than pay the mana cost for a spell, its controller may discard a card that share a color with that spell.
+mana={3}{U}{U}
+type=Enchantment
+[/card]
+[card]
 name=Gilded Light
 auto=playershroud ueot
 autohand=__CYCLING__({2})
diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
index 08a1e3983..63b2f9567 100644
--- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt
+++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
@@ -2098,12 +2098,6 @@ mana={3}{BG}
 type=Instant
 [/card]
 [card]
-name=Cannibalize
-text=Choose two target creatures controlled by the same player. Exile one of those creatures and put two +1/+1 counters on the other.
-mana={1}{B}
-type=Sorcery
-[/card]
-[card]
 name=Capital Punishment
 text=Council's dilemma — Starting with you, each player votes for death or taxes. Each opponent sacrifices a creature for each death vote and discards a card for each taxes vote.
 mana={4}{B}{B}
@@ -2845,12 +2839,6 @@ power=1
 toughness=5
 [/card]
 [card]
-name=Coat of Arms
-text=Each creature gets +1/+1 for each other creature on the battlefield that shares at least one creature type with it. (For example, if two Goblin Warriors and a Goblin Shaman are on the battlefield, each gets +2/+2.)
-mana={5}
-type=Artifact
-[/card]
-[card]
 name=Coax from the Blind Eternities
 text=You may choose an Eldrazi card you own from outside the game or in exile, reveal that card, and put it into your hand.
 mana={2}{U}
@@ -4622,12 +4610,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Dream Halls
-text=Rather than pay the mana cost for a spell, its controller may discard a card that shares a color with that spell.
-mana={3}{U}{U}
-type=Enchantment
-[/card]
-[card]
 name=Dream Salvage
 text=Draw cards equal to the number of cards target opponent discarded this turn.
 mana={UB}
@@ -7861,12 +7843,6 @@ mana={2}{G}{G}
 type=Enchantment
 [/card]
 [card]
-name=Humility
-text=All creatures lose all abilities and have base power and toughness 1/1.
-mana={2}{W}{W}
-type=Enchantment
-[/card]
-[card]
 name=Hundred-Handed One
 abilities=vigilance
 text=Vigilance -- {3}{W}{W}{W}: Monstrosity 3. (If this creature isn't monstrous, put three +1/+1 counters on it and it becomes monstrous.) -- As long as Hundred-Handed One is monstrous, it has reach and can block an additional ninety-nine creatures each combat.
@@ -13917,12 +13893,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Recycle
-text=Skip your draw step. -- Whenever you play a card, draw a card. -- Your maximum hand size is two.
-mana={4}{G}{G}
-type=Enchantment
-[/card]
-[card]
 name=Redeem the Lost
 text=Target creature you control gains protection from the color of your choice until end of turn. Clash with an opponent. If you win, return Redeem the Lost to its owner's hand. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
 mana={1}{W}