jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 00:04:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

"Play top cards until" action now has option for number of hits (#5229)

Browse source 
* create new dlg window

* get thing to work

* move validation into dlg

* remove nodiscard

I'll revert this if someone else complains
This commit is contained in:
RickyRister 2024-12-12 05:03:42 -08:00 • committed by GitHub
parent 315cbc0925
commit e9b78c1c59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 130 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

55
cockatrice/src/game/player/player.cpp
View file

@ -5,6 +5,7 @@
#include "../../client/ui/theme_manager.h"
#include "../../deck/deck_loader.h"
#include "../../dialogs/dlg_create_token.h"
#include "../../dialogs/dlg_move_top_cards_until.h"
#include "../../dialogs/dlg_roll_dice.h"
#include "../../main.h"
#include "../../settings/cache_settings.h"
@ -1330,30 +1331,21 @@ void Player::actMoveTopCardsToExile()
void Player::actMoveTopCardsUntil()
{
moveTopCardTimer->stop();
movingCardsUntil = false;
QString expr = previousMovingCardsUntilExpr;
for (;;) {
bool ok;
expr = QInputDialog::getText(game, "Put top cards on stack until", "Card name (or search expressions)", {},
expr, &ok);
if (!ok) {
return;
}
movingCardsUntilFilter = FilterString(expr);
if (movingCardsUntilFilter.valid()) {
break;
} else {
auto button = QMessageBox::warning(game, "Invalid filter", movingCardsUntilFilter.error());
if (button != QMessageBox::Ok) {
return;
}
}
stopMoveTopCardsUntil();
DlgMoveTopCardsUntil dlg(game, previousMovingCardsUntilExpr, previousMovingCardsUntilNumberOfHits);
if (!dlg.exec()) {
return;
}
previousMovingCardsUntilExpr = expr;
previousMovingCardsUntilExpr = dlg.getExpr();
previousMovingCardsUntilNumberOfHits = dlg.getNumberOfHits();
if (zones.value("deck")->getCards().empty()) {
movingCardsUntil = false;
stopMoveTopCardsUntil();
} else {
movingCardsUntilFilter = FilterString(previousMovingCardsUntilExpr);
movingCardsUntilCounter = previousMovingCardsUntilNumberOfHits;
movingCardsUntil = true;
actMoveTopCardToPlay();
}
@ -1362,13 +1354,30 @@ void Player::actMoveTopCardsUntil()
void Player::moveOneCardUntil(const CardInfoPtr card)
{
moveTopCardTimer->stop();
if (zones.value("deck")->getCards().empty() || card.isNull() || movingCardsUntilFilter.check(card)) {
movingCardsUntil = false;
if (zones.value("deck")->getCards().empty() || card.isNull()) {
stopMoveTopCardsUntil();
} else if (movingCardsUntilFilter.check(card)) {
--movingCardsUntilCounter;
if (movingCardsUntilCounter > 0) {
moveTopCardTimer->start();
} else {
stopMoveTopCardsUntil();
}
} else {
moveTopCardTimer->start();
}
}
/**
* @brief Immediately stops any ongoing `play top card to stack until...` process, resetting all variables involved.
*/
void Player::stopMoveTopCardsUntil()
{
moveTopCardTimer->stop();
movingCardsUntilCounter = 0;
movingCardsUntil = false;
}
void Player::actMoveTopCardToBottom()
{
if (zones.value("deck")->getCards().empty()) {