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

feat: enable expressions in card counters

Browse source
This commit is contained in:
Bruno Alexandre Rosa 2026-03-28 02:39:57 -03:00 • committed by RickyRister
parent 3ec9ae9772
commit 45ebf885c0
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,8 @@
#include "../zones/logic/view_zone_logic.h" #include "../zones/logic/view_zone_logic.h"
#include "../zones/table_zone.h" #include "../zones/table_zone.h"
#include "card_menu_action_type.h" #include "card_menu_action_type.h"
#include "libcockatrice/utility/expression.h"
#include "../client/settings/card_counter_settings.h"
#include <libcockatrice/card/database/card_database_manager.h> #include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/card/relation/card_relation.h> #include <libcockatrice/card/relation/card_relation.h>
@ -1572,23 +1574,35 @@ 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; int oldValue = 0;
if (player->getGameScene()->selectedItems().size() == 1) { QString counterName = "";
auto *card = static_cast<CardItem *>(player->getGameScene()->selectedItems().first());
if (auto selectedItems = player->getGameScene()->selectedItems(); selectedItems.size() == 1) {
const auto *card = dynamic_cast<CardItem *>(selectedItems.first());
const auto &cardCounterSettings = SettingsCache::instance().cardCounters();
counterName = cardCounterSettings.displayName(counterId);
oldValue = card->getCounters().value(counterId, 0); oldValue = 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); AbstractCounterDialog dialog(counterName, QString::number(oldValue), player->getGame()->getTab());
const int ok = dialog.exec();
if (!ok) {
return;
}
Expression exp(oldValue);
const auto number = static_cast<int>(exp.parse(dialog.textValue()));
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 : player->getGameScene()->selectedItems()) {
auto *card = static_cast<CardItem *>(item); const auto *card = dynamic_cast<CardItem *>(item);
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());