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

Introduce null checks, add setShortName and collectorNumber to deckList export.

Browse source
This commit is contained in:
Lukas Brübach 2025-01-14 16:18:04 +01:00
parent f6c1253e84
commit e3f3f0a3ce
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cockatrice/src/deck/deck_loader.cpp
View file

@ -254,6 +254,14 @@ struct FormatDeckListForExport
mainBoardCards += QString::number(card->getNumber()); mainBoardCards += QString::number(card->getNumber());
mainBoardCards += "%20"; mainBoardCards += "%20";
mainBoardCards += card->getName(); mainBoardCards += card->getName();
if (!card->getCardSetShortName().isNull()){
mainBoardCards += "%20";
mainBoardCards += "(" + card->getCardSetShortName() + ")";
}
if (!card->getCardCollectorNumber().isNull()) {
mainBoardCards += "%20";
mainBoardCards += card->getCardCollectorNumber();
}
mainBoardCards += "%0A"; mainBoardCards += "%0A";
} }
} }
@ -419,7 +427,19 @@ void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out,
out << "SB: "; out << "SB: ";
} }
out << card->getNumber() << " " << card->getName() << "\n"; if (card->getNumber()) {
out << card->getNumber();
}
if (!card->getName().isNull() && !card->getName().isEmpty()) {
out << " " << card->getName();
}
if (!card->getCardSetShortName().isNull() && !card->getCardSetShortName().isEmpty()) {
out << " " << "(" << card->getCardSetShortName() << ")";
}
if (!card->getCardCollectorNumber().isNull()) {
out << " " << card->getCardCollectorNumber();
}
out << "\n";
} }
} }