jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-14 19:18:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: support expressions when setting card counters (#6753)

Browse source 
* feat: enable expressions in card counters

* fix includes

* fix multiple selection

* cleanup useless conversions

* const ref where possible

* do not use const, be consistent with local patterns in the file
This commit is contained in:
Bruno Alexandre Rosa 2026-04-07 02:36:45 -03:00 • committed by GitHub
parent 3ec9ae9772
commit dbed6890da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
cockatrice/src/game/player/player_actions.cpp
View file

@ -3,6 +3,7 @@
#include "../../interface/widgets/tabs/tab_game.h" #include "../../interface/widgets/tabs/tab_game.h"
#include "../../interface/widgets/utility/get_text_with_max.h" #include "../../interface/widgets/utility/get_text_with_max.h"
#include "../board/card_item.h" #include "../board/card_item.h"
#include "../client/settings/card_counter_settings.h"
#include "../dialogs/dlg_move_top_cards_until.h" #include "../dialogs/dlg_move_top_cards_until.h"
#include "../dialogs/dlg_roll_dice.h" #include "../dialogs/dlg_roll_dice.h"
#include "../zones/hand_zone.h" #include "../zones/hand_zone.h"
@ -27,6 +28,7 @@
#include <libcockatrice/protocol/pb/command_shuffle.pb.h> #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
#include <libcockatrice/protocol/pb/command_undo_draw.pb.h> #include <libcockatrice/protocol/pb/command_undo_draw.pb.h>
#include <libcockatrice/protocol/pb/context_move_card.pb.h> #include <libcockatrice/protocol/pb/context_move_card.pb.h>
#include <libcockatrice/utility/expression.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>
#include <libcockatrice/utility/zone_names.h> #include <libcockatrice/utility/zone_names.h>
@ -1572,23 +1574,34 @@ void PlayerActions::actCardCounterTrigger()
break; break;
} }
case 11: { // set counter with dialog case 11: { // set counter with dialog
bool ok;
player->setDialogSemaphore(true); player->setDialogSemaphore(true);
int oldValue = 0; // If a single card is selected, we show the old value in the dialog. Otherwise, we show "x"
if (player->getGameScene()->selectedItems().size() == 1) { QList<QGraphicsItem *> sel = player->getGameScene()->selectedItems();
auto *card = static_cast<CardItem *>(player->getGameScene()->selectedItems().first()); QString oldValueForDlg = "x";
oldValue = card->getCounters().value(counterId, 0); if (sel.size() == 1) {
auto *card = dynamic_cast<CardItem *>(sel.first());
oldValueForDlg = QString::number(card->getCounters().value(counterId, 0));
} }
int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Set counters"), tr("Number:"), oldValue,
0, MAX_COUNTERS_ON_CARD, 1, &ok); auto &cardCounterSettings = SettingsCache::instance().cardCounters();
QString counterName = cardCounterSettings.displayName(counterId);
AbstractCounterDialog dialog(counterName, oldValueForDlg, player->getGame()->getTab());
int ok = dialog.exec();
player->setDialogSemaphore(false); player->setDialogSemaphore(false);
if (player->clearCardsToDelete() || !ok) { if (player->clearCardsToDelete() || !ok) {
return; return;
} }
for (const auto &item : player->getGameScene()->selectedItems()) { for (const auto &item : sel) {
auto *card = static_cast<CardItem *>(item); auto *card = dynamic_cast<CardItem *>(item);
int oldValue = card->getCounters().value(counterId, 0);
Expression exp(oldValue);
int number = static_cast<int>(exp.parse(dialog.textValue()));
auto *cmd = new Command_SetCardCounter; auto *cmd = new Command_SetCardCounter;
cmd->set_zone(card->getZone()->getName().toStdString()); cmd->set_zone(card->getZone()->getName().toStdString());
cmd->set_card_id(card->getId()); cmd->set_card_id(card->getId());