aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added duel decks + FTV to sets.xml (done by DrAg0n)

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-03-19 21:40:21 +01:00
parent a947cac585
commit 75d78ca147
2 changed files with 324 additions and 285 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

600
oracle/sets.xml
View file

@ -4,324 +4,364 @@
<picture_url_hq>http://mtgpics.chutography.com/!set!/!name!.full.jpg</picture_url_hq> <picture_url_hq>http://mtgpics.chutography.com/!set!/!name!.full.jpg</picture_url_hq>
<picture_url_st>http://mtgpics.chutography.com/!set!/!name!.jpg</picture_url_st> <picture_url_st>http://mtgpics.chutography.com/!set!/!name!.jpg</picture_url_st>
<set_url>http://gatherer.wizards.com/Pages/Search/Default.aspx?output=spoiler&amp;method=text&amp;set=[&quot;!longname!&quot;]&amp;special=true</set_url> <set_url>http://gatherer.wizards.com/Pages/Search/Default.aspx?output=spoiler&amp;method=text&amp;set=[&quot;!longname!&quot;]&amp;special=true</set_url>
<set import="1"> <set import="1">
<name>ARB</name> <name>ARB</name>
<longname>Alara Reborn</longname> <longname>Alara Reborn</longname>
</set> </set>
<set import="1"> <set import="1">
<name>AL</name> <name>AL</name>
<longname>Alliances</longname> <longname>Alliances</longname>
</set> </set>
<set import="1"> <set import="1">
<name>AQ</name> <name>AQ</name>
<longname>Antiquities</longname> <longname>Antiquities</longname>
</set> </set>
<set import="1"> <set import="1">
<name>AP</name> <name>AP</name>
<longname>Apocalypse</longname> <longname>Apocalypse</longname>
</set> </set>
<set import="1"> <set import="1">
<name>AN</name> <name>AN</name>
<longname>Arabian Nights</longname> <longname>Arabian Nights</longname>
</set> </set>
<set import="0"> <set import="0">
<name>AE</name> <name>AE</name>
<longname>Archenemy</longname> <longname>Archenemy</longname>
</set> </set>
<set import="1"> <set import="1">
<name>BOK</name> <name>BOK</name>
<longname>Betrayers of Kamigawa</longname> <longname>Betrayers of Kamigawa</longname>
</set> </set>
<set import="1"> <set import="1">
<name>CHK</name> <name>CHK</name>
<longname>Champions of Kamigawa</longname> <longname>Champions of Kamigawa</longname>
</set> </set>
<set import="1"> <set import="1">
<name>CH</name> <name>CH</name>
<longname>Chronicles</longname> <longname>Chronicles</longname>
</set> </set>
<set import="1"> <set import="1">
<name>6E</name> <name>6E</name>
<longname>Classic Sixth Edition</longname> <longname>Classic Sixth Edition</longname>
</set> </set>
<set import="1"> <set import="1">
<name>CS</name> <name>CS</name>
<longname>Coldsnap</longname> <longname>Coldsnap</longname>
</set> </set>
<set import="1"> <set import="1">
<name>CFX</name> <name>CFX</name>
<longname>Conflux</longname> <longname>Conflux</longname>
</set> </set>
<set import="1"> <set import="1">
<name>DS</name> <name>DS</name>
<longname>Darksteel</longname> <longname>Darksteel</longname>
</set> </set>
<set import="1"> <set import="1">
<name>DIS</name> <name>DIS</name>
<longname>Dissension</longname> <longname>Dissension</longname>
</set> </set>
<set import="1"> <set import="1">
<name>8E</name> <name>DVD</name>
<longname>Eighth Edition</longname> <longname>Duel Decks: Divine vs. Demonic</longname>
</set> </set>
<set import="1"> <set import="1">
<name>EVE</name> <name>DDE</name>
<longname>Eventide</longname> <longname>Duel Decks: Elspeth vs. Tezzeret</longname>
</set> </set>
<set import="1"> <set import="1">
<name>EX</name> <name>EVG</name>
<longname>Exodus</longname> <longname>Duel Decks: Elves vs. Goblins</longname>
</set> </set>
<set import="1"> <set import="1">
<name>FE</name> <name>DD2</name>
<longname>Fallen Empires</longname> <longname>Duel Decks: Jace vs. Chandra</longname>
</set> </set>
<set import="1"> <set import="1">
<name>FD</name> <name>DDD</name>
<longname>Fifth Dawn</longname> <longname>Duel Decks: Phyrexia vs. the Coalition</longname>
</set> </set>
<set import="1"> <set import="1">
<name>5E</name> <name>8E</name>
<longname>Fifth Edition</longname> <longname>Eighth Edition</longname>
</set> </set>
<set import="1"> <set import="1">
<name>4E</name> <name>EVE</name>
<longname>Fourth Edition</longname> <longname>Eventide</longname>
</set> </set>
<set import="1"> <set import="1">
<name>FUT</name> <name>EX</name>
<longname>Future Sight</longname> <longname>Exodus</longname>
</set> </set>
<set import="1"> <set import="1">
<name>GP</name> <name>FE</name>
<longname>Guildpact</longname> <longname>Fallen Empires</longname>
</set> </set>
<set import="1"> <set import="1">
<name>HL</name> <name>FD</name>
<longname>Homelands</longname> <longname>Fifth Dawn</longname>
</set> </set>
<set import="1"> <set import="1">
<name>IA</name> <name>5E</name>
<longname>Ice Age</longname> <longname>Fifth Edition</longname>
</set> </set>
<set import="1"> <set import="1">
<name>IN</name> <name>4E</name>
<longname>Invasion</longname> <longname>Fourth Edition</longname>
</set> </set>
<set import="1"> <set import="1">
<name>JU</name> <name>DRB</name>
<longname>Judgment</longname> <longname>From the Vault: Dragons</longname>
</set> </set>
<set import="1"> <set import="1">
<name>LG</name> <name>FVE</name>
<longname>Legends</longname> <longname>From the Vault: Exiled</longname>
</set> </set>
<set import="1"> <set import="1">
<name>LE</name> <name>V10</name>
<longname>Legions</longname> <longname>From the Vault: Relics</longname>
</set> </set>
<set import="1"> <set import="1">
<name>A</name> <name>FUT</name>
<longname>Limited Edition Alpha</longname> <longname>Future Sight</longname>
</set> </set>
<set import="1"> <set import="1">
<name>B</name> <name>GP</name>
<longname>Limited Edition Beta</longname> <longname>Guildpact</longname>
</set> </set>
<set import="1"> <set import="1">
<name>LRW</name> <name>HL</name>
<longname>Lorwyn</longname> <longname>Homelands</longname>
</set> </set>
<set import="1"> <set import="1">
<name>M10</name> <name>IA</name>
<longname>Magic 2010</longname> <longname>Ice Age</longname>
</set> </set>
<set import="1">
<name>IN</name>
<longname>Invasion</longname>
</set>
<set import="1">
<name>JU</name>
<longname>Judgment</longname>
</set>
<set import="1">
<name>LG</name>
<longname>Legends</longname>
</set>
<set import="1">
<name>LE</name>
<longname>Legions</longname>
</set>
<set import="1">
<name>A</name>
<longname>Limited Edition Alpha</longname>
</set>
<set import="1">
<name>B</name>
<longname>Limited Edition Beta</longname>
</set>
<set import="1">
<name>LRW</name>
<longname>Lorwyn</longname>
</set>
<set import="1">
<name>M10</name>
<longname>Magic 2010</longname>
</set>
<set import="1"> <set import="1">
<name>M11</name> <name>M11</name>
<longname>Magic 2011</longname> <longname>Magic 2011</longname>
</set> </set>
<set import="1"> <set import="1">
<name>MM</name> <name>MM</name>
<longname>Mercadian Masques</longname> <longname>Mercadian Masques</longname>
</set> </set>
<set import="1"> <set import="1">
<name>MI</name> <name>MI</name>
<longname>Mirage</longname> <longname>Mirage</longname>
</set> </set>
<set import="1"> <set import="1">
<name>MR</name> <name>MR</name>
<longname>Mirrodin</longname> <longname>Mirrodin</longname>
</set> </set>
<set import="1"> <set import="1">
<name>MBS</name> <name>MBS</name>
<longname>Mirrodin Besieged</longname> <longname>Mirrodin Besieged</longname>
</set> </set>
<set import="1"> <set import="1">
<name>MOR</name> <name>MOR</name>
<longname>Morningtide</longname> <longname>Morningtide</longname>
</set> </set>
<set import="1"> <set import="1">
<name>NE</name> <name>NE</name>
<longname>Nemesis</longname> <longname>Nemesis</longname>
</set> </set>
<set import="1"> <set import="1">
<name>9E</name> <name>9E</name>
<longname>Ninth Edition</longname> <longname>Ninth Edition</longname>
</set> </set>
<set import="1"> <set import="1">
<name>OD</name> <name>OD</name>
<longname>Odyssey</longname> <longname>Odyssey</longname>
</set> </set>
<set import="1"> <set import="1">
<name>ON</name> <name>ON</name>
<longname>Onslaught</longname> <longname>Onslaught</longname>
</set> </set>
<set import="1"> <set import="1">
<name>PLC</name> <name>PLC</name>
<longname>Planar Chaos</longname> <longname>Planar Chaos</longname>
</set> </set>
<set import="0"> <set import="0">
<name>PCH</name> <name>PCH</name>
<longname>Planechase</longname> <longname>Planechase</longname>
</set> </set>
<set import="1"> <set import="1">
<name>PS</name> <name>PS</name>
<longname>Planeshift</longname> <longname>Planeshift</longname>
</set> </set>
<set import="1"> <set import="1">
<name>PT</name> <name>PT</name>
<longname>Portal</longname> <longname>Portal</longname>
</set> </set>
<set import="1"> <set import="1">
<name>P2</name> <name>P2</name>
<longname>Portal Second Age</longname> <longname>Portal Second Age</longname>
</set> </set>
<set import="1"> <set import="1">
<name>P3</name> <name>P3</name>
<longname>Portal Three Kingdoms</longname> <longname>Portal Three Kingdoms</longname>
</set> </set>
<set import="1">
<name>PD2</name>
<longname>Premium Deck Series: Fire and Lightning</longname>
</set>
<set import="1">
<name>H09</name>
<longname>Premium Deck Series: Slivers</longname>
</set>
<set import="1"> <set import="1">
<name>PR</name> <name>PR</name>
<longname>Promo set for Gatherer</longname> <longname>Promo set for Gatherer</longname>
</set> </set>
<set import="1"> <set import="1">
<name>PY</name> <name>PY</name>
<longname>Prophecy</longname> <longname>Prophecy</longname>
</set> </set>
<set import="1"> <set import="1">
<name>RAV</name> <name>RAV</name>
<longname>Ravnica: City of Guilds</longname> <longname>Ravnica: City of Guilds</longname>
</set> </set>
<set import="1"> <set import="1">
<name>R</name> <name>R</name>
<longname>Revised Edition</longname> <longname>Revised Edition</longname>
</set> </set>
<set import="1"> <set import="1">
<name>ROE</name> <name>ROE</name>
<longname>Rise of the Eldrazi</longname> <longname>Rise of the Eldrazi</longname>
</set> </set>
<set import="1"> <set import="1">
<name>SOK</name> <name>SOK</name>
<longname>Saviors of Kamigawa</longname> <longname>Saviors of Kamigawa</longname>
</set> </set>
<set import="1"> <set import="1">
<name>SOM</name> <name>SOM</name>
<longname>Scars of Mirrodin</longname> <longname>Scars of Mirrodin</longname>
</set> </set>
<set import="1"> <set import="1">
<name>SC</name> <name>SC</name>
<longname>Scourge</longname> <longname>Scourge</longname>
</set> </set>
<set import="1"> <set import="1">
<name>7E</name> <name>7E</name>
<longname>Seventh Edition</longname> <longname>Seventh Edition</longname>
</set> </set>
<set import="1"> <set import="1">
<name>SHM</name> <name>SHM</name>
<longname>Shadowmoor</longname> <longname>Shadowmoor</longname>
</set> </set>
<set import="1"> <set import="1">
<name>ALA</name> <name>ALA</name>
<longname>Shards of Alara</longname> <longname>Shards of Alara</longname>
</set> </set>
<set import="1"> <set import="1">
<name>ST</name> <name>ST</name>
<longname>Starter 1999</longname> <longname>Starter 1999</longname>
</set> </set>
<set import="1"> <set import="1">
<name>ST2K</name> <name>ST2K</name>
<longname>Starter 2000</longname> <longname>Starter 2000</longname>
</set> </set>
<set import="1"> <set import="1">
<name>SH</name> <name>SH</name>
<longname>Stronghold</longname> <longname>Stronghold</longname>
</set> </set>
<set import="1"> <set import="1">
<name>TE</name> <name>TE</name>
<longname>Tempest</longname> <longname>Tempest</longname>
</set> </set>
<set import="1"> <set import="1">
<name>10E</name> <name>10E</name>
<longname>Tenth Edition</longname> <longname>Tenth Edition</longname>
</set> </set>
<set import="1"> <set import="1">
<name>DK</name> <name>DK</name>
<longname>The Dark</longname> <longname>The Dark</longname>
</set> </set>
<set import="1"> <set import="1">
<name>TSP</name> <name>TSP</name>
<longname>Time Spiral</longname> <longname>Time Spiral</longname>
</set> </set>
<set import="1"> <set import="1">
<name>TSB</name> <name>TSB</name>
<longname>Time Spiral "Timeshifted"</longname> <longname>Time Spiral "Timeshifted"</longname>
</set> </set>
<set import="1"> <set import="1">
<name>TO</name> <name>TO</name>
<longname>Torment</longname> <longname>Torment</longname>
</set> </set>
<set import="0"> <set import="0">
<name>UG</name> <name>UG</name>
<longname>Unglued</longname> <longname>Unglued</longname>
</set> </set>
<set import="0"> <set import="0">
<name>UNH</name> <name>UNH</name>
<longname>Unhinged</longname> <longname>Unhinged</longname>
</set> </set>
<set import="1"> <set import="1">
<name>U</name> <name>U</name>
<longname>Unlimited Edition</longname> <longname>Unlimited Edition</longname>
</set> </set>
<set import="1"> <set import="1">
<name>UD</name> <name>UD</name>
<longname>Urza's Destiny</longname> <longname>Urza's Destiny</longname>
</set> </set>
<set import="1"> <set import="1">
<name>UL</name> <name>UL</name>
<longname>Urza's Legacy</longname> <longname>Urza's Legacy</longname>
</set> </set>
<set import="1"> <set import="1">
<name>US</name> <name>US</name>
<longname>Urza's Saga</longname> <longname>Urza's Saga</longname>
</set> </set>
<set import="0"> <set import="0">
<name>VG</name> <name>VG</name>
<longname>Vanguard</longname> <longname>Vanguard</longname>
</set> </set>
<set import="1"> <set import="1">
<name>VI</name> <name>VI</name>
<longname>Visions</longname> <longname>Visions</longname>
</set> </set>
<set import="1"> <set import="1">
<name>WL</name> <name>WL</name>
<longname>Weatherlight</longname> <longname>Weatherlight</longname>
</set> </set>
<set import="1"> <set import="1">
<name>WWK</name> <name>WWK</name>
<longname>Worldwake</longname> <longname>Worldwake</longname>
</set> </set>
<set import="1"> <set import="1">
<name>ZEN</name> <name>ZEN</name>
<longname>Zendikar</longname> <longname>Zendikar</longname>
</set> </set>
</cockatrice_setdatabase> </cockatrice_setdatabase>

9
oracle/src/oracleimporter.cpp
View file

@ -77,6 +77,10 @@ CardInfo *OracleImporter::addCard(const QString &setName, QString cardName, int
cardName.remove(QRegExp(" \\(.*\\)")); cardName.remove(QRegExp(" \\(.*\\)"));
splitCard = true; splitCard = true;
} }
// Workaround for card name weirdness
if (cardName.contains("XX"))
cardName.remove("XX");
cardName = cardName.replace("Æ", "AE");
CardInfo *card; CardInfo *card;
if (cardHash.contains(cardName)) { if (cardHash.contains(cardName)) {
@ -84,11 +88,6 @@ CardInfo *OracleImporter::addCard(const QString &setName, QString cardName, int
if (splitCard && !card->getText().contains(fullCardText)) if (splitCard && !card->getText().contains(fullCardText))
card->setText(card->getText() + "\n---\n" + fullCardText); card->setText(card->getText() + "\n---\n" + fullCardText);
} else { } else {
// Workaround for card name weirdness
if (cardName.contains("XX"))
cardName.remove("XX");
cardName = cardName.replace("Æ", "AE");
bool mArtifact = false; bool mArtifact = false;
if (cardType.endsWith("Artifact")) if (cardType.endsWith("Artifact"))
for (int i = 0; i < cardText.size(); ++i) for (int i = 0; i < cardText.size(); ++i)