jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-15 23:12:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move TOKENS_SETNAME to CardSet

Browse source
This commit is contained in:
RickyRister 2025-04-20 14:41:50 -07:00
parent 873e0d346e
commit 7dcf5e0c71
7 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/dialogs/dlg_edit_tokens.cpp
View file

@ -161,7 +161,7 @@ void DlgEditTokens::actAddToken()
} }
} }
QString setName = CardDatabase::TOKENS_SETNAME; QString setName = CardSet::TOKENS_SETNAME;
CardInfoPerSetMap sets; CardInfoPerSetMap sets;
sets[setName].append(CardInfoPerSet(databaseModel->getDatabase()->getSet(setName))); sets[setName].append(CardInfoPerSet(databaseModel->getDatabase()->getSet(setName)));
CardInfoPtr card = CardInfo::newInstance(name, "", true, QVariantHash(), QList<CardRelation *>(), CardInfoPtr card = CardInfo::newInstance(name, "", true, QVariantHash(), QList<CardRelation *>(),

11
cockatrice/src/game/cards/card_database.cpp
View file

@ -16,8 +16,6 @@
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>
const char *CardDatabase::TOKENS_SETNAME = "TK";
CardDatabase::CardDatabase(QObject *parent) : QObject(parent), loadStatus(NotLoaded) CardDatabase::CardDatabase(QObject *parent) : QObject(parent), loadStatus(NotLoaded)
{ {
qRegisterMetaType<CardInfoPtr>("CardInfoPtr"); qRegisterMetaType<CardInfoPtr>("CardInfoPtr");
@ -560,16 +558,15 @@ void CardDatabase::notifyEnabledSetsChanged()
bool CardDatabase::saveCustomTokensToFile() bool CardDatabase::saveCustomTokensToFile()
{ {
QString fileName = QString fileName = SettingsCache::instance().getCustomCardDatabasePath() + "/" + CardSet::TOKENS_SETNAME + ".xml";
SettingsCache::instance().getCustomCardDatabasePath() + "/" + CardDatabase::TOKENS_SETNAME + ".xml";
SetNameMap tmpSets; SetNameMap tmpSets;
CardSetPtr customTokensSet = getSet(CardDatabase::TOKENS_SETNAME); CardSetPtr customTokensSet = getSet(CardSet::TOKENS_SETNAME);
tmpSets.insert(CardDatabase::TOKENS_SETNAME, customTokensSet); tmpSets.insert(CardSet::TOKENS_SETNAME, customTokensSet);
CardNameMap tmpCards; CardNameMap tmpCards;
for (const CardInfoPtr &card : cards) { for (const CardInfoPtr &card : cards) {
if (card->getSets().contains(CardDatabase::TOKENS_SETNAME)) { if (card->getSets().contains(CardSet::TOKENS_SETNAME)) {
tmpCards.insert(card->getName(), card); tmpCards.insert(card->getName(), card);
} }
} }

2
cockatrice/src/game/cards/card_database.h
View file

@ -61,8 +61,6 @@ private:
*removeCardMutex = new QBasicMutex(); *removeCardMutex = new QBasicMutex();
public: public:
static const char *TOKENS_SETNAME;
explicit CardDatabase(QObject *parent = nullptr); explicit CardDatabase(QObject *parent = nullptr);
~CardDatabase() override; ~CardDatabase() override;
void clear(); void clear();

2
cockatrice/src/game/cards/card_database_model.cpp
View file

@ -387,7 +387,7 @@ TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(paren
bool TokenEditModel::filterAcceptsRow(int sourceRow, const QModelIndex & /*sourceParent*/) const bool TokenEditModel::filterAcceptsRow(int sourceRow, const QModelIndex & /*sourceParent*/) const
{ {
CardInfoPtr info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow); CardInfoPtr info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
return info->getIsToken() && info->getSets().contains(CardDatabase::TOKENS_SETNAME) && rowMatchesCardName(info); return info->getIsToken() && info->getSets().contains(CardSet::TOKENS_SETNAME) && rowMatchesCardName(info);
} }
int TokenEditModel::rowCount(const QModelIndex &parent) const int TokenEditModel::rowCount(const QModelIndex &parent) const

2
cockatrice/src/game/cards/card_info.cpp
View file

@ -11,6 +11,8 @@
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>
const char *CardSet::TOKENS_SETNAME = "TK";
CardSet::CardSet(const QString &_shortName, CardSet::CardSet(const QString &_shortName,
const QString &_longName, const QString &_longName,
const QString &_setType, const QString &_setType,

2
cockatrice/src/game/cards/card_info.h
View file

@ -43,6 +43,8 @@ public:
PriorityLowest = 100, PriorityLowest = 100,
}; };
static const char *TOKENS_SETNAME;
private: private:
QString shortName, longName; QString shortName, longName;
unsigned int sortKey; unsigned int sortKey;

4
oracle/src/oracleimporter.cpp
View file

@ -463,8 +463,8 @@ int OracleImporter::startImport()
{ {
int setCards = 0, setIndex = 0; int setCards = 0, setIndex = 0;
// add an empty set for tokens // add an empty set for tokens
CardSetPtr tokenSet = CardSet::newInstance(TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens"); CardSetPtr tokenSet = CardSet::newInstance(CardSet::TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens");
sets.insert(TOKENS_SETNAME, tokenSet); sets.insert(CardSet::TOKENS_SETNAME, tokenSet);
for (const SetToDownload &curSetToParse : allSets) { for (const SetToDownload &curSetToParse : allSets) {
CardSetPtr newSet = CardSetPtr newSet =