- unsupported.txt cleanup + conflicts cleanup (had to partly comment out some cards for which we don't have a clean solution yet, "multipart cards" are basically 2 cards that share the same Multiverse ID, such as "Day // night" )

2011-04-23 04:55:00 +00:00
parent fafa785778
commit 8e4de36588
11 changed files with 211 additions and 824 deletions
--- a/projects/mtg/bin/Res/sets/APC/_cards.dat
+++ b/projects/mtg/bin/Res/sets/APC/_cards.dat
@@ -215,11 +215,6 @@ rarity=R
 [/card]
 [card]
 primitive=Fire // Ice (Fire)
-id=27166
-rarity=U
-[/card]
-[card]
-primitive=Fire // Ice (Fire)
 id=27165
 rarity=U
 [/card]
@@ -229,11 +224,6 @@ id=27166
 rarity=U
 [/card]
 [card]
-primitive=Fire // Ice (Ice)
-id=27165
-rarity=U
-[/card]
-[card]
 primitive=Flowstone Charger
 id=19117
 rarity=U
@@ -320,11 +310,6 @@ rarity=U
 [/card]
 [card]
 primitive=Illusion // Reality (Illusion)
-id=27164
-rarity=U
-[/card]
-[card]
-primitive=Illusion // Reality (Illusion)
 id=27163
 rarity=U
 [/card]
@@ -334,11 +319,6 @@ id=27164
 rarity=U
 [/card]
 [card]
-primitive=Illusion // Reality (Reality)
-id=27163
-rarity=U
-[/card]
-[card]
 primitive=Index
 id=25969
 rarity=C
@@ -399,16 +379,6 @@ id=27162
 rarity=U
 [/card]
 [card]
-primitive=Life // Death (Death)
-id=27161
-rarity=U
-[/card]
-[card]
-primitive=Life // Death (Life)
-id=27162
-rarity=U
-[/card]
-[card]
 primitive=Life // Death (Life)
 id=27161
 rarity=U
@@ -490,11 +460,6 @@ rarity=R
 [/card]
 [card]
 primitive=Night // Day (Day)
-id=26691
-rarity=U
-[/card]
-[card]
-primitive=Night // Day (Day)
 id=26276
 rarity=U
 [/card]
@@ -504,26 +469,11 @@ id=26691
 rarity=U
 [/card]
 [card]
-primitive=Night // Day (Night)
-id=26276
-rarity=U
-[/card]
-[card]
 primitive=Order // Chaos (Chaos)
 id=27168
 rarity=U
 [/card]
 [card]
-primitive=Order // Chaos (Chaos)
-id=27167
-rarity=U
-[/card]
-[card]
-primitive=Order // Chaos (Order)
-id=27168
-rarity=U
-[/card]
-[card]
 primitive=Order // Chaos (Order)
 id=27167
 rarity=U
--- a/projects/mtg/bin/Res/sets/BOK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/BOK/_cards.dat
@@ -133,11 +133,12 @@ primitive=Faithful Squire
 id=74093
 rarity=U
 [/card]
-[card]
-primitive=Faithful Squire (Kaiso, Memory of Loyalty)
-id=74093
-rarity=U
-[/card]
+# Need to find a way to deal with multipart cards
+#[card]
+#primitive=Faithful Squire (Kaiso, Memory of Loyalty)
+#id=74093
+#rarity=U
+#[/card]
 [card]
 primitive=Final Judgment
 id=81991
--- a/projects/mtg/bin/Res/sets/CHK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CHK/_cards.dat
@@ -18,11 +18,12 @@ primitive=Akki Lavarunner
 id=78694
 rarity=R
 [/card]
-[card]
-primitive=Akki Lavarunner (Tok-Tok, Volcano Born)
-id=78694
-rarity=R
-[/card]
+# need to find a way to deal with multipart cards
+#[card]
+#primitive=Akki Lavarunner (Tok-Tok, Volcano Born)
+#id=78694
+#rarity=R
+#[/card]
 [card]
 primitive=Akki Rockspeaker
 id=77919
@@ -118,11 +119,12 @@ primitive=Budoka Gardener
 id=78687
 rarity=R
 [/card]
-[card]
-primitive=Budoka Gardener (Dokai, Weaver of Life)
-id=78687
-rarity=R
-[/card]
+# need to find a way to deal with multipart cards
+#[card]
+#primitive=Budoka Gardener (Dokai, Weaver of Life)
+#id=78687
+#rarity=R
+#[/card]
 [card]
 primitive=Burr Grafter
 id=50305
@@ -133,11 +135,12 @@ primitive=Bushi Tenderfoot
 id=78600
 rarity=U
 [/card]
-[card]
-primitive=Bushi Tenderfoot (Kenzo the Hardhearted)
-id=78600
-rarity=U
-[/card]
+# need to find a way to deal with multipart cards
+#[card]
+#primitive=Bushi Tenderfoot (Kenzo the Hardhearted)
+#id=78600
+#rarity=U
+#[/card]
 [card]
 primitive=Cage of Hands
 id=50233
@@ -553,11 +556,12 @@ primitive=Initiate of Blood
 id=78688
 rarity=U
 [/card]
-[card]
-primitive=Initiate of Blood (Goka the Unjust)
-id=78688
-rarity=U
-[/card]
+# need to find a way to deal with multipart cards
+#[card]
+#primitive=Initiate of Blood (Goka the Unjust)
+#id=78688
+#rarity=U
+#[/card]
 [card]
 primitive=Innocence Kami
 id=76636
@@ -623,11 +627,12 @@ primitive=Jushi Apprentice
 id=78686
 rarity=R
 [/card]
-[card]
-primitive=Jushi Apprentice (Tomoya the Revealer)
-id=78686
-rarity=R
-[/card]
+# need to find a way to deal with multipart cards
+#[card]
+#primitive=Jushi Apprentice (Tomoya the Revealer)
+#id=78686
+#rarity=R
+#[/card]
 [card]
 primitive=Kabuto Moth
 id=79105
@@ -728,11 +733,12 @@ primitive=Kitsune Mystic
 id=78695
 rarity=R
 [/card]
-[card]
-primitive=Kitsune Mystic (Autumn-Tail, Kitsune Sage)
-id=78695
-rarity=R
-[/card]
+# need to find a way to deal with multipart cards
+#[card]
+#primitive=Kitsune Mystic (Autumn-Tail, Kitsune Sage)
+#id=78695
+#rarity=R
+#[/card]
 [card]
 primitive=Kitsune Riftwalker
 id=50412
@@ -958,11 +964,12 @@ primitive=Nezumi Graverobber
 id=78678
 rarity=U
 [/card]
-[card]
-primitive=Nezumi Graverobber (Nighteyes the Desecrator)
-id=78678
-rarity=U
-[/card]
+# need to find a way to deal with multipart cards
+#[card]
+#primitive=Nezumi Graverobber (Nighteyes the Desecrator)
+#id=78678
+#rarity=U
+#[/card]
 [card]
 primitive=Nezumi Ronin
 id=50512
@@ -973,11 +980,12 @@ primitive=Nezumi Shortfang
 id=78679
 rarity=R
 [/card]
-[card]
-primitive=Nezumi Shortfang (Stabwhisker the Odious)
-id=78679
-rarity=R
-[/card]
+#need to find a way to deal with multipart cards
+#[card]
+#primitive=Nezumi Shortfang (Stabwhisker the Odious)
+#id=78679
+#rarity=R
+#[/card]
 [card]
 primitive=Night Dealings
 id=75334
@@ -1038,11 +1046,12 @@ primitive=Orochi Eggwatcher
 id=78975
 rarity=U
 [/card]
-[card]
-primitive=Orochi Eggwatcher (Shidako, Broodmistress)
-id=78975
-rarity=U
-[/card]
+# need to find a way to deal with multipart cards
+#[card]
+#primitive=Orochi Eggwatcher (Shidako, Broodmistress)
+#id=78975
+#rarity=U
+#[/card]
 [card]
 primitive=Orochi Hatchery
 id=80241
@@ -1383,11 +1392,12 @@ primitive=Struggle for Sanity
 id=79168
 rarity=U
 [/card]
-[card]
-primitive=Student of Elements
-id=78691
-rarity=U
-[/card]
+# need to find a way to deal with multipart cards
+#[card]
+#primitive=Student of Elements
+#id=78691
+#rarity=U
+#[/card]
 [card]
 primitive=Student of Elements (Tobita, Master of Winds)
 id=78691
--- a/projects/mtg/bin/Res/sets/DIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DIS/_cards.dat
@@ -98,11 +98,12 @@ primitive=Bound // Determined (Bound)
 id=107373
 rarity=R
 [/card]
-[card]
-primitive=Bound // Determined (Determined)
-id=107373
-rarity=R
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Bound // Determined (Determined)
+#id=107373
+#rarity=R
+#[/card]
 [card]
 primitive=Brace for Impact
 id=107537
@@ -158,11 +159,12 @@ primitive=Crime // Punishment (Crime)
 id=107285
 rarity=R
 [/card]
-[card]
-primitive=Crime // Punishment (Punishment)
-id=107285
-rarity=R
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Crime // Punishment (Punishment)
+#id=107285
+#rarity=R
+#[/card]
 [card]
 primitive=Crypt Champion
 id=107336
@@ -338,21 +340,23 @@ primitive=Hide // Seek (Hide)
 id=107315
 rarity=R
 [/card]
-[card]
-primitive=Hide // Seek (Seek)
-id=107315
-rarity=R
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Hide // Seek (Seek)
+#id=107315
+#rarity=R
+#[/card]
 [card]
 primitive=Hit // Run (Hit)
 id=107387
 rarity=U
 [/card]
-[card]
-primitive=Hit // Run (Run)
-id=107387
-rarity=U
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Hit // Run (Run)
+#id=107387
+#rarity=U
+#[/card]
 [card]
 primitive=Ignorant Bliss
 id=111281
@@ -473,11 +477,12 @@ primitive=Odds // Ends (Ends)
 id=107445
 rarity=R
 [/card]
-[card]
-primitive=Odds // Ends (Odds)
-id=107445
-rarity=R
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Odds // Ends (Odds)
+#id=107445
+#rarity=R
+#[/card]
 [card]
 primitive=Ogre Gatecrasher
 id=107389
@@ -573,11 +578,12 @@ primitive=Pure // Simple (Pure)
 id=107532
 rarity=U
 [/card]
-[card]
-primitive=Pure // Simple (Simple)
-id=107532
-rarity=U
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Pure // Simple (Simple)
+#id=107532
+#rarity=U
+#[/card]
 [card]
 primitive=Ragamuffyn
 id=107570
@@ -638,11 +644,12 @@ primitive=Research // Development (Development)
 id=107375
 rarity=R
 [/card]
-[card]
-primitive=Research // Development (Research)
-id=107375
-rarity=R
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Research // Development (Research)
+#id=107375
+#rarity=R
+#[/card]
 [card]
 primitive=Riot Spikes
 id=97076
@@ -653,11 +660,12 @@ primitive=Rise // Fall (Fall)
 id=107423
 rarity=U
 [/card]
-[card]
-primitive=Rise // Fall (Rise)
-id=107423
-rarity=U
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Rise // Fall (Rise)
+#id=107423
+#rarity=U
+#[/card]
 [card]
 primitive=Rix Maadi, Dungeon Palace
 id=97072
@@ -813,11 +821,12 @@ primitive=Supply // Demand (Demand)
 id=107464
 rarity=U
 [/card]
-[card]
-primitive=Supply // Demand (Supply)
-id=107464
-rarity=U
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Supply // Demand (Supply)
+#id=107464
+#rarity=U
+#[/card]
 [card]
 primitive=Swift Silence
 id=107284
@@ -848,11 +857,12 @@ primitive=Trial // Error (Error)
 id=107259
 rarity=U
 [/card]
-[card]
-primitive=Trial // Error (Trial)
-id=107259
-rarity=U
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Trial // Error (Trial)
+#id=107259
+#rarity=U
+#[/card]
 [card]
 primitive=Trygon Predator
 id=97112
--- a/projects/mtg/bin/Res/sets/HOP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/HOP/_cards.dat
@@ -43,11 +43,12 @@ primitive=Assault // Battery (Assault)
 id=205409
 rarity=U
 [/card]
-[card]
-primitive=Assault // Battery (Battery)
-id=205409
-rarity=U
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Assault // Battery (Battery)
+#id=205409
+#rarity=U
+#[/card]
 [card]
 primitive=Balefire Liege
 id=205377
@@ -553,11 +554,12 @@ primitive=Order // Chaos (Chaos)
 id=205384
 rarity=U
 [/card]
-[card]
-primitive=Order // Chaos (Order)
-id=205384
-rarity=U
-[/card]
+#Need to find a way to deal with multipart cards
+#[card]
+#primitive=Order // Chaos (Order)
+#id=205384
+#rarity=U
+#[/card]
 [card]
 primitive=Orim's Thunder
 id=205385
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -95,11 +95,6 @@ rarity=R
 [/card]
 [card]
 primitive=Assault // Battery (Assault)
-id=20580
-rarity=U
-[/card]
-[card]
-primitive=Assault // Battery (Assault)
 id=20579
 rarity=U
 [/card]
@@ -109,11 +104,6 @@ id=20580
 rarity=U
 [/card]
 [card]
-primitive=Assault // Battery (Battery)
-id=20579
-rarity=U
-[/card]
-[card]
 primitive=Atalya, Samite Master
 id=22964
 rarity=R
@@ -870,11 +860,6 @@ rarity=C
 [/card]
 [card]
 primitive=Pain // Suffering (Pain)
-id=20578
-rarity=U
-[/card]
-[card]
-primitive=Pain // Suffering (Pain)
 id=20577
 rarity=U
 [/card]
@@ -884,11 +869,6 @@ id=20578
 rarity=U
 [/card]
 [card]
-primitive=Pain // Suffering (Suffering)
-id=20577
-rarity=U
-[/card]
-[card]
 primitive=Phantasmal Terrain
 id=22983
 rarity=C
@@ -1349,16 +1329,6 @@ id=20576
 rarity=U
 [/card]
 [card]
-primitive=Spite // Malice (Malice)
-id=20575
-rarity=U
-[/card]
-[card]
-primitive=Spite // Malice (Spite)
-id=20576
-rarity=U
-[/card]
-[card]
 primitive=Spite // Malice (Spite)
 id=20575
 rarity=U
@@ -1375,11 +1345,6 @@ rarity=R
 [/card]
 [card]
 primitive=Stand // Deliver (Stand)
-id=20574
-rarity=U
-[/card]
-[card]
-primitive=Stand // Deliver (Stand)
 id=20573
 rarity=U
 [/card]
@@ -1389,11 +1354,6 @@ id=20574
 rarity=U
 [/card]
 [card]
-primitive=Stand // Deliver (Deliver)
-id=20573
-rarity=U
-[/card]
-[card]
 primitive=Stand or Fall
 id=26389
 rarity=R
@@ -1759,16 +1719,6 @@ id=20582
 rarity=U
 [/card]
 [card]
-primitive=Wax // Wane (Wane)
-id=20581
-rarity=U
-[/card]
-[card]
-primitive=Wax // Wane (Wax)
-id=20582
-rarity=U
-[/card]
-[card]
 primitive=Wax // Wane (Wax)
 id=20581
 rarity=U
--- a/projects/mtg/bin/Res/sets/KVD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/KVD/_cards.dat
@@ -10,7 +10,7 @@ rarity=U
 [/card]
 [card]
 primitive=Armillary Sphere
-id=222720
+id=243480
 rarity=C
 [/card]
 [card]
--- a/projects/mtg/bin/Res/sets/PLC/_cards.dat
+++ b/projects/mtg/bin/Res/sets/PLC/_cards.dat
@@ -78,11 +78,12 @@ primitive=Boom // Bust (Boom)
 id=126218
 rarity=R
 [/card]
-[card]
-primitive=Boom // Bust (Bust)
-id=126218
-rarity=R
-[/card]
+#need to find a way to deal with multipart cards
+#[card]
+#primitive=Boom // Bust (Bust)
+#id=126218
+#rarity=R
+#[/card]
 [card]
 primitive=Braids, Conjurer Adept
 id=124316
@@ -163,11 +164,12 @@ primitive=Dead // Gone (Dead)
 id=126419
 rarity=C
 [/card]
-[card]
-primitive=Dead // Gone (Gone)
-id=126419
-rarity=C
-[/card]
+#need to find a way to deal with multipart cards
+#[card]
+#primitive=Dead // Gone (Gone)
+#id=126419
+#rarity=C
+#[/card]
 [card]
 primitive=Deadly Grub
 id=111046
@@ -620,11 +622,12 @@ primitive=Rough // Tumble (Rough)
 id=126420
 rarity=U
 [/card]
-[card]
-primitive=Rough // Tumble (Tumble)
-id=126420
-rarity=U
-[/card]
+#need to find a way to deal with multipart cards
+#[card]
+#primitive=Rough // Tumble (Tumble)
+#id=126420
+#rarity=U
+#[/card]
 [card]
 primitive=Saltblast
 id=122435
--- a/projects/mtg/bin/Res/sets/SOK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SOK/_cards.dat
@@ -193,11 +193,12 @@ primitive=Erayo, Soratami Ascendant
 id=87599
 rarity=R
 [/card]
-[card]
-primitive=Erayo, Soratami Ascendant (Erayo's Essence)
-id=87599
-rarity=R
-[/card]
+#need to find a way to deal with multipart cards
+#[card]
+#primitive=Erayo, Soratami Ascendant (Erayo's Essence)
+#id=87599
+#rarity=R
+#[/card]
 [card]
 primitive=Eternal Dominion
 id=87593
@@ -308,11 +309,12 @@ primitive=Homura, Human Ascendant
 id=84716
 rarity=R
 [/card]
-[card]
-primitive=Homura, Human Ascendant (Homura's Essence)
-id=84716
-rarity=R
-[/card]
+#need to find a way to deal with multipart cards
+#[card]
+#primitive=Homura, Human Ascendant (Homura's Essence)
+#id=84716
+#rarity=R
+#[/card]
 [card]
 primitive=Ideas Unbound
 id=88789
@@ -443,11 +445,12 @@ primitive=Kuon, Ogre Ascendant
 id=87596
 rarity=R
 [/card]
-[card]
-primitive=Kuon, Ogre Ascendant (Kuon's Essence)
-id=87596
-rarity=R
-[/card]
+#need to find a way to deal with multipart cards
+#[card]
+#primitive=Kuon, Ogre Ascendant (Kuon's Essence)
+#id=87596
+#rarity=R
+#[/card]
 [card]
 primitive=Kuro's Taken
 id=74065
@@ -668,11 +671,12 @@ primitive=Rune-Tail, Kitsune Ascendant
 id=87600
 rarity=R
 [/card]
-[card]
-primitive=Rune-Tail, Kitsune Ascendant (Rune-Tail's Essence)
-id=87600
-rarity=R
-[/card]
+#need to find a way to deal with multipart cards
+#[card]
+#primitive=Rune-Tail, Kitsune Ascendant (Rune-Tail's Essence)
+#id=87600
+#rarity=R
+#[/card]
 [card]
 primitive=Rushing-Tide Zubera
 id=50430
@@ -693,11 +697,12 @@ primitive=Sasaya, Orochi Ascendant
 id=87595
 rarity=R
 [/card]
-[card]
-primitive=Sasaya, Orochi Ascendant (Sasaya's Essence)
-id=87595
-rarity=R
-[/card]
+#need to find a way to deal with multipart cards
+#[card]
+#primitive=Sasaya, Orochi Ascendant (Sasaya's Essence)
+#id=87595
+#rarity=R
+#[/card]
 [card]
 primitive=Scroll of Origins
 id=88811
--- a/projects/mtg/bin/Res/sets/TSB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TSB/_cards.dat
@@ -18,11 +18,12 @@ primitive=Assault // Battery (Assault)
 id=109704
 rarity=S
 [/card]
-[card]
-primitive=Assault // Battery (Battery)
-id=109704
-rarity=S
-[/card]
+#need to find a way to deal with multipart cards
+#[card]
+#primitive=Assault // Battery (Battery)
+#id=109704
+#rarity=S
+#[/card]
 [card]
 primitive=Auratog
 id=106665
--- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt
+++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt