diff --git a/projects/mtg/bin/Res/sets/CMD/cards_dat.txt b/projects/mtg/bin/Res/sets/CMD/cards_dat.txt
new file mode 100644
index 000000000..9bb01eadf
--- /dev/null
+++ b/projects/mtg/bin/Res/sets/CMD/cards_dat.txt
@@ -0,0 +1,1601 @@
+[meta]
+author=Wagic Team
+name=Commando
+year=2011
+[/meta]
+[card]
+primitive=Acidic Slime
+id=247317
+rarity=U
+[/card]
+[card]
+primitive=Acorn Catapult
+id=233197
+rarity=R
+[/card]
+[card]
+primitive=AEthersnipe
+id=247295
+rarity=C
+[/card]
+[card]
+primitive=Afterlife
+id=247330
+rarity=U
+[/card]
+[card]
+primitive=Akoum Refuge
+id=247543
+rarity=U
+[/card]
+[card]
+primitive=Akroma, Angel of Fury
+id=247358
+rarity=R
+[/card]
+[card]
+primitive=Akroma's Vengeance
+id=247343
+rarity=R
+[/card]
+[card]
+primitive=Alliance of Arms
+id=228218
+rarity=R
+[/card]
+[card]
+primitive=Angel of Despair
+id=247275
+rarity=R
+[/card]
+[card]
+primitive=Angelic Arbiter
+id=247318
+rarity=R
+[/card]
+[card]
+primitive=Anger
+id=247289
+rarity=U
+[/card]
+[card]
+primitive=Animar, Soul of Elements
+id=236504
+rarity=M
+[/card]
+[card]
+primitive=Aquastrand Spider
+id=247188
+rarity=C
+[/card]
+[card]
+primitive=Arbiter of Knollridge
+id=247296
+rarity=R
+[/card]
+[card]
+primitive=Archangel of Strife
+id=228246
+rarity=R
+[/card]
+[card]
+primitive=Armillary Sphere
+id=247177
+rarity=C
+[/card]
+[card]
+primitive=Artisan of Kozilek
+id=247392
+rarity=U
+[/card]
+[card]
+primitive=Attrition
+id=247522
+rarity=R
+[/card]
+[card]
+primitive=Aura Shards
+id=247184
+rarity=U
+[/card]
+[card]
+primitive=Austere Command
+id=247297
+rarity=R
+[/card]
+[card]
+primitive=Avatar of Fury
+id=247367
+rarity=R
+[/card]
+[card]
+primitive=Avatar of Slaughter
+id=236497
+rarity=R
+[/card]
+[card]
+primitive=Avatar of Woe
+id=247520
+rarity=R
+[/card]
+[card]
+primitive=Awakening Zone
+id=247393
+rarity=R
+[/card]
+[card]
+primitive=Azorius Chancery
+id=247189
+rarity=C
+[/card]
+[card]
+primitive=Azorius Guildmage
+id=247190
+rarity=U
+[/card]
+[card]
+primitive=Baloth Woodcrasher
+id=247544
+rarity=U
+[/card]
+[card]
+primitive=Barren Moor
+id=247344
+rarity=C
+[/card]
+[card]
+primitive=Basandra, Battle Seraph
+id=236490
+rarity=R
+[/card]
+[card]
+primitive=Bathe in Light
+id=247370
+rarity=U
+[/card]
+[card]
+primitive=Bestial Menace
+id=247535
+rarity=U
+[/card]
+[card]
+primitive=Bladewing the Risen
+id=247401
+rarity=R
+[/card]
+[card]
+primitive=Bujoka Bog
+id=247536
+rarity=C
+[/card]
+[card]
+primitive=Boros Garrison
+id=247371
+rarity=C
+[/card]
+[card]
+primitive=Boros Guildmage
+id=247372
+rarity=C
+[/card]
+[card]
+primitive=Boros Signet
+id=247373
+rarity=C
+[/card]
+[card]
+primitive=Brainstorm
+id=247331
+rarity=C
+[/card]
+[card]
+primitive=Brawn
+id=247290
+rarity=U
+[/card]
+[card]
+primitive=Breath of Darigaaz
+id=247185
+rarity=U
+[/card]
+[card]
+primitive=Brion Stoutarm
+id=247298
+rarity=R
+[/card]
+[card]
+primitive=Buried Alive
+id=247342
+rarity=U
+[/card]
+[card]
+primitive=Butcher of Malakir
+id=247537
+rarity=R
+[/card]
+[card]
+primitive=Call the Skybreaker
+id=247202
+rarity=R
+[/card]
+[card]
+primitive=Celestial Force
+id=228257
+rarity=R
+[/card]
+[card]
+primitive=Chain Reaction
+id=247538
+rarity=R
+[/card]
+[card]
+primitive=Champion's Helm
+id=233200
+rarity=R
+[/card]
+[card]
+primitive=Chaos Warp
+id=236466
+rarity=R
+[/card]
+[card]
+primitive=Chartooth Cougar
+id=247402
+rarity=C
+[/card]
+[card]
+primitive=Chorus of the Conclave
+id=247374
+rarity=R
+[/card]
+[card]
+primitive=Chromeshell Crab
+id=247294
+rarity=R
+[/card]
+[card]
+primitive=Cleansing Beam
+id=247375
+rarity=U
+[/card]
+[card]
+primitive=Cobra Trap
+id=247545
+rarity=U
+[/card]
+[card]
+primitive=Collective Voyage
+id=241854
+rarity=R
+[/card]
+[card]
+primitive=Colossal Might
+id=247164
+rarity=C
+[/card]
+[card]
+primitive=Comet Storm
+id=247539
+rarity=M
+[/card]
+[card]
+primitive=Command Tower
+id=237004
+rarity=C
+[/card]
+[card]
+primitive=Congregate
+id=247526
+rarity=C
+[/card]
+[card]
+primitive=Conundrum Sphinx
+id=247319
+rarity=R
+[/card]
+[card]
+primitive=Court Hussar
+id=247191
+rarity=U
+[/card]
+[card]
+primitive=Crescendo of War
+id=228253
+rarity=R
+[/card]
+[card]
+primitive=Cultivate
+id=247320
+rarity=C
+[/card]
+[card]
+primitive=Damia, Sage of Stone
+id=236479
+rarity=M
+[/card]
+[card]
+primitive=Dark Hatchling
+id=247527
+rarity=R
+[/card]
+[card]
+primitive=Darksteel Ingot
+id=247200
+rarity=C
+[/card]
+[card]
+primitive=Deadly Recluse
+id=247313
+rarity=C
+[/card]
+[card]
+primitive=Deadwood Treefolk
+id=247359
+rarity=U
+[/card]
+[card]
+primitive=Death by Dragons
+id=229988
+rarity=U
+[/card]
+[card]
+primitive=Death Mutation
+id=247158
+rarity=U
+[/card]
+[card]
+primitive=Desecrator Hag
+id=247203
+rarity=C
+[/card]
+[card]
+primitive=Diabolic Tutor
+id=247321
+rarity=U
+[/card]
+[card]
+primitive=Dimir Aqueduct
+id=247376
+rarity=C
+[/card]
+[card]
+primitive=Dimir Signet
+id=247377
+rarity=C
+[/card]
+[card]
+primitive=Disaster Radius
+id=247394
+rarity=R
+[/card]
+[card]
+primitive=Dominus of Fealty
+id=247204
+rarity=R
+[/card]
+[card]
+primitive=Doom Blade
+id=247322
+rarity=C
+[/card]
+[card]
+primitive=Dragon Whelp
+id=247314
+rarity=U
+[/card]
+[card]
+primitive=Dread Cacodemon
+id=228228
+rarity=R
+[/card]
+[card]
+primitive=Dreadship Reef
+id=247513
+rarity=U
+[/card]
+[card]
+primitive=Dreamborn Muse
+id=247140
+rarity=R
+[/card]
+[card]
+primitive=Dreamstone Hedron
+id=247395
+rarity=U
+[/card]
+[card]
+primitive=Duergar Hedge-Mage
+id=247205
+rarity=U
+[/card]
+[card]
+primitive=Earthquake
+id=247315
+rarity=R
+[/card]
+[card]
+primitive=Edric, Spymaster of Trest
+id=230000
+rarity=R
+[/card]
+[card]
+primitive=Electrolyze
+id=247276
+rarity=U
+[/card]
+[card]
+primitive=Elvish Aberration
+id=247403
+rarity=U
+[/card]
+[card]
+primitive=Eternal Witness
+id=247148
+rarity=U
+[/card]
+[card]
+primitive=Evincar's Justice
+id=247415
+rarity=C
+[/card]
+[card]
+primitive=Evolving Wilds
+id=247396
+rarity=C
+[/card]
+[card]
+primitive=Explosive Vegetation
+id=247345
+rarity=U
+[/card]
+[card]
+primitive=Extractor Demon
+id=247178
+rarity=R
+[/card]
+[card]
+primitive=Fact or Fiction
+id=247186
+rarity=U
+[/card]
+[card]
+primitive=Fallen Angel
+id=247150
+rarity=R
+[/card]
+[card]
+primitive=False Prophet
+id=247523
+rarity=R
+[/card]
+[card]
+primitive=Fault Grinder
+id=247299
+rarity=C
+[/card]
+[card]
+primitive=Fellwar Stone
+id=247152
+rarity=U
+[/card]
+[card]
+primitive=Fertilid
+id=247335
+rarity=C
+[/card]
+[card]
+primitive=Fierce Empath
+id=247404
+rarity=C
+[/card]
+[card]
+primitive=Fire // Ice
+id=247159
+rarity=U
+[/card]
+[card]
+primitive=Firespout
+id=247407
+rarity=U
+[/card]
+[card]
+primitive=Fists of Ironwood
+id=247378
+rarity=C
+[/card]
+[card]
+primitive=Flametongue Kavu
+id=247368
+rarity=U
+[/card]
+[card]
+primitive=Fleshbag Marauder
+id=247153
+rarity=U
+[/card]
+[card]
+primitive=Fluster Storm
+id=228255
+rarity=R
+[/card]
+[card]
+primitive=Fog Bank
+id=247528
+rarity=U
+[/card]
+[card]
+primitive=Footbottom Feast
+id=247300
+rarity=C
+[/card]
+[card]
+primitive=Forest
+id=249801
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=249803
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=249800
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=249802
+rarity=L
+[/card]
+[card]
+primitive=Forgotten Cave
+id=247346
+rarity=C
+[/card]
+[card]
+primitive=Fungal Reaches
+id=247514
+rarity=U
+[/card]
+[card]
+primitive=Furnace Whelp
+id=247141
+rarity=U
+[/card]
+[card]
+primitive=Garruk Wildspeaker
+id=247323
+rarity=M
+[/card]
+[card]
+primitive=Ghave, Guru of Spores
+id=236501
+rarity=M
+[/card]
+[card]
+primitive=Ghostly Prison
+id=247173
+rarity=U
+[/card]
+[card]
+primitive=Goblin Cadets
+id=247529
+rarity=U
+[/card]
+[card]
+primitive=Golgari Guildmage
+id=247379
+rarity=U
+[/card]
+[card]
+primitive=Golgari Rot Farm
+id=247380
+rarity=C
+[/card]
+[card]
+primitive=Golgari Signet
+id=247381
+rarity=C
+[/card]
+[card]
+primitive=Gomazoa
+id=247546
+rarity=U
+[/card]
+[card]
+primitive=Grave Pact
+id=247142
+rarity=R
+[/card]
+[card]
+primitive=Gravedigger
+id=247324
+rarity=C
+[/card]
+[card]
+primitive=Gruul Signet
+id=247277
+rarity=C
+[/card]
+[card]
+primitive=Gruul Turf
+id=247278
+rarity=C
+[/card]
+[card]
+primitive=Guard Gomazoa
+id=247397
+rarity=U
+[/card]
+[card]
+primitive=Gwyllion Hedge-Mage
+id=247206
+rarity=U
+[/card]
+[card]
+primitive=Harmonize
+id=247360
+rarity=U
+[/card]
+[card]
+primitive=Hex
+id=247382
+rarity=R
+[/card]
+[card]
+primitive=Homeward Path
+id=233201
+rarity=R
+[/card]
+[card]
+primitive=Hornet Queen
+id=238141
+rarity=R
+[/card]
+[card]
+primitive=Hour of Reckoning
+id=247383
+rarity=R
+[/card]
+[card]
+primitive=Howling Mine
+id=247316
+rarity=R
+[/card]
+[card]
+primitive=Hull Breach
+id=247369
+rarity=C
+[/card]
+[card]
+primitive=Hunting Pack
+id=247405
+rarity=U
+[/card]
+[card]
+primitive=Hydra Omnivore
+id=228247
+rarity=R
+[/card]
+[card]
+primitive=Insurrection
+id=247347
+rarity=R
+[/card]
+[card]
+primitive=Intet, the Dreamer
+id=247361
+rarity=R
+[/card]
+[card]
+primitive=Invigorate
+id=247332
+rarity=C
+[/card]
+[card]
+primitive=Island
+id=249807
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=249804
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=249806
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=249805
+rarity=L
+[/card]
+[card]
+primitive=Izzet Boilerworks
+id=247279
+rarity=C
+[/card]
+[card]
+primitive=Izzet Chronarch
+id=247280
+rarity=C
+[/card]
+[card]
+primitive=Izzet Signet
+id=247281
+rarity=C
+[/card]
+[card]
+primitive=Jötun Grunt
+id=247182
+rarity=U
+[/card]
+[card]
+primitive=Journey to Nowhere
+id=247547
+rarity=C
+[/card]
+[card]
+primitive=Jwar Isle Refuge
+id=247548
+rarity=U
+[/card]
+[card]
+primitive=Kaalia of the Vast
+id=236473
+rarity=M
+[/card]
+[card]
+primitive=Karador, Ghost Chieftain
+id=236468
+rarity=M
+[/card]
+[card]
+primitive=Kazandu Refuge
+id=247549
+rarity=U
+[/card]
+[card]
+primitive=Kodama's Reach
+id=247174
+rarity=C
+[/card]
+[card]
+primitive=Krosan Tusker
+id=247348
+rarity=C
+[/card]
+[card]
+primitive=Lash Out
+id=247301
+rarity=C
+[/card]
+[card]
+primitive=Lhurgoyf
+id=247151
+rarity=R
+[/card]
+[card]
+primitive=Lightkeeper of Emeria
+id=247540
+rarity=U
+[/card]
+[card]
+primitive=Lightning Greaves
+id=247337
+rarity=U
+[/card]
+[card]
+primitive=Living Death
+id=247416
+rarity=R
+[/card]
+[card]
+primitive=Lonely Sandbar
+id=247349
+rarity=C
+[/card]
+[card]
+primitive=Magmatic Force
+id=228241
+rarity=R
+[/card]
+[card]
+primitive=Magus of the Vineyard
+id=247273
+rarity=R
+[/card]
+[card]
+primitive=Malfegor
+id=247179
+rarity=M
+[/card]
+[card]
+primitive=Mana-Charged Dragon
+id=236465
+rarity=R
+[/card]
+[card]
+primitive=Martyr's Bond
+id=236481
+rarity=R
+[/card]
+[card]
+primitive=Master Warcraft
+id=247384
+rarity=R
+[/card]
+[card]
+primitive=Memory Erosion
+id=247154
+rarity=R
+[/card]
+[card]
+primitive=Minds Aglow
+id=241853
+rarity=R
+[/card]
+[card]
+primitive=Molten Slagheap
+id=247515
+rarity=U
+[/card]
+[card]
+primitive=Monk Realist
+id=247530
+rarity=C
+[/card]
+[card]
+primitive=Mortify
+id=247282
+rarity=C
+[/card]
+[card]
+primitive=Mortivore
+id=247143
+rarity=R
+[/card]
+[card]
+primitive=Mother of Runes
+id=247525
+rarity=U
+[/card]
+[card]
+primitive=Mountain
+id=249809
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=249810
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=249808
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=249811
+rarity=L
+[/card]
+[card]
+primitive=Mulldrifter
+id=247302
+rarity=C
+[/card]
+[card]
+primitive=Murmurs from Beyond
+id=247410
+rarity=C
+[/card]
+[card]
+primitive=Nantuko Husk
+id=247144
+rarity=U
+[/card]
+[card]
+primitive=Necrogenesis
+id=247155
+rarity=U
+[/card]
+[card]
+primitive=Nemesis Trap
+id=247541
+rarity=U
+[/card]
+# need to find a way to deal with multipart cards
+#[card]
+#primitive=Nezumi Graverobber (Nighteyes the Desecrator)
+#id=247175
+#rarity=U
+#[/card]
+[card]
+primitive=Nin, the Pain Artist
+id=236471
+rarity=R
+[/card]
+[card]
+primitive=Nucklavee
+id=247207
+rarity=U
+[/card]
+[card]
+primitive=Numot, the Devastator
+id=247362
+rarity=R
+[/card]
+[card]
+primitive=Oblation
+id=247350
+rarity=R
+[/card]
+[card]
+primitive=Oblivion Ring
+id=247156
+rarity=C
+[/card]
+[card]
+primitive=Oblivion Stone
+id=247388
+rarity=R
+[/card]
+[card]
+primitive=Oni of Wild Places
+id=247411
+rarity=U
+[/card]
+[card]
+primitive=Orim's Thunder
+id=247161
+rarity=C
+[/card]
+[card]
+primitive=Oros, the Avenger
+id=247363
+rarity=R
+[/card]
+[card]
+primitive=Orzhov Basilica
+id=247283
+rarity=C
+[/card]
+[card]
+primitive=Orzhov Guildmage
+id=247284
+rarity=U
+[/card]
+[card]
+primitive=Orzhov Signet
+id=247285
+rarity=C
+[/card]
+[card]
+primitive=Patron of the Nezumi
+id=247171
+rarity=R
+[/card]
+[card]
+primitive=Path to Exile
+id=247180
+rarity=U
+[/card]
+[card]
+primitive=Penumbra Spider
+id=247516
+rarity=C
+[/card]
+[card]
+primitive=Perilous Research
+id=247183
+rarity=U
+[/card]
+[card]
+primitive=Plains
+id=249813
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=249814
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=249815
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=249812
+rarity=L
+[/card]
+[card]
+primitive=Plumeveil
+id=247408
+rarity=U
+[/card]
+[card]
+primitive=Pollen Lullaby
+id=247303
+rarity=U
+[/card]
+[card]
+primitive=Prison Term
+id=247409
+rarity=U
+[/card]
+[card]
+primitive=Propaganda
+id=247417
+rarity=U
+[/card]
+[card]
+primitive=Prophetic Bolt
+id=247162
+rarity=U
+[/card]
+[card]
+primitive=Prophetic Prism
+id=247398
+rarity=C
+[/card]
+[card]
+primitive=Punishing Fire
+id=247550
+rarity=U
+[/card]
+[card]
+primitive=Pyrohemia
+id=247364
+rarity=U
+[/card]
+[card]
+primitive=Rakdos Carnarium
+id=247192
+rarity=C
+[/card]
+[card]
+primitive=Rakdos Signet
+id=247193
+rarity=C
+[/card]
+[card]
+primitive=Rapacious One
+id=247399
+rarity=U
+[/card]
+[card]
+primitive=Ray of Command
+id=247329
+rarity=C
+[/card]
+[card]
+primitive=Razorjaw Oni
+id=247412
+rarity=U
+[/card]
+[card]
+primitive=Reins of Power
+id=247413
+rarity=R
+[/card]
+[card]
+primitive=Reiver Demon
+id=247339
+rarity=R
+[/card]
+[card]
+primitive=Relic Crush
+id=247187
+rarity=C
+[/card]
+[card]
+primitive=Repulse
+id=247551
+rarity=C
+[/card]
+[card]
+primitive=Return to Dust
+id=247187
+rarity=U
+[/card]
+[card]
+primitive=Riddlekeeper
+id=238138
+rarity=R
+[/card]
+[card]
+primitive=Righteous Cause
+id=247351
+rarity=U
+[/card]
+[card]
+primitive=Riku of Two Reflections
+id=236469
+rarity=M
+[/card]
+[card]
+primitive=Rise from the Grave
+id=247351
+rarity=U
+[/card]
+[card]
+primitive=Ruhan of the Fomori
+id=236477
+rarity=M
+[/card]
+[card]
+primitive=Scavenging Ooze
+id=247325
+rarity=R
+[/card]
+[card]
+primitive=Ruination
+id=247414
+rarity=R
+[/card]
+[card]
+primitive=Rupture Spire
+id=247181
+rarity=C
+[/card]
+[card]
+primitive=Sakura-Tribe Elder
+id=247176
+rarity=C
+[/card]
+[card]
+primitive=Savage Twister
+id=247286
+rarity=U
+[/card]
+[card]
+primitive=Scattering Stroke
+id=247304
+rarity=U
+[/card]
+[card]
+primitive=Scavenging Ooze
+id=233181
+rarity=R
+[/card]
+[card]
+primitive=Scythe Specter
+id=236500
+rarity=R
+[/card]
+[card]
+primitive=Secluded Steppe
+id=247352
+rarity=C
+[/card]
+[card]
+primitive=Selesnya Evangel
+id=247385
+rarity=C
+[/card]
+[card]
+primitive=Selesnya Guildmage
+id=247386
+rarity=U
+[/card]
+[card]
+primitive=Selesnya Sanctuary
+id=247387
+rarity=C
+[/card]
+[card]
+primitive=Selesnya Signet
+id=247388
+rarity=C
+[/card]
+[card]
+primitive=Serra Angel
+id=247326
+rarity=U
+[/card]
+[card]
+primitive=Sewer Nemesis
+id=236482
+rarity=R
+[/card]
+[card]
+primitive=Shared Trauma
+id=228259
+rarity=R
+[/card]
+[card]
+primitive=Shattered Angel
+id=247341
+rarity=U
+[/card]
+[card]
+primitive=Shriekmaw
+id=247305
+rarity=U
+[/card]
+[card]
+primitive=Sigil Captain
+id=247165
+rarity=U
+[/card]
+[card]
+primitive=Sign in Blood
+id=247327
+rarity=C
+[/card]
+[card]
+primitive=Simic Growth Chamber
+id=247194
+rarity=C
+[/card]
+[card]
+primitive=Simic Signet
+id=247195
+rarity=C
+[/card]
+[card]
+primitive=Simic Sky Swallower
+id=247196
+rarity=R
+[/card]
+[card]
+primitive=Skullbriar, the Walking Grave
+id=236485
+rarity=R
+[/card]
+[card]
+primitive=Skullclamp
+id=247201
+rarity=U
+[/card]
+[card]
+primitive=Skyscribing
+id=247197
+rarity=U
+[/card]
+[card]
+primitive=Slipstream Eel
+id=247353
+rarity=C
+[/card]
+[card]
+primitive=Sol Ring
+id=247533
+rarity=U
+[/card]
+[card]
+primitive=Solemn Simulacrum
+id=247340
+rarity=R
+[/card]
+[card]
+primitive=Soul Snare
+id=238136
+rarity=U
+[/card]
+[card]
+primitive=Spawnwrithe
+id=259016
+rarity=R
+[/card]
+[card]
+primitive=Spell Crumple
+id=237005
+rarity=U
+[/card]
+[card]
+primitive=Spitebellows
+id=247336
+rarity=U
+[/card]
+[card]
+primitive=Spike Feeder
+id=247521
+rarity=U
+[/card]
+[card]
+primitive=Spurnmage Advocate
+id=247291
+rarity=U
+[/card]
+[card]
+primitive=Squallmonger
+id=247333
+rarity=U
+[/card]
+[card]
+primitive=Stitch Together
+id=247292
+rarity=U
+[/card]
+[card]
+primitive=Storm Herd
+id=247287
+rarity=R
+[/card]
+[card]
+primitive=Stranglehold
+id=233183
+rarity=R
+[/card]
+[card]
+primitive=Sulfurous Blast
+id=247518
+rarity=U
+[/card]
+[card]
+primitive=Svogthos, the Restless Tomb
+id=247389
+rarity=U
+[/card]
+[card]
+primitive=Swamp
+id=249819
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=249816
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=249818
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=249817
+rarity=L
+[/card]
+[card]
+primitive=Symbiotic Wurm
+id=247354
+rarity=R
+[/card]
+[card]
+primitive=Syphon Flesh
+id=233218
+rarity=U
+[/card]
+[card]
+primitive=Syphon Mind
+id=247355
+rarity=C
+[/card]
+[card]
+primitive=Szadek, Lord of Secrets
+id=247390
+rarity=R
+[/card]
+[card]
+primitive=Tariel, Reckoner of Souls
+id=236995
+rarity=M
+[/card]
+[card]
+primitive=Temple of the False God
+id=247406
+rarity=U
+[/card]
+[card]
+primitive=Teneb, the Harvester
+id=247365
+rarity=R
+[/card]
+[card]
+primitive=Terminate
+id=247166
+rarity=C
+[/card]
+[card]
+primitive=Terramorphic Expanse
+id=247328
+rarity=C
+[/card]
+[card]
+primitive=The Mimeoplasm
+id=228232
+rarity=M
+[/card]
+[card]
+primitive=Trade Secrets
+id=247356
+rarity=R
+[/card]
+[card]
+primitive=Tranquil Thicket
+id=247357
+rarity=C
+[/card]
+[card]
+primitive=Trench Gorger
+id=228242
+rarity=R
+[/card]
+[card]
+primitive=Tribute to the Wild
+id=236998
+rarity=U
+[/card]
+[card]
+primitive=Triskelavus
+id=247519
+rarity=R
+[/card]
+[card]
+primitive=Troll Ascetic
+id=247145
+rarity=R
+[/card]
+[card]
+primitive=Unnerve
+id=247531
+rarity=C
+[/card]
+[card]
+primitive=Valley Rannet
+id=247167
+rarity=C
+[/card]
+[card]
+primitive=Vampire Nighthawk
+id=247552
+rarity=U
+[/card]
+[card]
+primitive=Vedalken Plotter
+id=247288
+rarity=U
+[/card]
+[card]
+primitive=Vengeful Rebirth
+id=247168
+rarity=U
+[/card]
+[card]
+primitive=Veteran Explorer
+id=247534
+rarity=U
+[/card]
+[card]
+primitive=Vish Kal, Blood Arbiter
+id=236487
+rarity=R
+[/card]
+[card]
+primitive=Vision Skeins
+id=247198
+rarity=C
+[/card]
+[card]
+primitive=Vivid Crag
+id=247306
+rarity=U
+[/card]
+[card]
+primitive=Vivid Creek
+id=247307
+rarity=U
+[/card]
+[card]
+primitive=Vivid Grove
+id=247308
+rarity=U
+[/card]
+[card]
+primitive=Vivid Meadow
+id=247310
+rarity=U
+[/card]
+[card]
+primitive=Vivid Marsh
+id=247309
+rarity=U
+[/card]
+[card]
+primitive=Voice of All
+id=247146
+rarity=R
+[/card]
+[card]
+primitive=Vorosh, the Hunter
+id=247366
+rarity=R
+[/card]
+[card]
+primitive=Vow of Duty
+id=236986
+rarity=U
+[/card]
+[card]
+primitive=Vow of Flight
+id=238144
+rarity=U
+[/card]
+[card]
+primitive=Vow of Lightning
+id=236999
+rarity=U
+[/card]
+[card]
+primitive=Vow of Malice
+id=238145
+rarity=U
+[/card]
+[card]
+primitive=Vow of Wildness
+id=238135
+rarity=U
+[/card]
+[card]
+primitive=Vulturous Zombie
+id=247391
+rarity=R
+[/card]
+[card]
+primitive=Wall of Denial
+id=247169
+rarity=U
+[/card]
+[card]
+primitive=Wall of Omens
+id=247400
+rarity=U
+[/card]
+[card]
+primitive=Whirlpool Whelm
+id=247311
+rarity=C
+[/card]
+[card]
+primitive=Wild Ricochet
+id=247312
+rarity=R
+[/card]
+[card]
+primitive=Windborn Muse
+id=247147
+rarity=R
+[/card]
+[card]
+primitive=Windfall
+id=247532
+rarity=U
+[/card]
+[card]
+primitive=Wonder
+id=247293
+rarity=U
+[/card]
+[card]
+primitive=Wrecking Ball
+id=247199
+rarity=C
+[/card]
+[card]
+primitive=Wrexial, the Risen Deep
+id=247542
+rarity=M
+[/card]
+[card]
+primitive=Yavimaya Elder
+id=247524
+rarity=C
+[/card]
+[card]
+primitive=Zedruu the Greathearted
+id=236499
+rarity=M
+[/card]
+[card]
+primitive=Zoetic Cavern
+id=247274
+rarity=U
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 14c62708d..58c1c6714 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -476,6 +476,13 @@ power=0
 toughness=1
 [/card]
 [card]
+name=Acorn Catapult
+auto={1}{T}:damage:1 target(creature,player) && token(Squirrel,Creature Squirrel,1/1,green) targetcontroller
+text=1, {T}: Acorn Catapult deals 1 damage to target creature or player. That creature's controller or that player puts a 1/1 green Squirrel creature token onto the battlefield.
+mana={4}
+type=Artifact
+[/card]
+[card]
 name=Acorn Harvest
 auto=token(Squirrel,creature squirrel, 1/1,green)*2
 flashback={L}{L}{L}{1}{G}
@@ -2083,6 +2090,18 @@ power=2+*
 toughness=2+*
 [/card]
 [card]
+name=Animar, Soul of Elements
+abilities=protection from white,protection from black
+auto=@movedTo(creature|mystack):counter(1/1,1)
+auto=thisforeach(counter{1/1,1}) lord(creature|myhand) altercost(colorless, -1)
+text=Protection from white and from black -- Whenever you cast a creature spell, put a +1/+1 counter on Animar, Soul of Elements. -- Creature spells you cast cost 1 less to cast for each +1/+1 counter on Animar.
+mana={U}{R}{G}
+type=Legendary Creature
+subtype=Elemental
+power=1
+toughness=1
+[/card]
+[card]
 name=Animate Artifact
 target=artifact
 auto=teach(artifact[-creature]) becomes(Artifact Creature,manacost/manacost)
@@ -3827,6 +3846,17 @@ power=8
 toughness=8
 [/card]
 [card]
+name=Avatar of Slaughter
+auto=lord(creature) double strike
+auto=lord(creature) mustattack
+text=All creatures have double strike and attack each turn if able.
+mana={6}{R}{R}
+type=Creature
+subtype=Avatar
+power=8
+toughness=8
+[/card]
+[card]
 name=Avarax
 abilities=haste
 auto=may moveTo(myhand) target(Avarax|mylibrary)
@@ -9994,6 +10024,16 @@ text=Celestial Colonnade enters the battlefield tapped. -- {T}: Add {W} or {U} t
 type=Land
 [/card]
 [card]
+name=Celestial Force
+auto=@each upkeep:life:3 controller
+text=At the beginning of each upkeep, you gain 3 life.
+mana={5}{W}{W}{W}
+type=Creature
+subtype=Elemental
+power=7
+toughness=7
+[/card]
+[card]
 name=Celestial Kirin
 abilities=flying
 auto=@movedTo(*[arcane;spirit;manacost=1]|mystack):destroy all(*[manacost=1])
@@ -10428,6 +10468,15 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Champion's Helm
+auto={1}:equip
+auto=2/2
+auto=teach(creature[legendary]) opponentshroud
+text=Equipped creature gets +2/+2. -- As long as equipped creature is legendary, it has hexproof. -- Equip {1}
+mana={3}
+type=Artifact
+[/card]
+[card]
 name=Champion's Victory
 target=creature[attacking]|opponentBattlefield
 auto=moveTo(ownerhand)
@@ -14932,6 +14981,14 @@ mana={3}{B}{S(creature|mybattlefield)}
 type=Instant
 [/card]
 [card]
+name=Death by Dragons
+auto=choice (you get a Dragon) token(Dragon,Creature Dragon,5/5,red,flying)
+auto=choice (opponent gets a Dragon) token(Dragon,Creature Dragon,5/5,red,flying)
+text=Each player other than target player puts a 5/5 red Dragon creature token with flying onto the battlefield.
+mana={4}{R}{R}
+type=Sorcery
+[/card]
+[card]
 name=Death Cultist
 auto={S}:life:-1 target(player) && life:1 controller
 text=Sacrifice Death Cultist: Target loses 1 life and you gain 1 life.
@@ -17265,6 +17322,18 @@ power=6
 toughness=6
 [/card]
 [card]
+name=Dread Cacodemon
+auto=kicker destroy all(creature|opponentbattlefield)
+auto=kicker tap all(creature|mybattlefield)
+text=When Dread Cacodemon enters the battlefield, if you cast it from your hand, destroy all creatures your opponents control, then tap all other creatures you control.
+mana={7}{B}{B}{B}
+kicker={0}
+type=Creature
+subtype=Demon
+power=8
+toughness=8
+[/card]
+[card]
 name=Dread Charge
 auto=lord(creature|myBattlefield) cantbeblockedby(creature[-black])
 text=Until end of turn, black creatures you control can be blocked only by black creatures.
@@ -18649,6 +18718,16 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Edric, Spymaster of Trest
+auto=@combatdamaged(opponent) from(creature|mybattlefield):may draw:1 controller
+text=Whenever a creature deals combat damage to one of your opponents, that creature's controller may draw a card.
+mana={1}{G}{U}
+type=Legendary Creature
+subtype=Elf Rogue
+power=2
+toughness=2
+[/card]
+[card]
 name=Eerie Procession
 target=arcane|mylibrary
 auto=moveto(myhand)
@@ -30550,6 +30629,17 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Hornet Queen
+abilities=flying,deathtouch
+auto=token(Insect,Creature Insect,1/1,green,flying,deathtouch)*4
+text=Flying, deathtouch -- When Hornet Queen enters the battlefield, put four 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield.
+mana={4}{G}{G}{G}
+type=Creature
+subtype=Insect
+power=2
+toughness=2
+[/card]
+[card]
 name=Hornet Sting
 target=creature,player
 auto=damage:1
@@ -31020,6 +31110,15 @@ power=4
 toughness=3
 [/card]
 [card]
+name=Hydra Omnivore
+text=Whenever Hydra Omnivore deals combat damage to an opponent, it deals that much damage to each other opponent.
+mana={4}{G}{G}
+type=Creature
+subtype=Hydra
+power=8
+toughness=8
+[/card]
+[card]
 name=Hydroblast
 alias=1191
 text=Choose one - Counter target spell if it's red; or destroy target permanent if it's red.
@@ -38856,6 +38955,17 @@ mana={2}{R}
 type=Enchantment
 [/card]
 [card]
+name=Magmasaur
+auto=counter(1/1,5)
+auto=upcostmulti[{C(1/1,-1)}] sacrifice && thisforeach(counter{1/1.1}) damage:1 all(creature) && thisforeach(counter{1/1.1}) damage:1 all(player)
+text=Magmasaur enters the battlefield with five +1/+1 counters on it. -- At the beginning of your upkeep, sacrifice Magmasaur unless you remove a +1/+1 counter from it. If you sacrifice Magmasaur this way, it deals damage equal to the number of +1/+1 counters on it to each creature without flying and each player.
+mana={3}{R}{R}
+type=Creature
+subtype=Elemental Lizard
+power=0
+toughness=0
+[/card]
+[card]
 name=Magmaw
 auto={1}{S(*[-land]|myBattlefield)}:damage:1 target(creature,player)
 text={1}, Sacrifice a nonland permanent: Magmaw deals 1 damage to target creature or player.
@@ -38866,15 +38976,14 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Magmasaur
-auto=counter(1/1,5)
-auto=upcostmulti[{C(1/1,-1)}] sacrifice && thisforeach(counter{1/1.1}) damage:1 all(creature) && thisforeach(counter{1/1.1}) damage:1 all(player)
-text=Magmasaur enters the battlefield with five +1/+1 counters on it. -- At the beginning of your upkeep, sacrifice Magmasaur unless you remove a +1/+1 counter from it. If you sacrifice Magmasaur this way, it deals damage equal to the number of +1/+1 counters on it to each creature without flying and each player.
-mana={3}{R}{R}
+name=Magmatic Force
+auto=@each upkeep:damage:3 target(creature,player)
+text=At the beginning of each upkeep, Magmatic Force deals 3 damage to target creature or player.
+mana={5}{R}{R}{R}
 type=Creature
-subtype=Elemental Lizard
-power=0
-toughness=0
+subtype=Elemental
+power=7
+toughness=7
 [/card]
 [card]
 name=Magnetic Flux
@@ -44241,6 +44350,16 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Nin, the Pain Artist
+auto={X}{U}{R}{T}:damage:x target(creature) && draw:X targetcontroller
+text={X}{U}{R}, {T}: Nin, the Pain Artist deals X damage to target creature. That creature's controller draws X cards.
+mana={U}{R}
+type=Legendary Creature
+subtype=Nin, the Oain Artist
+power=1
+toughness=1
+[/card]
+[card]
 name=Nine-Ringed Bo
 auto={T}:exiledeath target(creature[spirit]) && damage:1
 text={T}: Nine-Ringed Bo deals 1 damage to target Spirit creature. If that creature would be put into a graveyard this turn, exile it instead.
@@ -52703,6 +52822,16 @@ type=Sorcery
 subtype=Arcane
 [/card]
 [card]
+name=Riddlekeeper
+auto=@combat(attacking) source(creature|opponentBattlefield):deplete:2 opponent
+text=Whenever a creature attacks you or a planeswalker you control, that creature's controller puts the top two cards of his or her library into his or her graveyard.
+mana={2}{U}
+type=Creature
+subtype=Homunculus
+power=1
+toughness=4
+[/card]
+[card]
 name=Riddlesmith
 auto=@movedTo(artifact|mystack):may token(-5555556) && draw:1
 text=Whenever you cast an artifact spell, you may draw a card. If you do, discard a card.
@@ -53861,6 +53990,16 @@ text=Ruins of Trokair enters the battlefield tapped. -- {T}: Add {W} to your man
 type=Land
 [/card]
 [card]
+name=Ruhan of the Fomori
+abilities=mustattack
+text=At the beginning of combat on your turn, choose an opponent at random. Ruhan of the Fomori attacks that player this combat if able.
+mana={1}{W}{R}{U}
+type=Legendary Creature
+subtype=Giant Warrior
+power=7
+toughness=7
+[/card]
+[card]
 name=Rukh Egg
 auto=@movedTo(graveyard) from(this|battlefield):phaseaction[endofturn once] token(Bird,Creature Bird,4/4,red,flying)
 text=When Rukh Egg is put into a graveyard from the battlefield, put a 4/4 red Bird creature token with flying onto the battlefield at the beginning of the next end step.
@@ -55350,6 +55489,17 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Scavenging Ooze
+auto={G}:name(exile non-creature card) moveTo(exile) target(*[-creature]|graveyard)
+auto={G}:name(exile creature card) moveTo(exile) target(creature|graveyard) && all(this) counter(1/1,1) && life:1 controller
+text={G}: Exile target card from a graveyard. If it was a creature card, put a +1/+1 counter on Scavenging Ooze and you gain 1 life.
+mana={1}{G}
+type=Creature
+subtype=Ooze
+power=2
+toughness=2
+[/card]
+[card]
 name=Scavenging Scarab
 abilities=cantblock
 text=Scavenging Scarab can't block.
@@ -56934,6 +57084,17 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Sewer Nemesis
+auto=choice name(opponent) transforms((,newability[foreach(*|opponentgraveyard) 1/1],newability[@movedTo(*|opponentstack):deplete:1 opponent])) forever
+auto=choice name(you) transforms((,newability[foreach(*|mygraveyard) 1/1],newability[@movedTo(*|mystack):deplete:1 controller])) forever
+text=As Sewer Nemesis enters the battlefield, choose a player. -- Sewer Nemesis's power and toughness are each equal to the number of cards in the chosen player's graveyard. -- Whenever the chosen player casts a spell, that player puts the top card of his or her library into his or her graveyard.
+mana={3}{B}
+type=Creature
+subtype=Horror
+power=*
+toughness=*
+[/card]
+[card]
 name=Sewer Rats
 auto={L}{B}:1/0 limit:3
 text={B}, Pay 1 life: Sewer Rats gets +1/+0 until end of turn. Activate this ability no more than three times each turn.
@@ -60932,6 +61093,13 @@ mana={3}{B}{B}
 type=Sorcery
 [/card]
 [card]
+name=Soul Snare
+auto={W}{S}:moveTo(exile) target(creature[attacking]|opponentbattlefield)
+text={W}, Sacrifice Soul Snare: Exile target creature that's attacking you or a planeswalker you control.
+mana={W}
+type=Enchantment
+[/card]
+[card]
 name=Soul Snuffers
 auto=all(creature) counter(-1/-1)
 text=When Soul Snuffers enters the battlefield, put a -1/-1 counter on each creature.
@@ -72904,6 +73072,61 @@ mana={1}
 type=Artifact
 [/card]
 [card]
+name=Vow of Duty
+target=creature
+auto=2/2
+auto=vigilance
+auto=teach(creature|opponentbattlefield) cantattack
+text=Enchant creature -- Enchanted creature gets +2/+2, has vigilance, and can't attack you or a planeswalker you control.
+mana={2}{W}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+name=Vow of Flight
+target=creature
+auto=2/2
+auto=flying
+auto=teach(creature|opponentbattlefield) cantattack
+text=Enchant creature -- Enchanted creature gets +2/+2, has flying, and can't attack you or a planeswalker you control.
+mana={2}{U}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+name=Vow of Lightining
+target=creature
+auto=2/2
+auto=first strike
+auto=teach(creature|opponentbattlefield) cantattack
+text=Enchant creature -- Enchanted creature gets +2/+2, has first strike, and can't attack you or a planeswalker you control.
+mana={2}{R}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+name=Vow of Malice
+target=creature
+auto=2/2
+auto=intimidate
+auto=teach(creature|opponentbattlefield) cantattack
+text=Enchant creature -- Enchanted creature gets +2/+2, has intimidate, and can't attack you or a planeswalker you control.
+mana={2}{B}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+name=Vow of Wildness
+target=creature
+auto=2/2
+auto=trample
+auto=teach(creature|opponentbattlefield) cantattack
+text=Enchant creature -- Enchanted creature gets +2/+2, has trample, and can't attack you or a planeswalker you control.
+mana={2}{G}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Vug Lizard
 abilities=mountainwalk
 auto=upcost[{1}{R}{R}{0};next upkeep] sacrifice