From 76c45562898760d7c06f78825bdec3de64df272b Mon Sep 17 00:00:00 2001 From: Skagra42 Date: Wed, 12 Aug 2026 01:53:59 -0600 Subject: [PATCH] Progress. --- cockatrice/src/client/settings/shortcuts_settings.h | 2 +- cockatrice/src/game/board/card_state.cpp | 10 ++++++++++ cockatrice/src/game/board/card_state.h | 8 ++++++++ cockatrice/src/game/player/player_event_handler.cpp | 6 ++++++ cockatrice/src/game/player/player_event_handler.h | 1 + cockatrice/src/game_graphics/board/card_item.cpp | 8 ++++++++ .../src/game_graphics/log/message_log_widget.cpp | 12 ++++++++++++ .../src/game_graphics/log/message_log_widget.h | 1 + .../game_graphics/player/card_menu_action_type.h | 1 + .../src/game_graphics/player/menu/card_menu.cpp | 2 +- .../server/remote/game/server_abstract_player.cpp | 7 +++++++ .../network/server/remote/game/server_card.cpp | 13 ++++++++++++- .../network/server/remote/game/server_card.h | 9 +++++++++ .../libcockatrice/protocol/pb/card_attributes.proto | 1 + .../libcockatrice/protocol/pb/serverinfo_card.proto | 3 +++ 15 files changed, 81 insertions(+), 3 deletions(-) diff --git a/cockatrice/src/client/settings/shortcuts_settings.h b/cockatrice/src/client/settings/shortcuts_settings.h index 8ec6da63a..276184a8c 100644 --- a/cockatrice/src/client/settings/shortcuts_settings.h +++ b/cockatrice/src/client/settings/shortcuts_settings.h @@ -504,7 +504,7 @@ private: {"Player/aDoesntUntap", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle Skip Untapping"), parseSequenceString("Alt+U"), ShortcutGroup::Playing_Area)}, - {"Player/aDoesntUntapOnce", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle Skip Untapping Once"), + {"Player/aDoesntUntapOnce", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle Skip (One Turn)"), parseSequenceString(""), ShortcutGroup::Playing_Area)}, {"Player/aFlip", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Turn Card Over"), diff --git a/cockatrice/src/game/board/card_state.cpp b/cockatrice/src/game/board/card_state.cpp index 4319400d7..fda57111c 100644 --- a/cockatrice/src/game/board/card_state.cpp +++ b/cockatrice/src/game/board/card_state.cpp @@ -89,6 +89,16 @@ void CardState::setDoesntUntap(bool _doesntUntap) emit stateChanged(); } +void CardState::setDoesntUntapOnce(bool _doesntUntapOnce) +{ + if (doesntUntapOnce == _doesntUntapOnce) { + return; + } + doesntUntapOnce = _doesntUntapOnce; + emit doesntUntapOnceChanged(_doesntUntapOnce); + emit stateChanged(); +} + void CardState::setDestroyOnZoneChange(bool _destroyOnZoneChange) { if (destroyOnZoneChange == _destroyOnZoneChange) { diff --git a/cockatrice/src/game/board/card_state.h b/cockatrice/src/game/board/card_state.h index 6d13030e8..3a84621dc 100644 --- a/cockatrice/src/game/board/card_state.h +++ b/cockatrice/src/game/board/card_state.h @@ -30,6 +30,7 @@ signals: void annotationChanged(const QString &newAnnotation); void ptChanged(const QString &newPt); void doesntUntapChanged(bool newValue); + void doesntUntapOnceChanged(bool newValue); void destroyOnZoneChangeChanged(bool newValue); void attachedToChanged(CardItem *newAttachedTo); void zoneChanged(CardState *changedCard, CardZoneLogic *newZone); @@ -86,6 +87,13 @@ public: void setDoesntUntap(bool _doesntUntap); + bool getDoesntUntapOnce() const + { + return doesntUntapOnce; + } + + void setDoesntUntapOnce(bool _doesntUntapOnce); + bool getDestroyOnZoneChange() const { return destroyOnZoneChange; diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp index bc48298f7..701474299 100644 --- a/cockatrice/src/game/player/player_event_handler.cpp +++ b/cockatrice/src/game/player/player_event_handler.cpp @@ -231,6 +231,12 @@ void PlayerEventHandler::setCardAttrHelper(const GameEventContext &context, card->setDoesntUntap(value); break; } + case AttrDoesntUntapOnce: { + bool value = (avalue == "1"); + emit logSetDoesntUntapOnce(player, card, value); + card->setDoesntUntapOnce(value); + break; + } case AttrPT: { emit logSetPT(player, card, avalue); card->setPT(avalue); diff --git a/cockatrice/src/game/player/player_event_handler.h b/cockatrice/src/game/player/player_event_handler.h index cfd82933f..044250465 100644 --- a/cockatrice/src/game/player/player_event_handler.h +++ b/cockatrice/src/game/player/player_event_handler.h @@ -69,6 +69,7 @@ signals: void logSetTapped(PlayerLogic *player, CardItem *card, bool tapped); void logSetCounter(PlayerLogic *player, QString counterName, int value, int oldValue); void logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap); + void logSetDoesntUntapOnce(PlayerLogic *player, CardItem *card, bool doesntUntapOnce); void logSetPT(PlayerLogic *player, CardItem *card, QString newPT); void logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation); void logDumpZone(PlayerLogic *player, CardZoneLogic *zone, int numberCards, bool isReversed = false); diff --git a/cockatrice/src/game_graphics/board/card_item.cpp b/cockatrice/src/game_graphics/board/card_item.cpp index cabe988c2..78cab4985 100644 --- a/cockatrice/src/game_graphics/board/card_item.cpp +++ b/cockatrice/src/game_graphics/board/card_item.cpp @@ -173,6 +173,12 @@ void CardItem::setDoesntUntap(bool _doesntUntap) update(); } +void CardItem::setDoesntUntapOnce(bool _doesntUntapOnce) +{ + state->setDoesntUntapOnce(_doesntUntapOnce); + update(); +} + void CardItem::setPT(const QString &_pt) { state->setPT(_pt); @@ -223,6 +229,7 @@ void CardItem::resetState(bool keepAnnotations) attachedCards.clear(); setTapped(false, false); setDoesntUntap(false); + setDoesntUntapOnce(false); if (scene()) { static_cast(scene())->unregisterAnimationItem(this); } @@ -248,6 +255,7 @@ void CardItem::processCardInfo(const ServerInfo_Card &_info) setTapped(_info.tapped()); setDestroyOnZoneChange(_info.destroy_on_zone_change()); setDoesntUntap(_info.doesnt_untap()); + setDoesntUntapOnce(_info.doesnt_untap_once()); } CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool forceFaceDown) diff --git a/cockatrice/src/game_graphics/log/message_log_widget.cpp b/cockatrice/src/game_graphics/log/message_log_widget.cpp index ccd903b04..c0b449b4a 100644 --- a/cockatrice/src/game_graphics/log/message_log_widget.cpp +++ b/cockatrice/src/game_graphics/log/message_log_widget.cpp @@ -691,6 +691,17 @@ void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardItem *card, bo appendHtmlServerMessage(str.arg(sanitizeHtml(player->getPlayerInfo()->getName())).arg(cardLink(card->getName()))); } +void MessageLogWidget::logSetDoesntUntapOnce(PlayerLogic *player, CardItem *card, bool doesntUntapOnce) +{ + QString str; + if (doesntUntapOnce) { + str = tr("%1 sets %2 to not untap during the next untap step."); + } else { + str = tr("%1 sets %2 to untap normally."); + } + appendHtmlServerMessage(str.arg(sanitizeHtml(player->getPlayerInfo()->getName())).arg(cardLink(card->getName()))); +} + void MessageLogWidget::logSetPT(PlayerLogic *player, CardItem *card, QString newPT) { if (currentContext == MessageContext_MoveCard) { @@ -837,6 +848,7 @@ void MessageLogWidget::connectToPlayerEventHandler(PlayerEventHandler *playerEve connect(playerEventHandler, &PlayerEventHandler::logSetCardCounter, this, &MessageLogWidget::logSetCardCounter); connect(playerEventHandler, &PlayerEventHandler::logSetTapped, this, &MessageLogWidget::logSetTapped); connect(playerEventHandler, &PlayerEventHandler::logSetDoesntUntap, this, &MessageLogWidget::logSetDoesntUntap); + connect(playerEventHandler, &PlayerEventHandler::logSetDoesntUntapOnce, this, &MessageLogWidget::logSetDoesntUntapOnce); connect(playerEventHandler, &PlayerEventHandler::logSetPT, this, &MessageLogWidget::logSetPT); connect(playerEventHandler, &PlayerEventHandler::logSetAnnotation, this, &MessageLogWidget::logSetAnnotation); connect(playerEventHandler, &PlayerEventHandler::logMoveCard, this, &MessageLogWidget::logMoveCard); diff --git a/cockatrice/src/game_graphics/log/message_log_widget.h b/cockatrice/src/game_graphics/log/message_log_widget.h index a145d358d..bfd60acf0 100644 --- a/cockatrice/src/game_graphics/log/message_log_widget.h +++ b/cockatrice/src/game_graphics/log/message_log_widget.h @@ -92,6 +92,7 @@ public slots: void logSetCardCounter(PlayerLogic *player, QString cardName, int counterId, int value, int oldValue); void logSetCounter(PlayerLogic *player, QString counterName, int value, int oldValue); void logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap); + void logSetDoesntUntapOnce(PlayerLogic *player, CardItem *card, bool doesntUntapOnce); void logSetPT(PlayerLogic *player, CardItem *card, QString newPT); void logSetSideboardLock(PlayerLogic *player, bool locked); void logSetTapped(PlayerLogic *player, CardItem *card, bool tapped); diff --git a/cockatrice/src/game_graphics/player/card_menu_action_type.h b/cockatrice/src/game_graphics/player/card_menu_action_type.h index 4cae22716..3697adf75 100644 --- a/cockatrice/src/game_graphics/player/card_menu_action_type.h +++ b/cockatrice/src/game_graphics/player/card_menu_action_type.h @@ -13,6 +13,7 @@ enum CardMenuActionType cmTap, cmUntap, cmDoesntUntap, + cmDoesntUntapOnce, cmFlip, cmPeek, cmClone, diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.cpp b/cockatrice/src/game_graphics/player/menu/card_menu.cpp index fdf4bb50f..d332fb296 100644 --- a/cockatrice/src/game_graphics/player/menu/card_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/card_menu.cpp @@ -493,7 +493,7 @@ void CardMenu::retranslateUi() //: Turn sideways or back again aTap->setText(tr("&Tap / Untap")); aDoesntUntap->setText(tr("Skip &untapping")); - aDoesntUntapOnce->setText(tr("Skip &untapping once")); + aDoesntUntapOnce->setText(tr("Skip &Untapping (One Turn)")); //: Turn face up/face down aFlip->setText(tr("T&urn Over")); // Only the user facing names in client got renamed to "turn over" // All code and proto bits are still unchanged (flip) for compatibility reasons diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp index 157fa6441..e8edd2ca6 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp @@ -1075,6 +1075,11 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo ges.enqueueGameEvent(event, playerId); } + if (card->getDoesntUntapOnce() != targetCard->getDoesntUntapOnce()) { + card->setAttribute(AttrDoesntUntapOnce, QVariant(targetCard->getDoesntUntapOnce()).toString(), &event); + ges.enqueueGameEvent(event, playerId); + } + // Copy counters QMapIterator i(targetCard->getCounters()); while (i.hasNext()) { @@ -1432,6 +1437,7 @@ Server_AbstractPlayer::cmdDumpZone(const Command_DumpZone &cmd, ResponseContaine cardInfo->set_annotation(card->getAnnotation().toStdString()); cardInfo->set_destroy_on_zone_change(card->getDestroyOnZoneChange()); cardInfo->set_doesnt_untap(card->getDoesntUntap()); + cardInfo->set_doesnt_untap_once(card->getDoesntUntapOnce()); QMapIterator cardCounterIterator(card->getCounters()); while (cardCounterIterator.hasNext()) { @@ -1544,6 +1550,7 @@ Server_AbstractPlayer::cmdRevealCards(const Command_RevealCards &cmd, ResponseCo cardInfo->set_annotation(card->getAnnotation().toStdString()); cardInfo->set_destroy_on_zone_change(card->getDestroyOnZoneChange()); cardInfo->set_doesnt_untap(card->getDoesntUntap()); + cardInfo->set_doesnt_untap_once(card->getDoesntUntapOnce()); QMapIterator cardCounterIterator(card->getCounters()); while (cardCounterIterator.hasNext()) { diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp index b858314c0..9a1e03e93 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp @@ -31,7 +31,7 @@ Server_Card::Server_Card(const CardRef &cardRef, int _id, int _coord_x, int _coord_y, Server_CardZone *_zone) : zone(_zone), id(_id), coord_x(_coord_x), coord_y(_coord_y), cardRef(cardRef), tapped(false), attacking(false), - facedown(false), destroyOnZoneChange(false), doesntUntap(false), parentCard(0), stashedCard(nullptr) + facedown(false), destroyOnZoneChange(false), doesntUntap(false), doesntUntapOnce(false), parentCard(0), stashedCard(nullptr) { } @@ -66,6 +66,11 @@ void Server_Card::resetState(bool keepAnnotations) QString Server_Card::setAttribute(CardAttribute attribute, const QString &avalue, bool allCards) { + if (attribute == AttrTapped && avalue != "1" && allCards && doesntUntapOnce) { + setDoesntUntapOnce(false); + return QVariant(tapped).toString(); + } + if (attribute == AttrTapped && avalue != "1" && allCards && doesntUntap) { return QVariant(tapped).toString(); } @@ -105,6 +110,9 @@ QString Server_Card::setAttribute(CardAttribute attribute, const QString &avalue case AttrDoesntUntap: setDoesntUntap(avalue == "1"); break; + case AttrDoesntUntapOnce: + setDoesntUntapOnce(avalue == "1"); + break; } if (event) { event->set_attr_value(avalue.toStdString()); @@ -204,6 +212,9 @@ void Server_Card::getInfo(ServerInfo_Card *info) if (doesntUntap) { info->set_doesnt_untap(true); } + if (doesntUntapOnce) { + info->set_doesnt_untap_once(true); + } QMapIterator cardCounterIterator(counters); while (cardCounterIterator.hasNext()) { diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h index 3d7e649b9..8cdff0d2e 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h @@ -49,6 +49,7 @@ private: QString annotation; bool destroyOnZoneChange; bool doesntUntap; + bool doesntUntapOnce; Server_Card *parentCard; QList attachedCards; @@ -127,6 +128,10 @@ public: { return doesntUntap; } + bool getDoesntUntapOnce() const + { + return doesntUntapOnce; + } bool getDestroyOnZoneChange() const { return destroyOnZoneChange; @@ -203,6 +208,10 @@ public: { doesntUntap = _doesntUntap; } + void setDoesntUntapOnce(bool _doesntUntapOnce) + { + doesntUntapOnce = _doesntUntapOnce; + } void setParentCard(Server_Card *_parentCard); void addAttachedCard(Server_Card *card) { diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/card_attributes.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/card_attributes.proto index ac23ca0d3..e42de5612 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/card_attributes.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/card_attributes.proto @@ -7,4 +7,5 @@ enum CardAttribute { AttrPT = 5; AttrAnnotation = 6; AttrDoesntUntap = 7; + AttrDoesntUntapOnce = 8; } diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_card.proto index a9a8b5c9d..8264e189b 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_card.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_card.proto @@ -53,4 +53,7 @@ message ServerInfo_Card { // unique id of this kind of card, extends the name to specify a specific printing of a card optional string provider_id = 17; + + // whether the card should not be untapped during its controller's next turn + optional bool doesnt_untap_once = 18; }