jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't remove pt! 🔥🔥🔥🔥 (#3606)

Browse source 
* don't remove pt! 🔥🔥🔥🔥

* apply water to burns

* clangify

* fix clientside

* clangify

* missed qdebug

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
This commit is contained in:
ebbit1q 2019-03-04 06:55:54 +01:00 • committed by Zach H
parent a86aeb00c5
commit abe4f5ca60
3 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/player.cpp
View file

@ -2099,7 +2099,9 @@ void Player::playCard(CardItem *card, bool faceDown, bool tapped)
tableRow = faceDown ? 2 : info->getTableRow();
QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow));
cardToMove->set_face_down(faceDown);
cardToMove->set_pt(info->getPowTough().toStdString());
if (!faceDown) {
cardToMove->set_pt(info->getPowTough().toStdString());
}
cardToMove->set_tapped(faceDown ? false : tapped);
if (tableRow != 3)
cmd.set_target_zone("table");

16
cockatrice/src/tablezone.cpp
View file

@ -136,14 +136,16 @@ void TableZone::handleDropEventByGrid(const QList<CardDragItem *> &dragItems,
cmd.set_x(gridPoint.x());
cmd.set_y(gridPoint.y());
for (int i = 0; i < dragItems.size(); ++i) {
for (const auto &item : dragItems) {
CardToMove *ctm = cmd.mutable_cards_to_move()->add_card();
ctm->set_card_id(dragItems[i]->getId());
ctm->set_face_down(dragItems[i]->getFaceDown());
if (startZone->getName() != name && dragItems[i]->getItem()->getInfo())
ctm->set_pt(dragItems[i]->getItem()->getInfo()->getPowTough().toStdString());
else
ctm->set_pt(std::string());
ctm->set_card_id(item->getId());
ctm->set_face_down(item->getFaceDown());
if (startZone->getName() != name && !item->getFaceDown()) {
const auto &info = item->getItem()->getInfo();
if (info) {
ctm->set_pt(info->getPowTough().toStdString());
}
}
}
startZone->getPlayer()->sendGameCommand(cmd);

7
common/server_player.cpp
View file

@ -587,11 +587,10 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
AttrTapped, "1");
}
QString ptString = QString::fromStdString(thisCardProperties->pt());
if (!faceDown) {
ptString = QString::fromStdString(thisCardProperties->pt());
if (!ptString.isEmpty()) {
setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(),
AttrPT, ptString);
}
setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(), AttrPT,
ptString);
}
if (startzone->getAlwaysRevealTopCard() && !startzone->getCards().isEmpty() && (originalPosition == 0)) {
Event_RevealCards revealEvent;