Leahnaya/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-25 08:03:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

[DeckEditor] Fix tokens being added to maindeck (#6495)

Browse Source
This commit is contained in:
RickyRister 2026-01-05 01:18:38 -08:00 committed by GitHub
parent ee2699413c
commit 85c9d8a9ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View File

@ -597,13 +597,12 @@ QModelIndexList DeckEditorDeckDockWidget::getSelectedCardNodeSourceIndices() con
return selectedRows;
}
void DeckEditorDeckDockWidget::actAddCard(const ExactCard &card, const QString &_zoneName)
void DeckEditorDeckDockWidget::actAddCard(const ExactCard &card, const QString &zoneName)
{
if (!card) {
return;
}
QString zoneName = card.getInfo().getIsToken() ? DECK_ZONE_TOKENS : _zoneName;
deckStateManager->addCard(card, zoneName);
}

6
cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
View File

@ -174,11 +174,13 @@ QModelIndex DeckStateManager::addCard(const ExactCard &card, const QString &zone
return {};
}
QString zone = card.getInfo().getIsToken() ? DECK_ZONE_TOKENS : zoneName;
QString reason = tr("Added (%1): %2 (%3) %4")
.arg(zoneName, card.getName(), card.getPrinting().getSet()->getCorrectedShortName(),
.arg(zone, card.getName(), card.getPrinting().getSet()->getCorrectedShortName(),
card.getPrinting().getProperty("num"));
QModelIndex idx = modifyDeck(reason, [&card, &zoneName](auto model) { return model->addCard(card, zoneName); });
QModelIndex idx = modifyDeck(reason, [&card, &zone](auto model) { return model->addCard(card, zone); });
if (idx.isValid()) {
emit focusIndexChanged(idx);