+Two-Deck game type. 2 decks. 2 redeals. + +
+Move all the cards to the foundations. + +
+Like Topsy-Turvy Queens, +but five cards are dealt in each tableau pile, and empty +tableau piles can only be filled by queens. diff --git a/html-src/rules/topsyturvyqueens.html b/html-src/rules/topsyturvyqueens.html new file mode 100644 index 00000000..dfdc5731 --- /dev/null +++ b/html-src/rules/topsyturvyqueens.html @@ -0,0 +1,25 @@ +
+Two-Deck game type. 2 decks. 2 redeals. + +
+Move all the cards to the foundations. + +
+Build the tableau stacks down by the same suit, turning +the corner as needed (aces can be played on kings and vice versa). +Any card can be placed in an empty tableau stack. +
+Build the foundation stacks up by suit, starting with a king, +then the ace, and the remaining cards in sequence up to the +queen. There are seven cards above the first seven foundations - +these cards are locked, and may be flipped face-up and used only +once the foundation below them has been filled. Once placed in a +foundation, cards cannot be moved. +
+When you get stuck, you can deal cards one at a time from the stock. +You can go through the stock a total of three times. +
+The game is won when all eight foundations are filled. diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index 4feb04e6..aaac3d97 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -873,6 +873,17 @@ class TopsyTurvyQueens(LockedCards): shallHighlightMatch = Game._shallHighlightMatch_SSW +class KingsSecrets(LockedCards): + Foundation_Class = StackWrapper(LockedCards_Foundation, + base_rank=KING, mod=13) + RowStack_Class = StackWrapper(SS_RowStack, mod=13, base_rank=11) + + def startGame(self): + LockedCards.startGame(self, rows=5) + + shallHighlightMatch = Game._shallHighlightMatch_SSW + + # ************************************************************************ # * Thirty # ************************************************************************ @@ -1021,3 +1032,5 @@ registerGame(GameInfo(721, Thirty, "Thirty", ranks=(0, 6, 7, 8, 9, 10, 11, 12))) registerGame(GameInfo(725, TopsyTurvyQueens, "Topsy-Turvy Queens", GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED)) +registerGame(GameInfo(792, KingsSecrets, "King's Secrets", + GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED)) diff --git a/pysollib/kivy/selectgame.py b/pysollib/kivy/selectgame.py index f75b540f..e8bdcc9c 100644 --- a/pysollib/kivy/selectgame.py +++ b/pysollib/kivy/selectgame.py @@ -105,7 +105,7 @@ class SelectGameData(SelectDialogTreeData): select_mahjongg_game) g.append(gg) if g[0]: - s_by_type = SelectGameNode(None, _("French games"), + s_by_type = SelectGameNode(None, _("French Games"), tuple(g[0]), expanded=1) if g[1]: s_oriental = SelectGameNode(None, _("Oriental Games"), diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py index 81704889..f4a8ab31 100644 --- a/pysollib/tile/selectgame.py +++ b/pysollib/tile/selectgame.py @@ -109,7 +109,7 @@ class SelectGameData(SelectDialogTreeData): select_mahjongg_game) g.append(gg) if g[0]: - s_by_type = SelectGameNode(None, _("French games"), + s_by_type = SelectGameNode(None, _("French Games"), tuple(g[0]), expanded=1) if g[1]: s_oriental = SelectGameNode(None, _("Oriental Games"), diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index d2f3dbf8..e4f81212 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -109,7 +109,7 @@ class SelectGameData(SelectDialogTreeData): select_mahjongg_game) g.append(gg) if g[0]: - s_by_type = SelectGameNode(None, _("French games"), + s_by_type = SelectGameNode(None, _("French Games"), tuple(g[0]), expanded=1) if g[1]: s_oriental = SelectGameNode(None, _("Oriental Games"),