gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-10 04:07:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5348 from Cockatrice/set_owner

Browse Source 
Establish Card Ownership & Return on Player Leave
This commit is contained in:
Zach H
2024-12-27 18:26:45 -05:00
committed by GitHub
parent 8a04b2d69d a8bac1e468
commit 5cfe2b4762
2 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
common/server_player.cpp
View File

@@ -82,6 +82,7 @@
#include "trice_limits.h"
#include <QDebug>
#include <QRegularExpression>
#include <algorithm>
struct MoveCardStruct
@@ -644,6 +645,17 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
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) {
revealTopStart = true;
}
@@ -694,7 +706,8 @@ Response::ResponseCode Server_Player::setCardAttrHelper(GameEventStorage &ges,
const QString &zoneName,
int cardId,
CardAttribute attribute,
const QString &attrValue)
const QString &attrValue,
Server_Card *unzonedCard)
{
Server_CardZone *zone = getZones().value(zoneName);
if (!zone) {
@@ -714,7 +727,7 @@ Response::ResponseCode Server_Player::setCardAttrHelper(GameEventStorage &ges,
}
}
} else {
Server_Card *card = zone->getCard(cardId);
Server_Card *card = unzonedCard == nullptr ? zone->getCard(cardId) : unzonedCard;
if (!card) {
return Response::RespNameNotFound;
}
@@ -873,6 +886,47 @@ Server_Player::cmdConcede(const Command_Concede & /*cmd*/, ResponseContainer & /
setConceded(true);
game->removeArrowsRelatedToPlayer(ges, this);
game->unattachCards(ges, this);
// Return cards to their rightful owners before conceding the game
static const QRegularExpression ownerRegex{"Owner: ?([^\n]+)"};
for (const auto &card : zones.value("table")->getCards()) {
if (card == nullptr) {
continue;
}
const auto &regexResult = ownerRegex.match(card->getAnnotation());
if (!regexResult.hasMatch()) {
continue;
}
CardToMove cardToMove;
cardToMove.set_card_id(card->getId());
for (const auto &player : game->getPlayers()) {
if (player == nullptr || player->getUserInfo() == nullptr) {
continue;
}
const auto &ownerToReturnTo = regexResult.captured(1);
const auto &correctOwner = QString::compare(QString::fromStdString(player->getUserInfo()->name()),
ownerToReturnTo, Qt::CaseInsensitive) == 0;
if (!correctOwner) {
continue;
}
const auto &startZone = zones.value("table");
const auto &targetZone = player->getZones().value("table");
if (startZone == nullptr || targetZone == nullptr) {
continue;
}
moveCard(ges, startZone, QList<const CardToMove *>() << &cardToMove, targetZone, 0, 0, false);
break;
}
}
// All borrowed cards have been returned, can now continue cleanup process
clearZones();
Event_PlayerPropertiesChanged event;

3
common/server_player.h
View File

@@ -186,7 +186,8 @@ public:
const QString &zone,
int cardId,
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