From bb06d86a2cbe97414082e2961a2232992db6c2a6 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Sat, 18 Feb 2023 10:07:41 -0500
Subject: [PATCH] Added Cromwell game.

---
 html-src/rules/cromwell.html | 25 +++++++++++++++++++++++++
 pysollib/gamedb.py           |  4 ++--
 pysollib/games/fan.py        | 33 ++++++++++++++++++++++++++++++++-
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 html-src/rules/cromwell.html

diff --git a/html-src/rules/cromwell.html b/html-src/rules/cromwell.html
new file mode 100644
index 00000000..18709e8b
--- /dev/null
+++ b/html-src/rules/cromwell.html
@@ -0,0 +1,25 @@
+<h1>Cromwell</h1>
+<p>
+Fan game type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+Four cards are dealt to each of 26 tableau piles.  Tableau
+piles are built down by suit, and any card or valid sequence
+of cards can be moved between tableau piles.  Empty tableau
+piles cannot be filled.
+<p>
+The foundations are built up by same suit from ace to king -
+the game is won if all cards are moved to the foundations.
+<p>
+Once during the game, any one card below the top of a fan may
+be drawn out and used on foundations or fan builds.
+Do this by moving the top card of the fan to the Draw pile.
+
+<h3>Notes</h3>
+<p>
+Cromwell was invented by Charles Jewell.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 82ebb0ac..0697cfb3 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -457,7 +457,7 @@ class GI:
         ("Robert Hogue", (22216, 22217, 22218, 22231,)),
         ("Erik den Hollander", (344, 544,)),
         ("Rick Holzgrafe", (756, 757,)),
-        ("Charles Jewell", (220, 309,)),
+        ("Charles Jewell", (220, 309, 894,)),
         ("Michael Keller", (592, 883,)),
         ("Fred Lunde", (459,)),
         ("Mark Masten", (811,)),
@@ -558,7 +558,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, 894)))
+        ('dev', tuple(range(855, 895)))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py
index a52e556d..cac33c83 100644
--- a/pysollib/games/fan.py
+++ b/pysollib/games/fan.py
@@ -335,7 +335,7 @@ class ThreeShufflesAndADraw(LaBelleLucie):
     RowStack_Class = StackWrapper(
         ThreeShufflesAndADraw_RowStack, base_rank=NO_RANK)
 
-    def createGame(self):
+    def createGame(self, texts=True):
         lay = LaBelleLucie.createGame(self)
         s = self.s
         # add a reserve stack
@@ -361,6 +361,35 @@ class ThreeShufflesAndADraw(LaBelleLucie):
         p.dump(self.draw_done)
 
 
+# ************************************************************************
+# * Cromwell
+# ************************************************************************
+
+class Cromwell(ThreeShufflesAndADraw):
+    Foundation_Classes = [SS_FoundationStack, SS_FoundationStack]
+    Talon_Class = InitialDealTalonStack
+    RowStack_Class = StackWrapper(
+        ThreeShufflesAndADraw_RowStack, base_rank=NO_RANK, max_move=999999)
+
+    def createGame(self, texts=True):
+        lay = Fan.createGame(self, rows=(6, 6, 6, 6, 2))
+        s = self.s
+        # add a reserve stack
+        x, y = s.rows[3].x, s.rows[-1].y
+        s.reserves.append(ThreeShufflesAndADraw_ReserveStack(x, y, self))
+        # redefine the stack-groups
+        lay.defaultStackGroups()
+        # extra settings
+        self.draw_done = 0
+
+    def startGame(self):
+        self.draw_done = 0
+        self.s.reserves[0].updateText()
+        for i in range(3):
+            self.s.talon.dealRow(rows=self.s.rows[:26], frames=0)
+        self._startAndDealRow()
+
+
 # ************************************************************************
 # * Trefoil
 # ************************************************************************
@@ -1141,3 +1170,5 @@ registerGame(GameInfo(871, CeilingFan, "Ceiling Fan",
                       GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(879, RoamingProils, "Roaming Proils",
                       GI.GT_FAN_TYPE, 1, 0, GI.SL_BALANCED))
+registerGame(GameInfo(894, Cromwell, "Cromwell",
+                      GI.GT_FAN_TYPE | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL))