mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-02 19:43:55 -07:00
[Game] Add face down versions of move cards from library actions (#6661)
* implement actions * add new actions to menu * update shortcuts
This commit is contained in:
parent
e7a3ad86eb
commit
1bcea27a44
5 changed files with 90 additions and 10 deletions
|
|
@ -598,11 +598,19 @@ private:
|
||||||
{"Player/aMoveTopCardsToGraveyard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple)"),
|
{"Player/aMoveTopCardsToGraveyard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple)"),
|
||||||
parseSequenceString("Alt+M"),
|
parseSequenceString("Alt+M"),
|
||||||
ShortcutGroup::Move_top)},
|
ShortcutGroup::Move_top)},
|
||||||
|
{"Player/aMoveTopCardsToGraveyardFaceDown",
|
||||||
|
ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple), Face Down"),
|
||||||
|
parseSequenceString(""),
|
||||||
|
ShortcutGroup::Move_top)},
|
||||||
{"Player/aMoveTopCardToExile",
|
{"Player/aMoveTopCardToExile",
|
||||||
ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::Move_top)},
|
ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::Move_top)},
|
||||||
{"Player/aMoveTopCardsToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple)"),
|
{"Player/aMoveTopCardsToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple)"),
|
||||||
parseSequenceString(""),
|
parseSequenceString(""),
|
||||||
ShortcutGroup::Move_top)},
|
ShortcutGroup::Move_top)},
|
||||||
|
{"Player/aMoveTopCardsToExileFaceDown",
|
||||||
|
ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple), Face Down"),
|
||||||
|
parseSequenceString(""),
|
||||||
|
ShortcutGroup::Move_top)},
|
||||||
{"Player/aMoveTopCardsUntil", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Stack Until Found"),
|
{"Player/aMoveTopCardsUntil", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Stack Until Found"),
|
||||||
parseSequenceString("Ctrl+Shift+Y"),
|
parseSequenceString("Ctrl+Shift+Y"),
|
||||||
ShortcutGroup::Move_top)},
|
ShortcutGroup::Move_top)},
|
||||||
|
|
@ -620,11 +628,19 @@ private:
|
||||||
{"Player/aMoveBottomCardsToGrave", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple)"),
|
{"Player/aMoveBottomCardsToGrave", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple)"),
|
||||||
parseSequenceString(""),
|
parseSequenceString(""),
|
||||||
ShortcutGroup::Move_bottom)},
|
ShortcutGroup::Move_bottom)},
|
||||||
|
{"Player/aMoveBottomCardsToGraveFaceDown",
|
||||||
|
ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple), Face Down"),
|
||||||
|
parseSequenceString(""),
|
||||||
|
ShortcutGroup::Move_bottom)},
|
||||||
{"Player/aMoveBottomCardToExile",
|
{"Player/aMoveBottomCardToExile",
|
||||||
ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::Move_bottom)},
|
ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::Move_bottom)},
|
||||||
{"Player/aMoveBottomCardsToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple)"),
|
{"Player/aMoveBottomCardsToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple)"),
|
||||||
parseSequenceString(""),
|
parseSequenceString(""),
|
||||||
ShortcutGroup::Move_bottom)},
|
ShortcutGroup::Move_bottom)},
|
||||||
|
{"Player/aMoveBottomCardsToExileFaceDown",
|
||||||
|
ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple), Face Down"),
|
||||||
|
parseSequenceString(""),
|
||||||
|
ShortcutGroup::Move_bottom)},
|
||||||
{"Player/aMoveBottomCardToTop", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Top of Library"),
|
{"Player/aMoveBottomCardToTop", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Top of Library"),
|
||||||
parseSequenceString(""),
|
parseSequenceString(""),
|
||||||
ShortcutGroup::Move_bottom)},
|
ShortcutGroup::Move_bottom)},
|
||||||
|
|
|
||||||
|
|
@ -51,8 +51,10 @@ LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent)
|
||||||
topLibraryMenu->addSeparator();
|
topLibraryMenu->addSeparator();
|
||||||
topLibraryMenu->addAction(aMoveTopCardToGraveyard);
|
topLibraryMenu->addAction(aMoveTopCardToGraveyard);
|
||||||
topLibraryMenu->addAction(aMoveTopCardsToGraveyard);
|
topLibraryMenu->addAction(aMoveTopCardsToGraveyard);
|
||||||
|
topLibraryMenu->addAction(aMoveTopCardsToGraveyardFaceDown);
|
||||||
topLibraryMenu->addAction(aMoveTopCardToExile);
|
topLibraryMenu->addAction(aMoveTopCardToExile);
|
||||||
topLibraryMenu->addAction(aMoveTopCardsToExile);
|
topLibraryMenu->addAction(aMoveTopCardsToExile);
|
||||||
|
topLibraryMenu->addAction(aMoveTopCardsToExileFaceDown);
|
||||||
topLibraryMenu->addAction(aMoveTopCardsUntil);
|
topLibraryMenu->addAction(aMoveTopCardsUntil);
|
||||||
topLibraryMenu->addSeparator();
|
topLibraryMenu->addSeparator();
|
||||||
topLibraryMenu->addAction(aShuffleTopCards);
|
topLibraryMenu->addAction(aShuffleTopCards);
|
||||||
|
|
@ -66,8 +68,10 @@ LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent)
|
||||||
bottomLibraryMenu->addSeparator();
|
bottomLibraryMenu->addSeparator();
|
||||||
bottomLibraryMenu->addAction(aMoveBottomCardToGraveyard);
|
bottomLibraryMenu->addAction(aMoveBottomCardToGraveyard);
|
||||||
bottomLibraryMenu->addAction(aMoveBottomCardsToGraveyard);
|
bottomLibraryMenu->addAction(aMoveBottomCardsToGraveyard);
|
||||||
|
bottomLibraryMenu->addAction(aMoveBottomCardsToGraveyardFaceDown);
|
||||||
bottomLibraryMenu->addAction(aMoveBottomCardToExile);
|
bottomLibraryMenu->addAction(aMoveBottomCardToExile);
|
||||||
bottomLibraryMenu->addAction(aMoveBottomCardsToExile);
|
bottomLibraryMenu->addAction(aMoveBottomCardsToExile);
|
||||||
|
bottomLibraryMenu->addAction(aMoveBottomCardsToExileFaceDown);
|
||||||
bottomLibraryMenu->addSeparator();
|
bottomLibraryMenu->addSeparator();
|
||||||
bottomLibraryMenu->addAction(aShuffleBottomCards);
|
bottomLibraryMenu->addAction(aShuffleBottomCards);
|
||||||
|
|
||||||
|
|
@ -136,8 +140,14 @@ void LibraryMenu::createMoveActions()
|
||||||
connect(aMoveTopCardToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardToExile);
|
connect(aMoveTopCardToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardToExile);
|
||||||
aMoveTopCardsToGraveyard = new QAction(this);
|
aMoveTopCardsToGraveyard = new QAction(this);
|
||||||
connect(aMoveTopCardsToGraveyard, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsToGrave);
|
connect(aMoveTopCardsToGraveyard, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsToGrave);
|
||||||
|
aMoveTopCardsToGraveyardFaceDown = new QAction(this);
|
||||||
|
connect(aMoveTopCardsToGraveyardFaceDown, &QAction::triggered, playerActions,
|
||||||
|
&PlayerActions::actMoveTopCardsToGraveFaceDown);
|
||||||
aMoveTopCardsToExile = new QAction(this);
|
aMoveTopCardsToExile = new QAction(this);
|
||||||
connect(aMoveTopCardsToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsToExile);
|
connect(aMoveTopCardsToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsToExile);
|
||||||
|
aMoveTopCardsToExileFaceDown = new QAction(this);
|
||||||
|
connect(aMoveTopCardsToExileFaceDown, &QAction::triggered, playerActions,
|
||||||
|
&PlayerActions::actMoveTopCardsToExileFaceDown);
|
||||||
aMoveTopCardsUntil = new QAction(this);
|
aMoveTopCardsUntil = new QAction(this);
|
||||||
connect(aMoveTopCardsUntil, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsUntil);
|
connect(aMoveTopCardsUntil, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsUntil);
|
||||||
aMoveTopCardToBottom = new QAction(this);
|
aMoveTopCardToBottom = new QAction(this);
|
||||||
|
|
@ -156,8 +166,14 @@ void LibraryMenu::createMoveActions()
|
||||||
aMoveBottomCardsToGraveyard = new QAction(this);
|
aMoveBottomCardsToGraveyard = new QAction(this);
|
||||||
connect(aMoveBottomCardsToGraveyard, &QAction::triggered, playerActions,
|
connect(aMoveBottomCardsToGraveyard, &QAction::triggered, playerActions,
|
||||||
&PlayerActions::actMoveBottomCardsToGrave);
|
&PlayerActions::actMoveBottomCardsToGrave);
|
||||||
|
aMoveBottomCardsToGraveyardFaceDown = new QAction(this);
|
||||||
|
connect(aMoveBottomCardsToGraveyardFaceDown, &QAction::triggered, playerActions,
|
||||||
|
&PlayerActions::actMoveBottomCardsToGraveFaceDown);
|
||||||
aMoveBottomCardsToExile = new QAction(this);
|
aMoveBottomCardsToExile = new QAction(this);
|
||||||
connect(aMoveBottomCardsToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveBottomCardsToExile);
|
connect(aMoveBottomCardsToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveBottomCardsToExile);
|
||||||
|
aMoveBottomCardsToExileFaceDown = new QAction(this);
|
||||||
|
connect(aMoveBottomCardsToExileFaceDown, &QAction::triggered, playerActions,
|
||||||
|
&PlayerActions::actMoveBottomCardsToExileFaceDown);
|
||||||
aMoveBottomCardToTop = new QAction(this);
|
aMoveBottomCardToTop = new QAction(this);
|
||||||
connect(aMoveBottomCardToTop, &QAction::triggered, playerActions, &PlayerActions::actMoveBottomCardToTop);
|
connect(aMoveBottomCardToTop, &QAction::triggered, playerActions, &PlayerActions::actMoveBottomCardToTop);
|
||||||
}
|
}
|
||||||
|
|
@ -216,7 +232,9 @@ void LibraryMenu::retranslateUi()
|
||||||
aMoveTopCardToGraveyard->setText(tr("Move top card to grave&yard"));
|
aMoveTopCardToGraveyard->setText(tr("Move top card to grave&yard"));
|
||||||
aMoveTopCardToExile->setText(tr("Move top card to e&xile"));
|
aMoveTopCardToExile->setText(tr("Move top card to e&xile"));
|
||||||
aMoveTopCardsToGraveyard->setText(tr("Move top cards to &graveyard..."));
|
aMoveTopCardsToGraveyard->setText(tr("Move top cards to &graveyard..."));
|
||||||
|
aMoveTopCardsToGraveyardFaceDown->setText(tr("Move top cards to graveyard face down..."));
|
||||||
aMoveTopCardsToExile->setText(tr("Move top cards to &exile..."));
|
aMoveTopCardsToExile->setText(tr("Move top cards to &exile..."));
|
||||||
|
aMoveTopCardsToExileFaceDown->setText(tr("Move top cards to exile face down..."));
|
||||||
aMoveTopCardsUntil->setText(tr("Put top cards on stack &until..."));
|
aMoveTopCardsUntil->setText(tr("Put top cards on stack &until..."));
|
||||||
aShuffleTopCards->setText(tr("Shuffle top cards..."));
|
aShuffleTopCards->setText(tr("Shuffle top cards..."));
|
||||||
|
|
||||||
|
|
@ -227,7 +245,9 @@ void LibraryMenu::retranslateUi()
|
||||||
aMoveBottomCardToGraveyard->setText(tr("Move bottom card to grave&yard"));
|
aMoveBottomCardToGraveyard->setText(tr("Move bottom card to grave&yard"));
|
||||||
aMoveBottomCardToExile->setText(tr("Move bottom card to e&xile"));
|
aMoveBottomCardToExile->setText(tr("Move bottom card to e&xile"));
|
||||||
aMoveBottomCardsToGraveyard->setText(tr("Move bottom cards to &graveyard..."));
|
aMoveBottomCardsToGraveyard->setText(tr("Move bottom cards to &graveyard..."));
|
||||||
|
aMoveBottomCardsToGraveyardFaceDown->setText(tr("Move bottom cards to graveyard face down..."));
|
||||||
aMoveBottomCardsToExile->setText(tr("Move bottom cards to &exile..."));
|
aMoveBottomCardsToExile->setText(tr("Move bottom cards to &exile..."));
|
||||||
|
aMoveBottomCardsToExileFaceDown->setText(tr("Move bottom cards to exile face down..."));
|
||||||
aMoveBottomCardToTop->setText(tr("Put bottom card on &top"));
|
aMoveBottomCardToTop->setText(tr("Put bottom card on &top"));
|
||||||
aShuffleBottomCards->setText(tr("Shuffle bottom cards..."));
|
aShuffleBottomCards->setText(tr("Shuffle bottom cards..."));
|
||||||
}
|
}
|
||||||
|
|
@ -335,8 +355,10 @@ void LibraryMenu::setShortcutsActive()
|
||||||
aMoveTopToPlayFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveTopToPlayFaceDown"));
|
aMoveTopToPlayFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveTopToPlayFaceDown"));
|
||||||
aMoveTopCardToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToGraveyard"));
|
aMoveTopCardToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToGraveyard"));
|
||||||
aMoveTopCardsToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToGraveyard"));
|
aMoveTopCardsToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToGraveyard"));
|
||||||
|
aMoveTopCardsToGraveyardFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToGraveyardFaceDown"));
|
||||||
aMoveTopCardToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToExile"));
|
aMoveTopCardToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToExile"));
|
||||||
aMoveTopCardsToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToExile"));
|
aMoveTopCardsToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToExile"));
|
||||||
|
aMoveTopCardsToExileFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToExileFaceDown"));
|
||||||
aMoveTopCardsUntil->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsUntil"));
|
aMoveTopCardsUntil->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsUntil"));
|
||||||
aMoveTopCardToBottom->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToBottom"));
|
aMoveTopCardToBottom->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToBottom"));
|
||||||
aDrawBottomCard->setShortcuts(shortcuts.getShortcut("Player/aDrawBottomCard"));
|
aDrawBottomCard->setShortcuts(shortcuts.getShortcut("Player/aDrawBottomCard"));
|
||||||
|
|
@ -345,8 +367,10 @@ void LibraryMenu::setShortcutsActive()
|
||||||
aMoveBottomToPlayFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomToPlayFaceDown"));
|
aMoveBottomToPlayFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomToPlayFaceDown"));
|
||||||
aMoveBottomCardToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToGrave"));
|
aMoveBottomCardToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToGrave"));
|
||||||
aMoveBottomCardsToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToGrave"));
|
aMoveBottomCardsToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToGrave"));
|
||||||
|
aMoveBottomCardsToGraveyardFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToGraveFaceDown"));
|
||||||
aMoveBottomCardToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToExile"));
|
aMoveBottomCardToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToExile"));
|
||||||
aMoveBottomCardsToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToExile"));
|
aMoveBottomCardsToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToExile"));
|
||||||
|
aMoveBottomCardsToExileFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToExileFaceDown"));
|
||||||
aMoveBottomCardToTop->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToTop"));
|
aMoveBottomCardToTop->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToTop"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -367,8 +391,10 @@ void LibraryMenu::setShortcutsInactive()
|
||||||
aMoveTopToPlayFaceDown->setShortcut(QKeySequence());
|
aMoveTopToPlayFaceDown->setShortcut(QKeySequence());
|
||||||
aMoveTopCardToGraveyard->setShortcut(QKeySequence());
|
aMoveTopCardToGraveyard->setShortcut(QKeySequence());
|
||||||
aMoveTopCardsToGraveyard->setShortcut(QKeySequence());
|
aMoveTopCardsToGraveyard->setShortcut(QKeySequence());
|
||||||
|
aMoveTopCardsToGraveyardFaceDown->setShortcut(QKeySequence());
|
||||||
aMoveTopCardToExile->setShortcut(QKeySequence());
|
aMoveTopCardToExile->setShortcut(QKeySequence());
|
||||||
aMoveTopCardsToExile->setShortcut(QKeySequence());
|
aMoveTopCardsToExile->setShortcut(QKeySequence());
|
||||||
|
aMoveTopCardsToExileFaceDown->setShortcut(QKeySequence());
|
||||||
aMoveTopCardsUntil->setShortcut(QKeySequence());
|
aMoveTopCardsUntil->setShortcut(QKeySequence());
|
||||||
aDrawBottomCard->setShortcut(QKeySequence());
|
aDrawBottomCard->setShortcut(QKeySequence());
|
||||||
aDrawBottomCards->setShortcut(QKeySequence());
|
aDrawBottomCards->setShortcut(QKeySequence());
|
||||||
|
|
@ -376,6 +402,8 @@ void LibraryMenu::setShortcutsInactive()
|
||||||
aMoveBottomToPlayFaceDown->setShortcut(QKeySequence());
|
aMoveBottomToPlayFaceDown->setShortcut(QKeySequence());
|
||||||
aMoveBottomCardToGraveyard->setShortcut(QKeySequence());
|
aMoveBottomCardToGraveyard->setShortcut(QKeySequence());
|
||||||
aMoveBottomCardsToGraveyard->setShortcut(QKeySequence());
|
aMoveBottomCardsToGraveyard->setShortcut(QKeySequence());
|
||||||
|
aMoveBottomCardsToGraveyardFaceDown->setShortcut(QKeySequence());
|
||||||
aMoveBottomCardToExile->setShortcut(QKeySequence());
|
aMoveBottomCardToExile->setShortcut(QKeySequence());
|
||||||
aMoveBottomCardsToExile->setShortcut(QKeySequence());
|
aMoveBottomCardsToExile->setShortcut(QKeySequence());
|
||||||
|
aMoveBottomCardsToExileFaceDown->setShortcut(QKeySequence());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,9 @@ public:
|
||||||
QAction *aMoveTopCardToGraveyard = nullptr;
|
QAction *aMoveTopCardToGraveyard = nullptr;
|
||||||
QAction *aMoveTopCardToExile = nullptr;
|
QAction *aMoveTopCardToExile = nullptr;
|
||||||
QAction *aMoveTopCardsToGraveyard = nullptr;
|
QAction *aMoveTopCardsToGraveyard = nullptr;
|
||||||
|
QAction *aMoveTopCardsToGraveyardFaceDown = nullptr;
|
||||||
QAction *aMoveTopCardsToExile = nullptr;
|
QAction *aMoveTopCardsToExile = nullptr;
|
||||||
|
QAction *aMoveTopCardsToExileFaceDown = nullptr;
|
||||||
QAction *aMoveTopCardsUntil = nullptr;
|
QAction *aMoveTopCardsUntil = nullptr;
|
||||||
QAction *aShuffleTopCards = nullptr;
|
QAction *aShuffleTopCards = nullptr;
|
||||||
|
|
||||||
|
|
@ -100,7 +102,9 @@ public:
|
||||||
QAction *aMoveBottomCardToGraveyard = nullptr;
|
QAction *aMoveBottomCardToGraveyard = nullptr;
|
||||||
QAction *aMoveBottomCardToExile = nullptr;
|
QAction *aMoveBottomCardToExile = nullptr;
|
||||||
QAction *aMoveBottomCardsToGraveyard = nullptr;
|
QAction *aMoveBottomCardsToGraveyard = nullptr;
|
||||||
|
QAction *aMoveBottomCardsToGraveyardFaceDown = nullptr;
|
||||||
QAction *aMoveBottomCardsToExile = nullptr;
|
QAction *aMoveBottomCardsToExile = nullptr;
|
||||||
|
QAction *aMoveBottomCardsToExileFaceDown = nullptr;
|
||||||
QAction *aShuffleBottomCards = nullptr;
|
QAction *aShuffleBottomCards = nullptr;
|
||||||
|
|
||||||
int defaultNumberTopCards = 1;
|
int defaultNumberTopCards = 1;
|
||||||
|
|
|
||||||
|
|
@ -424,15 +424,25 @@ void PlayerActions::actMoveTopCardToExile()
|
||||||
|
|
||||||
void PlayerActions::actMoveTopCardsToGrave()
|
void PlayerActions::actMoveTopCardsToGrave()
|
||||||
{
|
{
|
||||||
moveTopCardsTo("grave", tr("grave"));
|
moveTopCardsTo("grave", tr("grave"), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PlayerActions::actMoveTopCardsToGraveFaceDown()
|
||||||
|
{
|
||||||
|
moveTopCardsTo("grave", tr("grave"), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlayerActions::actMoveTopCardsToExile()
|
void PlayerActions::actMoveTopCardsToExile()
|
||||||
{
|
{
|
||||||
moveTopCardsTo("rfg", tr("exile"));
|
moveTopCardsTo("rfg", tr("exile"), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlayerActions::moveTopCardsTo(const QString &targetZone, const QString &zoneDisplayName)
|
void PlayerActions::actMoveTopCardsToExileFaceDown()
|
||||||
|
{
|
||||||
|
moveTopCardsTo("rfg", tr("exile"), true);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PlayerActions::moveTopCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown)
|
||||||
{
|
{
|
||||||
const int maxCards = player->getDeckZone()->getCards().size();
|
const int maxCards = player->getDeckZone()->getCards().size();
|
||||||
if (maxCards == 0) {
|
if (maxCards == 0) {
|
||||||
|
|
@ -460,7 +470,11 @@ void PlayerActions::moveTopCardsTo(const QString &targetZone, const QString &zon
|
||||||
cmd.set_y(0);
|
cmd.set_y(0);
|
||||||
|
|
||||||
for (int i = number - 1; i >= 0; --i) {
|
for (int i = number - 1; i >= 0; --i) {
|
||||||
cmd.mutable_cards_to_move()->add_card()->set_card_id(i);
|
auto card = cmd.mutable_cards_to_move()->add_card();
|
||||||
|
card->set_card_id(i);
|
||||||
|
if (faceDown) {
|
||||||
|
card->set_face_down(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sendGameCommand(cmd);
|
sendGameCommand(cmd);
|
||||||
|
|
@ -608,15 +622,25 @@ void PlayerActions::actMoveBottomCardToExile()
|
||||||
|
|
||||||
void PlayerActions::actMoveBottomCardsToGrave()
|
void PlayerActions::actMoveBottomCardsToGrave()
|
||||||
{
|
{
|
||||||
moveBottomCardsTo("grave", tr("grave"));
|
moveBottomCardsTo("grave", tr("grave"), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PlayerActions::actMoveBottomCardsToGraveFaceDown()
|
||||||
|
{
|
||||||
|
moveBottomCardsTo("grave", tr("grave"), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlayerActions::actMoveBottomCardsToExile()
|
void PlayerActions::actMoveBottomCardsToExile()
|
||||||
{
|
{
|
||||||
moveBottomCardsTo("rfg", tr("exile"));
|
moveBottomCardsTo("rfg", tr("exile"), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlayerActions::moveBottomCardsTo(const QString &targetZone, const QString &zoneDisplayName)
|
void PlayerActions::actMoveBottomCardsToExileFaceDown()
|
||||||
|
{
|
||||||
|
moveBottomCardsTo("rfg", tr("exile"), true);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PlayerActions::moveBottomCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown)
|
||||||
{
|
{
|
||||||
const int maxCards = player->getDeckZone()->getCards().size();
|
const int maxCards = player->getDeckZone()->getCards().size();
|
||||||
if (maxCards == 0) {
|
if (maxCards == 0) {
|
||||||
|
|
@ -644,7 +668,11 @@ void PlayerActions::moveBottomCardsTo(const QString &targetZone, const QString &
|
||||||
cmd.set_y(0);
|
cmd.set_y(0);
|
||||||
|
|
||||||
for (int i = maxCards - number; i < maxCards; ++i) {
|
for (int i = maxCards - number; i < maxCards; ++i) {
|
||||||
cmd.mutable_cards_to_move()->add_card()->set_card_id(i);
|
auto card = cmd.mutable_cards_to_move()->add_card();
|
||||||
|
card->set_card_id(i);
|
||||||
|
if (faceDown) {
|
||||||
|
card->set_face_down(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sendGameCommand(cmd);
|
sendGameCommand(cmd);
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,9 @@ public slots:
|
||||||
void actMoveTopCardToGrave();
|
void actMoveTopCardToGrave();
|
||||||
void actMoveTopCardToExile();
|
void actMoveTopCardToExile();
|
||||||
void actMoveTopCardsToGrave();
|
void actMoveTopCardsToGrave();
|
||||||
|
void actMoveTopCardsToGraveFaceDown();
|
||||||
void actMoveTopCardsToExile();
|
void actMoveTopCardsToExile();
|
||||||
|
void actMoveTopCardsToExileFaceDown();
|
||||||
void actMoveTopCardsUntil();
|
void actMoveTopCardsUntil();
|
||||||
void actMoveTopCardToBottom();
|
void actMoveTopCardToBottom();
|
||||||
void actDrawBottomCard();
|
void actDrawBottomCard();
|
||||||
|
|
@ -108,7 +110,9 @@ public slots:
|
||||||
void actMoveBottomCardToGrave();
|
void actMoveBottomCardToGrave();
|
||||||
void actMoveBottomCardToExile();
|
void actMoveBottomCardToExile();
|
||||||
void actMoveBottomCardsToGrave();
|
void actMoveBottomCardsToGrave();
|
||||||
|
void actMoveBottomCardsToGraveFaceDown();
|
||||||
void actMoveBottomCardsToExile();
|
void actMoveBottomCardsToExile();
|
||||||
|
void actMoveBottomCardsToExileFaceDown();
|
||||||
void actMoveBottomCardToTop();
|
void actMoveBottomCardToTop();
|
||||||
|
|
||||||
void actSelectAll();
|
void actSelectAll();
|
||||||
|
|
@ -180,8 +184,8 @@ private:
|
||||||
FilterString movingCardsUntilFilter;
|
FilterString movingCardsUntilFilter;
|
||||||
int movingCardsUntilCounter = 0;
|
int movingCardsUntilCounter = 0;
|
||||||
|
|
||||||
void moveTopCardsTo(const QString &targetZone, const QString &zoneDisplayName);
|
void moveTopCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown);
|
||||||
void moveBottomCardsTo(const QString &targetZone, const QString &zoneDisplayName);
|
void moveBottomCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown);
|
||||||
|
|
||||||
void createCard(const CardItem *sourceCard,
|
void createCard(const CardItem *sourceCard,
|
||||||
const QString &dbCardName,
|
const QString &dbCardName,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue