From 556d19ff70dad740d3543a8456fdd0c2cfc1276d Mon Sep 17 00:00:00 2001 From: John Hill Date: Sun, 30 Jul 2017 21:34:24 -0700 Subject: [PATCH] Clone in exile and graveyard (#2813) --- cockatrice/src/player.cpp | 56 +++++++++++++++------------------------ 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 1b082471..54d3ae7b 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -2555,14 +2555,10 @@ void Player::updateCardMenu(const CardItem *card) } } - if (revealedCard) - { + if (revealedCard) { cardMenu->addAction(aHide); - } - else if (writeableCard) - { - if (moveMenu->isEmpty()) - { + } else if (writeableCard) { + if (moveMenu->isEmpty()) { moveMenu->addAction(aMoveToTopLibrary); moveMenu->addAction(aMoveToXfromTopOfLibrary); moveMenu->addAction(aMoveToBottomLibrary); @@ -2574,12 +2570,9 @@ void Player::updateCardMenu(const CardItem *card) moveMenu->addAction(aMoveToExile); } - if (card->getZone()) - { - if (card->getZone()->getName() == "table") - { - if (ptMenu->isEmpty()) - { + if (card->getZone()) { + if (card->getZone()->getName() == "table") { + if (ptMenu->isEmpty()) { ptMenu->addAction(aIncP); ptMenu->addAction(aDecP); ptMenu->addSeparator(); @@ -2596,8 +2589,7 @@ void Player::updateCardMenu(const CardItem *card) cardMenu->addAction(aUntap); cardMenu->addAction(aDoesntUntap); cardMenu->addAction(aFlip); - if (card->getFaceDown()) - { + if (card->getFaceDown()) { cardMenu->addAction(aPeek); } @@ -2605,8 +2597,7 @@ void Player::updateCardMenu(const CardItem *card) cardMenu->addSeparator(); cardMenu->addAction(aAttach); - if (card->getAttachedTo()) - { + if (card->getAttachedTo()) { cardMenu->addAction(aUnattach); } cardMenu->addAction(aDrawArrow); @@ -2617,41 +2608,36 @@ void Player::updateCardMenu(const CardItem *card) cardMenu->addAction(aClone); cardMenu->addMenu(moveMenu); - for (int i = 0; i < aAddCounter.size(); ++i) - { + for (int i = 0; i < aAddCounter.size(); ++i) { cardMenu->addSeparator(); cardMenu->addAction(aAddCounter[i]); - if (card->getCounters().contains(i)) - { + if (card->getCounters().contains(i)) { cardMenu->addAction(aRemoveCounter[i]); } cardMenu->addAction(aSetCounter[i]); } cardMenu->addSeparator(); - } - else if (card->getZone()->getName() == "stack") - { + } else if (card->getZone()->getName() == "stack") { cardMenu->addAction(aDrawArrow); cardMenu->addMenu(moveMenu); addRelatedCardActions(card, cardMenu); - } - else - { + } else if (card->getZone()->getName() == "rfg" || card->getZone()->getName() == "grave") { + cardMenu->addAction(aPlay); + cardMenu->addAction(aPlayFacedown); + cardMenu->addSeparator(); + cardMenu->addAction(aClone); + cardMenu->addMenu(moveMenu); + } else { cardMenu->addAction(aPlay); cardMenu->addAction(aPlayFacedown); cardMenu->addMenu(moveMenu); } - } - else - { + } else { cardMenu->addMenu(moveMenu); } - } - else - { - if (card->getZone() && card->getZone()->getName() != "hand") - { + } else { + if (card->getZone() && card->getZone()->getName() != "hand") { cardMenu->addAction(aDrawArrow); cardMenu->addSeparator(); addRelatedCardActions(card, cardMenu);