Skip to content
GitLab
"cockatrice/git@gitlab.completext.com:quzar/Cockatrice.git" did not exist on "de388a74bda9c0e98299917409ce0539f5f84b3e"
Commit 4b1c5942 authored by Fabio Bas's avatar Fabio Bas
Browse files

Implement reverse-related tag for cards

parent f03051b6
Hide whitespace changes
Inline Side-by-side
cockatrice/src/carddatabase.cpp
View file @ 4b1c5942
...@@ -167,6 +167,7 @@ CardInfo::CardInfo(CardDatabase *_db, ...@@ -167,6 +167,7 @@ CardInfo::CardInfo(CardDatabase *_db,
const QString &_text, const QString &_text,
const QStringList &_colors, const QStringList &_colors,
const QStringList &_relatedCards, const QStringList &_relatedCards,
const QStringList &_reverseRelatedCards,
bool _upsideDownArt, bool _upsideDownArt,
int _loyalty, int _loyalty,
bool _cipt, bool _cipt,
...@@ -186,6 +187,7 @@ CardInfo::CardInfo(CardDatabase *_db, ...@@ -186,6 +187,7 @@ CardInfo::CardInfo(CardDatabase *_db,
text(_text), text(_text),
colors(_colors), colors(_colors),
relatedCards(_relatedCards), relatedCards(_relatedCards),
reverseRelatedCards(_reverseRelatedCards),
upsideDownArt(_upsideDownArt), upsideDownArt(_upsideDownArt),
loyalty(_loyalty), loyalty(_loyalty),
customPicURLs(_customPicURLs), customPicURLs(_customPicURLs),
...@@ -298,6 +300,10 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfo *info) ...@@ -298,6 +300,10 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfo *info)
for (int i = 0; i < related.size(); i++) for (int i = 0; i < related.size(); i++)
xml.writeTextElement("related", related[i]); xml.writeTextElement("related", related[i]);
const QStringList &reverseRelated = info->getReverseRelatedCards();
for (int i = 0; i < reverseRelated.size(); i++)
xml.writeTextElement("reverse-related", reverseRelated[i]);
xml.writeTextElement("manacost", info->getManaCost()); xml.writeTextElement("manacost", info->getManaCost());
xml.writeTextElement("cmc", info->getCmc()); xml.writeTextElement("cmc", info->getCmc());
xml.writeTextElement("type", info->getCardType()); xml.writeTextElement("type", info->getCardType());
...@@ -447,7 +453,7 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens) ...@@ -447,7 +453,7 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens)
break; break;
if (xml.name() == "card") { if (xml.name() == "card") {
QString name, manacost, cmc, type, pt, text; QString name, manacost, cmc, type, pt, text;
QStringList colors, relatedCards; QStringList colors, relatedCards, reverseRelatedCards;
QStringMap customPicURLs; QStringMap customPicURLs;
MuidMap muids; MuidMap muids;
SetList sets; SetList sets;
...@@ -485,6 +491,8 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens) ...@@ -485,6 +491,8 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens)
colors << xml.readElementText(); colors << xml.readElementText();
else if (xml.name() == "related") else if (xml.name() == "related")
relatedCards << xml.readElementText(); relatedCards << xml.readElementText();
else if (xml.name() == "reverse-related")
reverseRelatedCards << xml.readElementText();
else if (xml.name() == "tablerow") else if (xml.name() == "tablerow")
tableRow = xml.readElementText().toInt(); tableRow = xml.readElementText().toInt();
else if (xml.name() == "cipt") else if (xml.name() == "cipt")
...@@ -498,7 +506,7 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens) ...@@ -498,7 +506,7 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens)
} }
if (isToken == tokens) { if (isToken == tokens) {
addCard(new CardInfo(this, name, isToken, manacost, cmc, type, pt, text, colors, relatedCards, upsideDown, loyalty, cipt, tableRow, sets, customPicURLs, muids)); addCard(new CardInfo(this, name, isToken, manacost, cmc, type, pt, text, colors, relatedCards, reverseRelatedCards, upsideDown, loyalty, cipt, tableRow, sets, customPicURLs, muids));
} }
} }
} }
...@@ -642,6 +650,27 @@ void CardDatabase::loadCustomCardDatabases(const QString &path) ...@@ -642,6 +650,27 @@ void CardDatabase::loadCustomCardDatabases(const QString &path)
} }
} }
void CardDatabase::refreshCachedReverseRelatedCards()
{
foreach(CardInfo * card, cards)
card->resetReverseRelatedCards2Me();
foreach(CardInfo * card, cards)
{
if(card->getReverseRelatedCards().isEmpty())
continue;
QString relatedCardName = card->getName();
foreach(QString targetCard, card->getReverseRelatedCards())
{
if (!cards.contains(targetCard))
continue;
cards.value(targetCard)->addReverseRelatedCards2Me(relatedCardName);
}
}
}
QStringList CardDatabase::getAllColors() const QStringList CardDatabase::getAllColors() const
{ {
QSet<QString> colors; QSet<QString> colors;
......
cockatrice/src/carddatabase.h
View file @ 4b1c5942
...@@ -78,7 +78,12 @@ private: ...@@ -78,7 +78,12 @@ private:
QString powtough; QString powtough;
QString text; QString text;
QStringList colors; QStringList colors;
// the cards i'm related to
QStringList relatedCards; QStringList relatedCards;
// the card i'm reverse-related to
QStringList reverseRelatedCards;
// the cards thare are reverse-related to me
QStringList reverseRelatedCardsToMe;
bool upsideDownArt; bool upsideDownArt;
int loyalty; int loyalty;
QStringMap customPicURLs; QStringMap customPicURLs;
...@@ -86,6 +91,7 @@ private: ...@@ -86,6 +91,7 @@ private:
bool cipt; bool cipt;
int tableRow; int tableRow;
QString pixmapCacheKey; QString pixmapCacheKey;
public: public:
CardInfo(CardDatabase *_db, CardInfo(CardDatabase *_db,
const QString &_name = QString(), const QString &_name = QString(),
...@@ -97,6 +103,7 @@ public: ...@@ -97,6 +103,7 @@ public:
const QString &_text = QString(), const QString &_text = QString(),
const QStringList &_colors = QStringList(), const QStringList &_colors = QStringList(),
const QStringList &_relatedCards = QStringList(), const QStringList &_relatedCards = QStringList(),
const QStringList &_reverseRelatedCards = QStringList(),
bool _upsideDownArt = false, bool _upsideDownArt = false,
int _loyalty = 0, int _loyalty = 0,
bool _cipt = false, bool _cipt = false,
...@@ -126,6 +133,10 @@ public: ...@@ -126,6 +133,10 @@ public:
void setColors(const QStringList &_colors) { colors = _colors; emit cardInfoChanged(this); } void setColors(const QStringList &_colors) { colors = _colors; emit cardInfoChanged(this); }
const QStringList &getColors() const { return colors; } const QStringList &getColors() const { return colors; }
const QStringList &getRelatedCards() const { return relatedCards; } const QStringList &getRelatedCards() const { return relatedCards; }
const QStringList &getReverseRelatedCards() const { return reverseRelatedCards; }
const QStringList &getReverseRelatedCards2Me() const { return reverseRelatedCardsToMe; }
void resetReverseRelatedCards2Me() { reverseRelatedCardsToMe = QStringList(); }
void addReverseRelatedCards2Me(QString & cardName) { reverseRelatedCardsToMe.append(cardName); }
bool getUpsideDownArt() const { return upsideDownArt; } bool getUpsideDownArt() const { return upsideDownArt; }
QString getCustomPicURL(const QString &set) const { return customPicURLs.value(set); } QString getCustomPicURL(const QString &set) const { return customPicURLs.value(set); }
int getMuId(const QString &set) const { return muIds.value(set); } int getMuId(const QString &set) const { return muIds.value(set); }
...@@ -216,6 +227,7 @@ public: ...@@ -216,6 +227,7 @@ public:
LoadStatus getLoadStatus() const { return loadStatus; } LoadStatus getLoadStatus() const { return loadStatus; }
bool getLoadSuccess() const { return loadStatus == Ok; } bool getLoadSuccess() const { return loadStatus == Ok; }
bool hasDetectedFirstRun(); bool hasDetectedFirstRun();
void refreshCachedReverseRelatedCards();
public slots: public slots:
LoadStatus loadCardDatabase(const QString &path, bool tokens = false); LoadStatus loadCardDatabase(const QString &path, bool tokens = false);
void loadCustomCardDatabases(const QString &path); void loadCustomCardDatabases(const QString &path);
......
cockatrice/src/main.cpp
View file @ 4b1c5942
...@@ -200,6 +200,9 @@ int main(int argc, char *argv[]) ...@@ -200,6 +200,9 @@ int main(int argc, char *argv[])
qDebug() << "Could not create " + dataDir + "/customsets folder."; qDebug() << "Could not create " + dataDir + "/customsets folder.";
} }
// when all the cards have been loaded, resolve the reverse-related tags
db->refreshCachedReverseRelatedCards();
if (settingsValid()) { if (settingsValid()) {
qDebug("main(): starting main program"); qDebug("main(): starting main program");
......
cockatrice/src/player.cpp
View file @ 4b1c5942
...@@ -1146,7 +1146,8 @@ void Player::actCreateRelatedCard() ...@@ -1146,7 +1146,8 @@ void Player::actCreateRelatedCard()
cmd.set_annotation(settingsCache->getAnnotateTokens() ? cardInfo->getText().toStdString() : QString().toStdString()); cmd.set_annotation(settingsCache->getAnnotateTokens() ? cardInfo->getText().toStdString() : QString().toStdString());
cmd.set_destroy_on_zone_change(true); cmd.set_destroy_on_zone_change(true);
cmd.set_target_zone(sourceCard->getZone()->getName().toStdString()); cmd.set_target_zone(sourceCard->getZone()->getName().toStdString());
cmd.set_target_card_id(sourceCard->getId()); if(!cardInfo->getIsToken())
cmd.set_target_card_id(sourceCard->getId());
sendGameCommand(cmd); sendGameCommand(cmd);
} }
...@@ -2362,7 +2363,8 @@ void Player::updateCardMenu(CardItem *card) ...@@ -2362,7 +2363,8 @@ void Player::updateCardMenu(CardItem *card)
cardMenu->addAction(aPeek); cardMenu->addAction(aPeek);
QStringList relatedCards = card->getInfo()->getRelatedCards(); QStringList relatedCards = card->getInfo()->getRelatedCards();
if(relatedCards.size()) QStringList reverserelatedCards2Me = card->getInfo()->getReverseRelatedCards2Me();
if(relatedCards.size() || reverserelatedCards2Me.size())
{ {
QMenu * createRelatedCardMenu = cardMenu->addMenu(tr("Cr&eate related card")); QMenu * createRelatedCardMenu = cardMenu->addMenu(tr("Cr&eate related card"));
...@@ -2370,6 +2372,11 @@ void Player::updateCardMenu(CardItem *card) ...@@ -2370,6 +2372,11 @@ void Player::updateCardMenu(CardItem *card)
QAction *a = createRelatedCardMenu->addAction(relatedCards.at(i)); QAction *a = createRelatedCardMenu->addAction(relatedCards.at(i));
connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard())); connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard()));
} }
for (int i = 0; i < reverserelatedCards2Me.size(); ++i) {
QAction *a = createRelatedCardMenu->addAction(reverserelatedCards2Me.at(i));
connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard()));
}
} }
cardMenu->addSeparator(); cardMenu->addSeparator();
cardMenu->addAction(aAttach); cardMenu->addAction(aAttach);
...@@ -2393,6 +2400,23 @@ void Player::updateCardMenu(CardItem *card) ...@@ -2393,6 +2400,23 @@ void Player::updateCardMenu(CardItem *card)
} else if (card->getZone()->getName() == "stack") { } else if (card->getZone()->getName() == "stack") {
cardMenu->addAction(aDrawArrow); cardMenu->addAction(aDrawArrow);
cardMenu->addMenu(moveMenu); cardMenu->addMenu(moveMenu);
QStringList relatedCards = card->getInfo()->getRelatedCards();
QStringList reverserelatedCards2Me = card->getInfo()->getReverseRelatedCards2Me();
if(relatedCards.size() || reverserelatedCards2Me.size())
{
QMenu * createRelatedCardMenu = cardMenu->addMenu(tr("Cr&eate related card"));
for (int i = 0; i < relatedCards.size(); ++i) {
QAction *a = createRelatedCardMenu->addAction(relatedCards.at(i));
connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard()));
}
for (int i = 0; i < reverserelatedCards2Me.size(); ++i) {
QAction *a = createRelatedCardMenu->addAction(reverserelatedCards2Me.at(i));
connect(a, SIGNAL(triggered()), this, SLOT(actCreateRelatedCard()));
}
}
} else { } else {
cardMenu->addAction(aPlay); cardMenu->addAction(aPlay);
cardMenu->addAction(aPlayFacedown); cardMenu->addAction(aPlayFacedown);
......
cockatrice/src/window_main.cpp
View file @ 4b1c5942
...@@ -798,6 +798,7 @@ void MainWindow::cardUpdateFinished(int, QProcess::ExitStatus) ...@@ -798,6 +798,7 @@ void MainWindow::cardUpdateFinished(int, QProcess::ExitStatus)
// this will force a database reload // this will force a database reload
settingsCache->setCardDatabasePath(settingsCache->getCardDatabasePath()); settingsCache->setCardDatabasePath(settingsCache->getCardDatabasePath());
settingsCache->setTokenDatabasePath(settingsCache->getTokenDatabasePath());
} }
void MainWindow::refreshShortcuts() void MainWindow::refreshShortcuts()
......
doc/cards.xsd
View file @ 4b1c5942
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
</xs:element> </xs:element>
<xs:element type="xs:string" name="color" minOccurs="0" maxOccurs="unbounded"/> <xs:element type="xs:string" name="color" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="xs:string" name="related" minOccurs="0" maxOccurs="unbounded"/> <xs:element type="xs:string" name="related" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="xs:string" name="reverse-related" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="xs:string" name="manacost"/> <xs:element type="xs:string" name="manacost"/>
<xs:element type="xs:string" name="type"/> <xs:element type="xs:string" name="type"/>
<xs:element type="xs:string" name="pt" minOccurs="0"/> <xs:element type="xs:string" name="pt" minOccurs="0"/>
......
oracle/src/oracleimporter.cpp
View file @ 4b1c5942
...@@ -67,6 +67,7 @@ CardInfo *OracleImporter::addCard(const QString &setName, ...@@ -67,6 +67,7 @@ CardInfo *OracleImporter::addCard(const QString &setName,
const QString &cardText, const QString &cardText,
const QStringList & colors, const QStringList & colors,
const QStringList & relatedCards, const QStringList & relatedCards,
const QStringList & reverseRelatedCards,
bool upsideDown bool upsideDown
) )
{ {
...@@ -95,7 +96,7 @@ CardInfo *OracleImporter::addCard(const QString &setName, ...@@ -95,7 +96,7 @@ CardInfo *OracleImporter::addCard(const QString &setName,
bool cipt = cardText.contains("Hideaway") || (cardText.contains(cardName + " enters the battlefield tapped") && !cardText.contains(cardName + " enters the battlefield tapped unless")); bool cipt = cardText.contains("Hideaway") || (cardText.contains(cardName + " enters the battlefield tapped") && !cardText.contains(cardName + " enters the battlefield tapped unless"));
// insert the card and its properties // insert the card and its properties
card = new CardInfo(this, cardName, isToken, cardCost, cmc, cardType, cardPT, cardText, colors, relatedCards, upsideDown, cardLoyalty, cipt); card = new CardInfo(this, cardName, isToken, cardCost, cmc, cardType, cardPT, cardText, colors, relatedCards, reverseRelatedCards, upsideDown, cardLoyalty, cipt);
int tableRow = 1; int tableRow = 1;
QString mainCardType = card->getMainCardType(); QString mainCardType = card->getMainCardType();
if ((mainCardType == "Land") || mArtifact) if ((mainCardType == "Land") || mArtifact)
...@@ -146,6 +147,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data) ...@@ -146,6 +147,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
QString cardText; QString cardText;
QStringList colors; QStringList colors;
QStringList relatedCards; QStringList relatedCards;
QStringList reverseRelatedCards; // dummy
int cardId; int cardId;
int cardLoyalty; int cardLoyalty;
bool upsideDown = false; bool upsideDown = false;
...@@ -192,7 +194,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data) ...@@ -192,7 +194,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
colors.clear(); colors.clear();
extractColors(map.value("colors").toStringList(), colors); extractColors(map.value("colors").toStringList(), colors);
CardInfo *card = addCard(set->getShortName(), cardName, false, cardId, cardCost, cmc, cardType, cardPT, cardLoyalty, cardText, colors, relatedCards, upsideDown); CardInfo *card = addCard(set->getShortName(), cardName, false, cardId, cardCost, cmc, cardType, cardPT, cardLoyalty, cardText, colors, relatedCards, reverseRelatedCards, upsideDown);
if (!set->contains(card)) { if (!set->contains(card)) {
card->addToSet(set); card->addToSet(set);
...@@ -276,10 +278,11 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data) ...@@ -276,10 +278,11 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
colors.removeDuplicates(); colors.removeDuplicates();
relatedCards = QStringList(); relatedCards = QStringList();
reverseRelatedCards = QStringList();
upsideDown = false; upsideDown = false;
// add the card // add the card
CardInfo *card = addCard(set->getShortName(), cardName, false, muid, cardCost, cmc, cardType, cardPT, cardLoyalty, cardText, colors, relatedCards, upsideDown); CardInfo *card = addCard(set->getShortName(), cardName, false, muid, cardCost, cmc, cardType, cardPT, cardLoyalty, cardText, colors, relatedCards, reverseRelatedCards, upsideDown);
if (!set->contains(card)) { if (!set->contains(card)) {
card->addToSet(set); card->addToSet(set);
......
oracle/src/oracleimporter.h
View file @ 4b1c5942
...@@ -30,7 +30,7 @@ private: ...@@ -30,7 +30,7 @@ private:
QVariantMap setsMap; QVariantMap setsMap;
QString dataDir; QString dataDir;
CardInfo *addCard(const QString &setName, QString cardName, bool isToken, int cardId, QString &cardCost, QString &cmc, const QString &cardType, const QString &cardPT, int cardLoyalty, const QString &cardText, const QStringList & colors, const QStringList & relatedCards, bool upsideDown); CardInfo *addCard(const QString &setName, QString cardName, bool isToken, int cardId, QString &cardCost, QString &cmc, const QString &cardType, const QString &cardPT, int cardLoyalty, const QString &cardText, const QStringList & colors, const QStringList & relatedCards, const QStringList & reverseRelatedCards, bool upsideDown);
signals: signals:
void setIndexChanged(int cardsImported, int setIndex, const QString &setName); void setIndexChanged(int cardsImported, int setIndex, const QString &setName);
void dataReadProgress(int bytesRead, int totalBytes); void dataReadProgress(int bytesRead, int totalBytes);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment