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

clean up priority enum

Browse source
This commit is contained in:
Cameron McDonald 2024-08-15 12:21:19 -05:00
parent 9f4ac3b28a
commit 24fddc233e
4 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,13 +31,13 @@ class CardSet : public QList<CardInfoPtr>
{ {
public: public:
enum Priority { enum Priority {
UNDEFINED = 0, PriorityUndefined = 0,
PRIMARY = 10, PriorityPrimary = 10,
SECONDARY = 20, PrioritySecondary = 20,
REPRINT = 30, PriorityReprint = 30,
OTHER = 40, PriorityOther = 40,
FALLBACK = 50, PriorityFallback = 50,
LOWEST = 100, PriorityLowest = 100,
}; };
private: private:
@ -53,12 +53,12 @@ public:
const QString &_longName = QString(), const QString &_longName = QString(),
const QString &_setType = QString(), const QString &_setType = QString(),
const QDate &_releaseDate = QDate(), const QDate &_releaseDate = QDate(),
const Priority _priority = Priority::UNDEFINED); const Priority _priority = PriorityUndefined);
static CardSetPtr newInstance(const QString &_shortName = QString(), static CardSetPtr newInstance(const QString &_shortName = QString(),
const QString &_longName = QString(), const QString &_longName = QString(),
const QString &_setType = QString(), const QString &_setType = QString(),
const QDate &_releaseDate = QDate(), const QDate &_releaseDate = QDate(),
const Priority _priority = Priority::UNDEFINED); const Priority _priority = PriorityUndefined);
QString getCorrectedShortName() const; QString getCorrectedShortName() const;
QString getShortName() const QString getShortName() const
{ {
@ -78,7 +78,7 @@ public:
} }
Priority getPriority() const Priority getPriority() const
{ {
return priority ? priority : Priority::FALLBACK; return priority ? priority : PriorityFallback;
} }
void setLongName(const QString &_longName) void setLongName(const QString &_longName)
{ {

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

@ -33,7 +33,7 @@ protected:
const QString &longName = "", const QString &longName = "",
const QString &setType = "", const QString &setType = "",
const QDate &releaseDate = QDate(), const QDate &releaseDate = QDate(),
const CardSet::Priority priority = CardSet::Priority::UNDEFINED); const CardSet::Priority priority = CardSet::PriorityUndefined);
signals: signals:
virtual void addCard(CardInfoPtr card) = 0; virtual void addCard(CardInfoPtr card) = 0;
virtual void addSet(CardSetPtr set) = 0; virtual void addSet(CardSetPtr set) = 0;

4
oracle/src/oracleimporter.cpp
View file

@ -24,9 +24,9 @@ CardSet::Priority OracleImporter::getSetPriority(QString &setType, QString &shor
if (!setTypePriorities.contains(setType.toLower())) { if (!setTypePriorities.contains(setType.toLower())) {
qDebug() << "warning: Set type" << setType << "unrecognized for prioritization"; qDebug() << "warning: Set type" << setType << "unrecognized for prioritization";
} }
CardSet::Priority priority = setTypePriorities.value(setType.toLower(), CardSet::Priority::UNDEFINED); CardSet::Priority priority = setTypePriorities.value(setType.toLower(), CardSet::PriorityUndefined);
if (nonEnglishSets.contains(shortName)) { if (nonEnglishSets.contains(shortName)) {
priority = CardSet::Priority::LOWEST; priority = CardSet::PriorityLowest;
} }
return priority; return priority;
} }

46
oracle/src/oracleimporter.h
View file

@ -9,32 +9,32 @@
// many users prefer not to see these sets with non english arts // many users prefer not to see these sets with non english arts
const QStringList nonEnglishSets = {"4BB", "FBB", "PS11", "PSAL", "REN", "RIN"}; const QStringList nonEnglishSets = {"4BB", "FBB", "PS11", "PSAL", "REN", "RIN"};
const QMap<QString, CardSet::Priority> setTypePriorities{ const QMap<QString, CardSet::Priority> setTypePriorities{
{"core", CardSet::Priority::PRIMARY}, {"core", CardSet::PriorityPrimary},
{"expansion", CardSet::Priority::PRIMARY}, {"expansion", CardSet::PriorityPrimary},
{"commander", CardSet::Priority::SECONDARY}, {"commander", CardSet::PrioritySecondary},
{"starter", CardSet::Priority::SECONDARY}, {"starter", CardSet::PrioritySecondary},
{"archenemy", CardSet::Priority::REPRINT}, {"archenemy", CardSet::PriorityReprint},
{"arsenal", CardSet::Priority::REPRINT}, {"arsenal", CardSet::PriorityReprint},
{"box", CardSet::Priority::REPRINT}, {"box", CardSet::PriorityReprint},
{"draft_innovation", CardSet::Priority::REPRINT}, {"draft_innovation", CardSet::PriorityReprint},
{"duel_deck", CardSet::Priority::REPRINT}, {"duel_deck", CardSet::PriorityReprint},
{"from_the_vault", CardSet::Priority::REPRINT}, {"from_the_vault", CardSet::PriorityReprint},
{"masterpiece", CardSet::Priority::REPRINT}, {"masterpiece", CardSet::PriorityReprint},
{"masters", CardSet::Priority::REPRINT}, {"masters", CardSet::PriorityReprint},
{"memorabilia", CardSet::Priority::REPRINT}, {"memorabilia", CardSet::PriorityReprint},
{"planechase", CardSet::Priority::REPRINT}, {"planechase", CardSet::PriorityReprint},
{"premium_deck", CardSet::Priority::REPRINT}, {"premium_deck", CardSet::PriorityReprint},
{"promo", CardSet::Priority::REPRINT}, {"promo", CardSet::PriorityReprint},
{"spellbook", CardSet::Priority::REPRINT}, {"spellbook", CardSet::PriorityReprint},
{"token", CardSet::Priority::REPRINT}, {"token", CardSet::PriorityReprint},
{"treasure_chest", CardSet::Priority::REPRINT}, {"treasure_chest", CardSet::PriorityReprint},
{"alchemy", CardSet::Priority::OTHER}, {"alchemy", CardSet::PriorityOther},
{"funny", CardSet::Priority::OTHER}, {"funny", CardSet::PriorityOther},
{"minigame", CardSet::Priority::OTHER}, {"minigame", CardSet::PriorityOther},
{"vanguard", CardSet::Priority::OTHER}, {"vanguard", CardSet::PriorityOther},
}; };
class SetToDownload class SetToDownload