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

remove PriorityUndefined and set PriorityFallback to 0

Browse source
This commit is contained in:
Cameron McDonald 2024-11-21 17:10:05 -06:00
parent e3ff785db7
commit 35f36364e9
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,8 +32,7 @@ class CardSet : public QList<CardInfoPtr>
public: public:
enum Priority enum Priority
{ {
PriorityUndefined = 0, PriorityFallback = 0,
PriorityFallback = 1,
PriorityPrimary = 10, PriorityPrimary = 10,
PrioritySecondary = 20, PrioritySecondary = 20,
PriorityReprint = 30, PriorityReprint = 30,
@ -54,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 = PriorityUndefined); const Priority _priority = PriorityFallback);
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 = PriorityUndefined); const Priority _priority = PriorityFallback);
QString getCorrectedShortName() const; QString getCorrectedShortName() const;
QString getShortName() const QString getShortName() const
{ {

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::PriorityUndefined); const CardSet::Priority priority = CardSet::PriorityFallback);
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;

2
oracle/src/oracleimporter.cpp
View file

@ -24,7 +24,7 @@ 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::PriorityUndefined); CardSet::Priority priority = setTypePriorities.value(setType.toLower(), CardSet::PriorityFallback);
if (nonEnglishSets.contains(shortName)) { if (nonEnglishSets.contains(shortName)) {
priority = CardSet::PriorityLowest; priority = CardSet::PriorityLowest;
} }