From c320312df9dcb48f85303309b408e8d5823a20a5 Mon Sep 17 00:00:00 2001 From: Joe R Date: Sun, 8 Jan 2023 17:52:27 -0500 Subject: [PATCH] Added McClellan game. --- html-src/rules/mcclellan.html | 14 ++++++++++++++ pysollib/gamedb.py | 2 +- pysollib/games/diplomat.py | 13 ++++++++++--- 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 html-src/rules/mcclellan.html diff --git a/html-src/rules/mcclellan.html b/html-src/rules/mcclellan.html new file mode 100644 index 00000000..067007ed --- /dev/null +++ b/html-src/rules/mcclellan.html @@ -0,0 +1,14 @@ +

McClellan

+

+Forty Thieves type. 2 decks. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Like Forty Thieves, +but with 8 tableau piles, with only the top cards face-up, +and sequences of cards of the same suit can be moved +together. diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index ddc3d66e..1ada3526 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -549,7 +549,7 @@ class GI: tuple(range(22217, 22219))), ('fc-2.14', tuple(range(811, 827))), ('fc-2.15', tuple(range(827, 855)) + tuple(range(22400, 22407))), - ('dev', tuple(range(855, 882))) + ('dev', tuple(range(855, 883))) ) # deprecated - the correct way is to or a GI.GT_XXX flag diff --git a/pysollib/games/diplomat.py b/pysollib/games/diplomat.py index c7e806b5..089cc771 100644 --- a/pysollib/games/diplomat.py +++ b/pysollib/games/diplomat.py @@ -228,11 +228,11 @@ class Dieppe(Diplomat): # ************************************************************************ # * Little Napoleon +# * McClellan # ************************************************************************ -class LittleNapoleon(Diplomat): - RowStack_Class = Spider_SS_RowStack - Hint_Class = Spider_Hint +class McClellan(Diplomat): + RowStack_Class = SS_RowStack def startGame(self): for i in range(3): @@ -242,6 +242,11 @@ class LittleNapoleon(Diplomat): getQuickPlayScore = Game._getSpiderQuickPlayScore +class LittleNapoleon(McClellan): + RowStack_Class = Spider_SS_RowStack + Hint_Class = Spider_Hint + + # ************************************************************************ # * Twin Queens # ************************************************************************ @@ -279,3 +284,5 @@ registerGame(GameInfo(549, Wheatsheaf, "Wheatsheaf", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(563, TwinQueens, "Twin Queens", GI.GT_FORTY_THIEVES, 2, 1, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(882, McClellan, "McClellan", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED))