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

hide revealed cards when they are shuffled (#4570)

Browse source
This commit is contained in:
ebbit1q 2022-02-23 23:46:07 +01:00 committed by GitHub
parent c88d44e16c
commit eb3ce1fd7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cockatrice/src/player.cpp
View file

@ -1846,11 +1846,32 @@ void Player::eventShuffle(const Event_Shuffle &event)
if (!zone) { if (!zone) {
return; return;
} }
auto &cardList = zone->getCards();
int absStart = event.start();
if (absStart < 0) { // negative indexes start from the end
absStart += cardList.length();
}
// close all views that contain shuffled cards
for (auto *view : zone->getViews()) { for (auto *view : zone->getViews()) {
if (view != nullptr) { if (view != nullptr) {
emit view->beingDeleted(); int length = view->getCards().length();
// we want to close empty views as well
if (length == 0 || length > absStart) { // note this assumes views always start at the top of the library
view->deleteLater();
break;
}
} else {
qWarning() << zone->getName() << "of" << getName() << "holds empty zoneview!";
} }
} }
// remove revealed card name on top of decks
if (absStart == 0 && !cardList.isEmpty()) {
cardList.first()->setName("");
zone->update();
}
emit logShuffle(this, zone, event.start(), event.end()); emit logShuffle(this, zone, event.start(), event.end());
} }
@ -1926,7 +1947,7 @@ void Player::eventSetCardAttr(const Event_SetCardAttr &event, const GameEventCon
} else { } else {
CardItem *card = zone->getCard(event.card_id(), QString()); CardItem *card = zone->getCard(event.card_id(), QString());
if (!card) { if (!card) {
qDebug() << "Player::eventSetCardAttr: card id=" << event.card_id() << "not found"; qWarning() << "Player::eventSetCardAttr: card id=" << event.card_id() << "not found";
return; return;
} }
setCardAttrHelper(context, card, event.attribute(), QString::fromStdString(event.attr_value()), false); setCardAttrHelper(context, card, event.attribute(), QString::fromStdString(event.attr_value()), false);
@ -2326,7 +2347,7 @@ void Player::processGameEvent(GameEvent::GameEventType type, const GameEvent &ev
eventChangeZoneProperties(event.GetExtension(Event_ChangeZoneProperties::ext)); eventChangeZoneProperties(event.GetExtension(Event_ChangeZoneProperties::ext));
break; break;
default: { default: {
qDebug() << "unhandled game event" << type; qWarning() << "unhandled game event" << type;
} }
} }
} }
@ -2501,7 +2522,6 @@ AbstractCounter *Player::addCounter(const ServerInfo_Counter &counter)
AbstractCounter *Player::addCounter(int counterId, const QString &name, QColor color, int radius, int value) AbstractCounter *Player::addCounter(int counterId, const QString &name, QColor color, int radius, int value)
{ {
qDebug() << "addCounter:" << getName() << counterId << name;
if (counters.contains(counterId)) { if (counters.contains(counterId)) {
return nullptr; return nullptr;
} }