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

Keep Annotations on Stack

Browse source
This commit is contained in:
ZeldaZach 2024-12-31 13:37:00 -05:00
parent ded6d5b8eb
commit 75b7205310
No known key found for this signature in database
6 changed files with 16 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;
facedown = false;
counters.clear();
pt.clear();
annotation.clear();
if (!keepAnnotations) {
annotation.clear();
}
attachedTo = 0;
attachedCards.clear();
setTapped(false, false);

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

@ -139,7 +139,7 @@ public:
{
return attachedCards;
}
void resetState();
void resetState(bool keepAnnotations = false);
void processCardInfo(const ServerInfo_Card &_info);
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->setParentItem(this);
card->resetState();
card->resetState(true);
card->setVisible(true);
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();
setTapped(false);
setAttacking(false);
setPT(QString());
setAnnotation(QString());
if (!keepAnnotations) {
setAnnotation(QString());
}
setDoesntUntap(false);
}

2
common/server_card.h
View file

@ -218,7 +218,7 @@ public:
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, Event_SetCardAttr *event = nullptr);

6
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);
} else {
yCoord = 0;
card->resetState();
card->resetState(targetzone->getName() == "stack");
}
targetzone->insertCard(card, newX, yCoord);
@ -576,6 +576,10 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
eventOthers.set_start_player_id(startzone->getPlayer()->getPlayerId());
eventOthers.set_start_zone(startzone->getName().toStdString());
eventOthers.set_target_player_id(targetzone->getPlayer()->getPlayerId());
if (targetzone->getName() == "stack") {
setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(),
AttrAnnotation, card->getAnnotation(), card);
}
if (startzone != targetzone) {
eventOthers.set_target_zone(targetzone->getName().toStdString());
}