Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
e6495352
Commit
e6495352
authored
Apr 27, 2015
by
Fabio Bas
Browse files
Add "play top card face down" menu entry to library; fix #762
parent
1ca561de
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/player.cpp
View file @
e6495352
...
@@ -229,8 +229,10 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
...
@@ -229,8 +229,10 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
connect
(
aUndoDraw
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
actUndoDraw
()));
connect
(
aUndoDraw
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
actUndoDraw
()));
aShuffle
=
new
QAction
(
this
);
aShuffle
=
new
QAction
(
this
);
connect
(
aShuffle
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
actShuffle
()));
connect
(
aShuffle
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
actShuffle
()));
aMulligan
=
new
QAction
(
this
);
aMulligan
=
new
QAction
(
this
);
connect
(
aMulligan
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
actMulligan
()));
connect
(
aMulligan
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
actMulligan
()));
aMoveTopToPlayFaceDown
=
new
QAction
(
this
);
connect
(
aMoveTopToPlayFaceDown
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
actMoveTopCardToPlayFaceDown
()));
aMoveTopCardsToGrave
=
new
QAction
(
this
);
aMoveTopCardsToGrave
=
new
QAction
(
this
);
connect
(
aMoveTopCardsToGrave
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
actMoveTopCardsToGrave
()));
connect
(
aMoveTopCardsToGrave
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
actMoveTopCardsToGrave
()));
aMoveTopCardsToExile
=
new
QAction
(
this
);
aMoveTopCardsToExile
=
new
QAction
(
this
);
...
@@ -274,11 +276,11 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
...
@@ -274,11 +276,11 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
playerLists
.
append
(
mRevealTopCard
=
libraryMenu
->
addMenu
(
QString
()));
playerLists
.
append
(
mRevealTopCard
=
libraryMenu
->
addMenu
(
QString
()));
libraryMenu
->
addAction
(
aAlwaysRevealTopCard
);
libraryMenu
->
addAction
(
aAlwaysRevealTopCard
);
libraryMenu
->
addSeparator
();
libraryMenu
->
addSeparator
();
libraryMenu
->
addAction
(
aMoveTopToPlayFaceDown
);
libraryMenu
->
addAction
(
aMoveTopCardToBottom
);
libraryMenu
->
addAction
(
aMoveTopCardToBottom
);
libraryMenu
->
addAction
(
aMoveBottomCardToGrave
);
libraryMenu
->
addAction
(
aMoveBottomCardToGrave
);
libraryMenu
->
addSeparator
();
libraryMenu
->
addSeparator
();
libraryMenu
->
addAction
(
aMoveTopCardsToGrave
);
libraryMenu
->
addAction
(
aMoveTopCardsToGrave
);
libraryMenu
->
addSeparator
();
libraryMenu
->
addAction
(
aMoveTopCardsToExile
);
libraryMenu
->
addAction
(
aMoveTopCardsToExile
);
libraryMenu
->
addSeparator
();
libraryMenu
->
addSeparator
();
libraryMenu
->
addAction
(
aOpenDeckInDeckEditor
);
libraryMenu
->
addAction
(
aOpenDeckInDeckEditor
);
...
@@ -631,6 +633,7 @@ void Player::retranslateUi()
...
@@ -631,6 +633,7 @@ void Player::retranslateUi()
aUndoDraw
->
setText
(
tr
(
"&Undo last draw"
));
aUndoDraw
->
setText
(
tr
(
"&Undo last draw"
));
aMulligan
->
setText
(
tr
(
"Take &mulligan"
));
aMulligan
->
setText
(
tr
(
"Take &mulligan"
));
aShuffle
->
setText
(
tr
(
"&Shuffle"
));
aShuffle
->
setText
(
tr
(
"&Shuffle"
));
aMoveTopToPlayFaceDown
->
setText
(
tr
(
"Play top card &face down"
));
aMoveTopCardsToGrave
->
setText
(
tr
(
"Move top cards to &graveyard..."
));
aMoveTopCardsToGrave
->
setText
(
tr
(
"Move top cards to &graveyard..."
));
aMoveTopCardsToExile
->
setText
(
tr
(
"Move top cards to &exile..."
));
aMoveTopCardsToExile
->
setText
(
tr
(
"Move top cards to &exile..."
));
aMoveTopCardToBottom
->
setText
(
tr
(
"Put top card on &bottom"
));
aMoveTopCardToBottom
->
setText
(
tr
(
"Put top card on &bottom"
));
...
@@ -953,6 +956,21 @@ void Player::actMoveTopCardToBottom()
...
@@ -953,6 +956,21 @@ void Player::actMoveTopCardToBottom()
sendGameCommand
(
cmd
);
sendGameCommand
(
cmd
);
}
}
void
Player
::
actMoveTopCardToPlayFaceDown
()
{
Command_MoveCard
cmd
;
cmd
.
set_start_zone
(
"deck"
);
CardToMove
*
cardToMove
=
cmd
.
mutable_cards_to_move
()
->
add_card
();
cardToMove
->
set_card_id
(
0
);
cardToMove
->
set_face_down
(
true
);
cmd
.
set_target_player_id
(
getId
());
cmd
.
set_target_zone
(
"table"
);
cmd
.
set_x
(
-
1
);
cmd
.
set_y
(
0
);
sendGameCommand
(
cmd
);
}
void
Player
::
actMoveBottomCardToGrave
()
{
void
Player
::
actMoveBottomCardToGrave
()
{
CardZone
*
zone
=
zones
.
value
(
"deck"
);
CardZone
*
zone
=
zones
.
value
(
"deck"
);
Command_MoveCard
cmd
;
Command_MoveCard
cmd
;
...
...
cockatrice/src/player.h
View file @
e6495352
...
@@ -116,7 +116,8 @@ public slots:
...
@@ -116,7 +116,8 @@ public slots:
void
actDrawCard
();
void
actDrawCard
();
void
actDrawCards
();
void
actDrawCards
();
void
actUndoDraw
();
void
actUndoDraw
();
void
actMulligan
();
void
actMulligan
();
void
actMoveTopCardToPlayFaceDown
();
void
actMoveTopCardsToGrave
();
void
actMoveTopCardsToGrave
();
void
actMoveTopCardsToExile
();
void
actMoveTopCardsToExile
();
void
actMoveTopCardToBottom
();
void
actMoveTopCardToBottom
();
...
@@ -169,7 +170,7 @@ private:
...
@@ -169,7 +170,7 @@ private:
*
aMoveRfgToTopLibrary
,
*
aMoveRfgToBottomLibrary
,
*
aMoveRfgToHand
,
*
aMoveRfgToGrave
,
*
aMoveRfgToTopLibrary
,
*
aMoveRfgToBottomLibrary
,
*
aMoveRfgToHand
,
*
aMoveRfgToGrave
,
*
aViewLibrary
,
*
aViewTopCards
,
*
aAlwaysRevealTopCard
,
*
aOpenDeckInDeckEditor
,
*
aMoveTopCardsToGrave
,
*
aMoveTopCardsToExile
,
*
aMoveTopCardToBottom
,
*
aViewLibrary
,
*
aViewTopCards
,
*
aAlwaysRevealTopCard
,
*
aOpenDeckInDeckEditor
,
*
aMoveTopCardsToGrave
,
*
aMoveTopCardsToExile
,
*
aMoveTopCardToBottom
,
*
aViewGraveyard
,
*
aViewRfg
,
*
aViewSideboard
,
*
aViewGraveyard
,
*
aViewRfg
,
*
aViewSideboard
,
*
aDrawCard
,
*
aDrawCards
,
*
aUndoDraw
,
*
aMulligan
,
*
aShuffle
,
*
aDrawCard
,
*
aDrawCards
,
*
aUndoDraw
,
*
aMulligan
,
*
aShuffle
,
*
aMoveTopToPlayFaceDown
,
*
aUntapAll
,
*
aRollDie
,
*
aCreateToken
,
*
aCreateAnotherToken
,
*
aUntapAll
,
*
aRollDie
,
*
aCreateToken
,
*
aCreateAnotherToken
,
*
aCardMenu
,
*
aMoveBottomCardToGrave
;
*
aCardMenu
,
*
aMoveBottomCardToGrave
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment