jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-29 01:53:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Keep card annotations on stack (#5399)

Browse source
This commit is contained in:
Zach H 2024-12-31 14:08:25 -05:00 • committed by GitHub
parent b2a8748bc6
commit 6e1047032d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/game/cards/card_item.cpp
View file

@ -217,13 +217,15 @@ void CardItem::setAttachedTo(CardItem *_attachedTo)
} }
} }
void CardItem::resetState() void CardItem::resetState(bool keepAnnotations)
{ {
attacking = false; attacking = false;
facedown = false; facedown = false;
counters.clear(); counters.clear();
pt.clear(); pt.clear();
annotation.clear(); if (!keepAnnotations) {
annotation.clear();
}
attachedTo = 0; attachedTo = 0;
attachedCards.clear(); attachedCards.clear();
setTapped(false, false); setTapped(false, false);

2
cockatrice/src/game/cards/card_item.h
View file

@ -139,7 +139,7 @@ public:
{ {
return attachedCards; return attachedCards;
} }
void resetState(); void resetState(bool keepAnnotations = false);
void processCardInfo(const ServerInfo_Card &_info); void processCardInfo(const ServerInfo_Card &_info);
QMenu *getCardMenu() const QMenu *getCardMenu() const

2
cockatrice/src/game/zones/stack_zone.cpp
View file

@ -37,7 +37,7 @@ void StackZone::addCardImpl(CardItem *card, int x, int /*y*/)
card->setName(); card->setName();
} }
card->setParentItem(this); card->setParentItem(this);
card->resetState(); card->resetState(true);
card->setVisible(true); card->setVisible(true);
card->update(); card->update();
} }

6
common/server_card.cpp
View file

@ -54,13 +54,15 @@ Server_Card::~Server_Card()
} }
} }
void Server_Card::resetState() void Server_Card::resetState(bool keepAnnotations)
{ {
counters.clear(); counters.clear();
setTapped(false); setTapped(false);
setAttacking(false); setAttacking(false);
setPT(QString()); setPT(QString());
setAnnotation(QString()); if (!keepAnnotations) {
setAnnotation(QString());
}
setDoesntUntap(false); setDoesntUntap(false);
} }

2
common/server_card.h
View file

@ -218,7 +218,7 @@ public:
return oldStashedCard; return oldStashedCard;
} }
void resetState(); void resetState(bool keepAnnotations = false);
QString setAttribute(CardAttribute attribute, const QString &avalue, bool allCards); QString setAttribute(CardAttribute attribute, const QString &avalue, bool allCards);
QString setAttribute(CardAttribute attribute, const QString &avalue, Event_SetCardAttr *event = nullptr); QString setAttribute(CardAttribute attribute, const QString &avalue, Event_SetCardAttr *event = nullptr);

2
common/server_player.cpp
View file

@ -548,7 +548,7 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
newX = targetzone->getFreeGridColumn(newX, yCoord, card->getName(), faceDown); newX = targetzone->getFreeGridColumn(newX, yCoord, card->getName(), faceDown);
} else { } else {
yCoord = 0; yCoord = 0;
card->resetState(); card->resetState(targetzone->getName() == "stack");
} }
targetzone->insertCard(card, newX, yCoord); targetzone->insertCard(card, newX, yCoord);