gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-01 15:49:58 -08:00
Code Issues Packages Projects Releases Wiki Activity

replace old mulligan with new behavior (#3773)

Browse Source
This commit is contained in:
ebbit1q
2019-07-12 04:53:09 +02:00
committed by Zach H
parent ce54aa6813
commit a3a1e20074
7 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
common/server_player.cpp
View File

@@ -90,8 +90,8 @@ Server_Player::Server_Player(Server_Game *_game,
bool _judge,
Server_AbstractUserInterface *_userInterface)
: ServerInfo_User_Container(_userInfo), game(_game), userInterface(_userInterface), deck(nullptr), pingTime(0),
playerId(_playerId), spectator(_spectator), judge(_judge), initialCards(0), nextCardId(0), readyStart(false),
conceded(false), sideboardLocked(true)
playerId(_playerId), spectator(_spectator), judge(_judge), nextCardId(0), readyStart(false), conceded(false),
sideboardLocked(true)
{
}
@@ -166,8 +166,6 @@ void Server_Player::setupZones()
addCounter(new Server_Counter(6, "x", makeColor(255, 255, 255), 20, 0));
addCounter(new Server_Counter(7, "storm", makeColor(255, 150, 30), 20, 0));
initialCards = 7;
// ------------------------------------------------------------------
// Assign card ids and create deck from deck list
@@ -980,7 +978,7 @@ Server_Player::cmdShuffle(const Command_Shuffle &cmd, ResponseContainer & /*rc*/
}
Response::ResponseCode
Server_Player::cmdMulligan(const Command_Mulligan & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges)
Server_Player::cmdMulligan(const Command_Mulligan &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
{
if (spectator) {
return Response::RespFunctionNotAllowed;
@@ -994,14 +992,18 @@ Server_Player::cmdMulligan(const Command_Mulligan & /*cmd*/, ResponseContainer &
}
Server_CardZone *hand = zones.value("hand");
int number = (hand->getCards().size() <= 1) ? initialCards : hand->getCards().size() - 1;
Server_CardZone *deck = zones.value("deck");
while (!hand->getCards().isEmpty()) {
auto *cardToMove = new CardToMove;
cardToMove->set_card_id(hand->getCards().first()->getId());
moveCard(ges, hand, QList<const CardToMove *>() << cardToMove, deck, 0, 0, false);
delete cardToMove;
int number = cmd.number();
if (!hand->getCards().isEmpty()) {
auto cardsToMove = QList<const CardToMove *>();
for (auto &card : hand->getCards()) {
auto *cardToMove = new CardToMove;
cardToMove->set_card_id(card->getId());
cardsToMove.append(cardToMove);
}
moveCard(ges, hand, cardsToMove, deck, -1, 0, false);
qDeleteAll(cardsToMove);
}
deck->shuffle();
@@ -1009,12 +1011,8 @@ Server_Player::cmdMulligan(const Command_Mulligan & /*cmd*/, ResponseContainer &
drawCards(ges, number);
if (number == initialCards) {
number = -1;
}
Context_Mulligan context;
context.set_number(static_cast<google::protobuf::uint32>(number));
context.set_number(static_cast<google::protobuf::uint32>(hand->getCards().size()));
ges.setGameEventContext(context);
return Response::RespOk;