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

Update Event_MoveCard to include the card UUID.

Browse source
This commit is contained in:
Lukas Brübach 2024-11-15 23:17:27 +01:00
parent b81035e63b
commit 121e789716
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/pb/event_move_card.proto
View file

@ -16,4 +16,6 @@ message Event_MoveCard {
optional sint32 y = 9 [default = -1];
optional sint32 new_card_id = 10 [default = -1];
optional bool face_down = 11;
optional string uuid = 12;
optional string new_card_uuid = 13;
}

3
common/server_player.cpp
View file

@ -580,9 +580,11 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
startzone->getType() != ServerInfo_Zone::HiddenZone) {
eventPrivate.set_card_id(oldCardId);
eventPrivate.set_new_card_id(card->getId());
eventPrivate.set_new_card_uuid(card->getUUID().toStdString());
} else {
eventPrivate.set_card_id(-1);
eventPrivate.set_new_card_id(-1);
eventPrivate.set_new_card_uuid(QString("").toStdString());
}
if (sourceKnownToPlayer || !(faceDown || targetzone->getType() == ServerInfo_Zone::HiddenZone)) {
QString privateCardName = card->getName();
@ -619,6 +621,7 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
if (!(sourceHiddenToOthers && targetHiddenToOthers)) {
QString publicCardName = card->getName();
eventOthers.set_card_name(publicCardName.toStdString());
eventOthers.set_new_card_uuid(card->getUUID().toStdString());
}
eventOthers.set_new_card_id(card->getId());
}