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

Support Flip Cards with related art

Browse source
This commit is contained in:
Zach Halpern 2024-11-25 09:06:37 -05:00 • committed by ZeldaZach
parent db53066d89
commit aea52a4857
No known key found for this signature in database
8 changed files with 50 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/pb/command_create_token.proto
View file

@ -25,4 +25,6 @@ message Command_CreateToken {
// What to do with the target card. Ignored if there is no target card.
optional TargetMode target_mode = 11;
optional string card_provider_id = 12;
}

1
common/pb/event_create_token.proto
View file

@ -14,4 +14,5 @@ message Event_CreateToken {
optional bool destroy_on_zone_change = 7;
optional sint32 x = 8;
optional sint32 y = 9;
optional string card_provider_id = 10;
}

6
common/server_player.cpp
View file

@ -391,6 +391,7 @@ static Event_CreateToken makeCreateTokenEvent(Server_CardZone *zone, Server_Card
event.set_zone_name(zone->getName().toStdString());
event.set_card_id(card->getId());
event.set_card_name(card->getName().toStdString());
event.set_card_provider_id(card->getProviderId().toStdString());
event.set_color(card->getColor().toStdString());
event.set_pt(card->getPT().toStdString());
event.set_annotation(card->getAnnotation().toStdString());
@ -1400,7 +1401,8 @@ Server_Player::cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer
}
}
QString cardName = nameFromStdString(cmd.card_name());
const QString cardName = nameFromStdString(cmd.card_name());
const QString cardProviderId = nameFromStdString(cmd.card_provider_id());
if (zone->hasCoords()) {
xCoord = zone->getFreeGridColumn(xCoord, yCoord, cardName, false);
}
@ -1411,7 +1413,7 @@ Server_Player::cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer
yCoord = 0;
}
auto *card = new Server_Card(cardName, QString(), newCardId(), xCoord, yCoord);
auto *card = new Server_Card(cardName, cardProviderId, newCardId(), xCoord, yCoord);
card->moveToThread(thread());
card->setPT(nameFromStdString(cmd.pt()));
card->setColor(nameFromStdString(cmd.color()));