aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

power and toughness values displayed after card flip (#3120)

Browse source
This commit is contained in:
David Szabo 2018-03-01 18:28:30 +01:00 committed by Zach H
parent 66958b5975
commit 281e52eaa9
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/player.cpp
View file

@ -2205,6 +2205,11 @@ void Player::cardMenuAction()
cmd->set_zone(card->getZone()->getName().toStdString()); cmd->set_zone(card->getZone()->getName().toStdString());
cmd->set_card_id(card->getId()); cmd->set_card_id(card->getId());
cmd->set_face_down(!card->getFaceDown()); cmd->set_face_down(!card->getFaceDown());
if (card->getFaceDown()) {
CardInfoPtr ci = card->getInfo();
if (ci)
cmd->set_pt(ci->getPowTough().toStdString());
}
commandList.append(cmd); commandList.append(cmd);
break; break;
} }

1
common/pb/command_flip_card.proto
View file

@ -7,6 +7,7 @@ message Command_FlipCard {
optional string zone = 1; optional string zone = 1;
optional sint32 card_id = 2 [default = -1]; optional sint32 card_id = 2 [default = -1];
optional bool face_down = 3; optional bool face_down = 3;
optional string pt = 4;
} }

4
common/server_player.cpp
View file

@ -1013,6 +1013,10 @@ Server_Player::cmdFlipCard(const Command_FlipCard &cmd, ResponseContainer & /*rc
event.set_face_down(faceDown); event.set_face_down(faceDown);
ges.enqueueGameEvent(event, playerId); ges.enqueueGameEvent(event, playerId);
QString ptString = QString::fromStdString(cmd.pt());
if (!ptString.isEmpty() && !faceDown)
setCardAttrHelper(ges, playerId, zone->getName(), card->getId(), AttrPT, ptString);
return Response::RespOk; return Response::RespOk;
} }