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

Progress.

Browse source
This commit is contained in:
Skagra42 2026-07-26 12:14:15 -06:00
parent da4ba222c0
commit be2883ff01
5 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/client/settings/shortcuts_settings.h
View file

@ -504,6 +504,9 @@ private:
{"Player/aDoesntUntap", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle Skip Untapping"), {"Player/aDoesntUntap", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle Skip Untapping"),
parseSequenceString("Alt+U"), parseSequenceString("Alt+U"),
ShortcutGroup::Playing_Area)}, ShortcutGroup::Playing_Area)},
{"Player/aDoesntUntapOnce", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle Skip Untapping Once"),
parseSequenceString(""),
ShortcutGroup::Playing_Area)},
{"Player/aFlip", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Turn Card Over"), {"Player/aFlip", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Turn Card Over"),
parseSequenceString("Alt+F"), parseSequenceString("Alt+F"),
ShortcutGroup::Playing_Area)}, ShortcutGroup::Playing_Area)},

1
cockatrice/src/game/board/card_state.h
View file

@ -16,6 +16,7 @@ private:
QString annotation; QString annotation;
QString pt; QString pt;
bool doesntUntap = false; bool doesntUntap = false;
bool doesntUntapOnce = false;
bool destroyOnZoneChange = false; bool destroyOnZoneChange = false;
CardItem *attachedTo = nullptr; CardItem *attachedTo = nullptr;

5
cockatrice/src/game_graphics/board/card_item.h
View file

@ -105,6 +105,11 @@ public:
return state->getDoesntUntap(); return state->getDoesntUntap();
} }
void setDoesntUntap(bool _doesntUntap); void setDoesntUntap(bool _doesntUntap);
[[nodiscard]] bool getDoesntUntapOnce() const
{
return state->getDoesntUntapOnce();
}
void setDoesntUntapOnce(bool _doesntUntapOnce);
[[nodiscard]] QString getPT() const [[nodiscard]] QString getPT() const
{ {
return state->getPT(); return state->getPT();

4
cockatrice/src/game_graphics/player/menu/card_menu.cpp
View file

@ -73,6 +73,7 @@ CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _sho
// Actions using invoke (type dispatch, need selection) // Actions using invoke (type dispatch, need selection)
aTap = makeAction(this, invoke(cmTap)); aTap = makeAction(this, invoke(cmTap));
aDoesntUntap = makeAction(this, invoke(cmDoesntUntap), /*checkable=*/true, card && card->getDoesntUntap()); aDoesntUntap = makeAction(this, invoke(cmDoesntUntap), /*checkable=*/true, card && card->getDoesntUntap());
aDoesntUntapOnce = makeAction(this, invoke(cmDoesntUntapOnce), /*checkable=*/true, card && card->getDoesntUntapOnce());
aFlip = makeAction(this, invoke(cmFlip)); aFlip = makeAction(this, invoke(cmFlip));
aPeek = makeAction(this, invoke(cmPeek)); aPeek = makeAction(this, invoke(cmPeek));
aClone = makeAction(this, invoke(cmClone)); aClone = makeAction(this, invoke(cmClone));
@ -196,6 +197,7 @@ void CardMenu::createTableMenu(bool canModifyCard)
addAction(aTap); addAction(aTap);
addAction(aDoesntUntap); addAction(aDoesntUntap);
addAction(aDoesntUntapOnce);
addAction(aFlip); addAction(aFlip);
if (card->getFaceDown()) { if (card->getFaceDown()) {
addAction(aPeek); addAction(aPeek);
@ -491,6 +493,7 @@ void CardMenu::retranslateUi()
//: Turn sideways or back again //: Turn sideways or back again
aTap->setText(tr("&Tap / Untap")); aTap->setText(tr("&Tap / Untap"));
aDoesntUntap->setText(tr("Skip &untapping")); aDoesntUntap->setText(tr("Skip &untapping"));
aDoesntUntapOnce->setText(tr("Skip &untapping once"));
//: Turn face up/face down //: Turn face up/face down
aFlip->setText(tr("T&urn Over")); // Only the user facing names in client got renamed to "turn over" aFlip->setText(tr("T&urn Over")); // Only the user facing names in client got renamed to "turn over"
// All code and proto bits are still unchanged (flip) for compatibility reasons // All code and proto bits are still unchanged (flip) for compatibility reasons
@ -529,6 +532,7 @@ void CardMenu::setShortcutsActive()
aTap->setShortcuts(shortcuts.getShortcut("Player/aTap")); aTap->setShortcuts(shortcuts.getShortcut("Player/aTap"));
aDoesntUntap->setShortcuts(shortcuts.getShortcut("Player/aDoesntUntap")); aDoesntUntap->setShortcuts(shortcuts.getShortcut("Player/aDoesntUntap"));
aDoesntUntapOnce->setShortcuts(shortcuts.getShortcut("Player/aDoesntUntapOnce"));
aFlip->setShortcuts(shortcuts.getShortcut("Player/aFlip")); aFlip->setShortcuts(shortcuts.getShortcut("Player/aFlip"));
aPeek->setShortcuts(shortcuts.getShortcut("Player/aPeek")); aPeek->setShortcuts(shortcuts.getShortcut("Player/aPeek"));
aClone->setShortcuts(shortcuts.getShortcut("Player/aClone")); aClone->setShortcuts(shortcuts.getShortcut("Player/aClone"));

2
cockatrice/src/game_graphics/player/menu/card_menu.h
View file

@ -37,7 +37,7 @@ public:
QAction *aClone; QAction *aClone;
QAction *aSelectAll, *aSelectRow, *aSelectColumn; QAction *aSelectAll, *aSelectRow, *aSelectColumn;
QAction *aDrawArrow; QAction *aDrawArrow;
QAction *aTap, *aDoesntUntap; QAction *aTap, *aDoesntUntap, *aDoesntUntapOnce;
QAction *aFlip, *aPeek; QAction *aFlip, *aPeek;
QAction *aAttach, *aUnattach; QAction *aAttach, *aUnattach;
QAction *aSetAnnotation; QAction *aSetAnnotation;