jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-08 11:03:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Refactor] Move the remaining zone commands out of game_graphics/zones/ (#7418)

Browse source 
* [Refactor] Move the remaining zone commands out of game_graphics/zones/

* [Game] Move zone dump request onto ZoneViewZoneLogic per review

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-10-31 18:44:09 +01:00 • committed by GitHub
parent 563833a88a
commit 095b135640
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 89 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

35
cockatrice/src/game/player/player_actions.cpp
View file

@ -50,6 +50,7 @@
#include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
#include <libcockatrice/protocol/pb/command_create_token.pb.h>
#include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
#include <libcockatrice/protocol/pb/command_dump_zone.pb.h>
#include <libcockatrice/protocol/pb/command_flip_card.pb.h>
#include <libcockatrice/protocol/pb/command_game_say.pb.h>
#include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
@ -2035,6 +2036,40 @@ void PlayerActions::moveCards(CardZoneLogic *startZone,
sendGameCommand(cmd);
}
PendingCommand *PlayerActions::prepareZoneDump(CardZoneLogic *zone, int numberCards)
{
if (!zone) {
return nullptr;
}
Command_DumpZone cmd;
cmd.set_player_id(zone->getPlayer()->getPlayerInfo()->getId());
cmd.set_zone_name(zone->getName().toStdString());
cmd.set_number_cards(numberCards);
if (auto *viewLogic = qobject_cast<ZoneViewZoneLogic *>(zone)) {
cmd.set_is_reversed(viewLogic->getIsReversed());
}
return prepareGameCommand(cmd);
}
void PlayerActions::actToggleTapped(const QString &zoneName, const QList<CardItem *> &cards, bool tapped)
{
QList<const ::google::protobuf::Message *> cmdList;
for (CardItem *card : cards) {
if (card->getTapped() != tapped) {
auto *cmd = new Command_SetCardAttr;
cmd->set_zone(zoneName.toStdString());
cmd->set_card_id(card->getId());
cmd->set_attribute(AttrTapped);
cmd->set_attr_value(tapped ? "1" : "0");
cmdList.append(cmd);
}
}
sendGameCommand(prepareGameCommand(cmdList));
}
void PlayerActions::sendGameCommand(const google::protobuf::Message &command)
{
if (player->getPlayerInfo()->getJudge() && !player->getPlayerInfo()->getLocal()) {