jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-30 02:23:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Establish Card Ownership Tag

Browse source
This commit is contained in:
ZeldaZach 2024-12-27 18:23:09 -05:00
parent 17893d9747
commit 4f798286af
No known key found for this signature in database
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
common/server_player.cpp
View file

@ -82,6 +82,7 @@
#include "trice_limits.h" #include "trice_limits.h"
#include <QDebug> #include <QDebug>
#include <QRegularExpression>
#include <algorithm> #include <algorithm>
struct MoveCardStruct struct MoveCardStruct
@ -644,6 +645,17 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
AttrPT, ptString); AttrPT, ptString);
} }
// If card is transferring to a different player, leave an annotation of who actually "owns" the card
const auto &priorAnnotation = card->getAnnotation();
if (startzone->getPlayer() != targetzone->getPlayer() && !priorAnnotation.contains("Owner:")) {
const auto &ownerAnnotation =
"Owner: " + QString::fromStdString(startzone->getPlayer()->getUserInfo()->name());
const auto &newAnnotation =
priorAnnotation.isEmpty() ? ownerAnnotation : ownerAnnotation + "\n\n" + priorAnnotation;
setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(),
AttrAnnotation, newAnnotation, card);
}
if (originalPosition == 0) { if (originalPosition == 0) {
revealTopStart = true; revealTopStart = true;
} }
@ -694,7 +706,8 @@ Response::ResponseCode Server_Player::setCardAttrHelper(GameEventStorage &ges,
const QString &zoneName, const QString &zoneName,
int cardId, int cardId,
CardAttribute attribute, CardAttribute attribute,
const QString &attrValue) const QString &attrValue,
Server_Card *unzonedCard)
{ {
Server_CardZone *zone = getZones().value(zoneName); Server_CardZone *zone = getZones().value(zoneName);
if (!zone) { if (!zone) {
@ -714,7 +727,7 @@ Response::ResponseCode Server_Player::setCardAttrHelper(GameEventStorage &ges,
} }
} }
} else { } else {
Server_Card *card = zone->getCard(cardId); Server_Card *card = unzonedCard == nullptr ? zone->getCard(cardId) : unzonedCard;
if (!card) { if (!card) {
return Response::RespNameNotFound; return Response::RespNameNotFound;
} }

3
common/server_player.h
View file

@ -186,7 +186,8 @@ public:
const QString &zone, const QString &zone,
int cardId, int cardId,
CardAttribute attribute, CardAttribute attribute,
const QString &attrValue); const QString &attrValue,
Server_Card *unzonedCard = nullptr);
Response::ResponseCode cmdLeaveGame(const Command_LeaveGame &cmd, ResponseContainer &rc, GameEventStorage &ges); Response::ResponseCode cmdLeaveGame(const Command_LeaveGame &cmd, ResponseContainer &rc, GameEventStorage &ges);
Response::ResponseCode Response::ResponseCode