From 68138c72846c3bf55de55b4a4f2fc08f155015fb Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Thu, 23 Jan 2025 18:01:20 -0500
Subject: [PATCH] Add Colours game

---
 html-src/rules/colours.html | 15 +++++++++++++++
 pysollib/gamedb.py          |  2 +-
 pysollib/games/numerica.py  | 38 +++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 html-src/rules/colours.html

diff --git a/html-src/rules/colours.html b/html-src/rules/colours.html
new file mode 100644
index 00000000..a4cc9545
--- /dev/null
+++ b/html-src/rules/colours.html
@@ -0,0 +1,15 @@
+<h1>Colours</h1>
+<p>
+Numerica type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="ladybetty.html">Lady Betty</a>,
+but the foundations are built up by same color, and
+wrap from king to ace.  At the start of the game, a
+two through five are dealt to the foundations, in
+alternating colors.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index ece07692..2bc3703c 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -595,7 +595,7 @@ class GI:
          tuple(range(19000, 19012)) + tuple(range(22303, 22311)) +
          tuple(range(22353, 22361))),
         ('fc-3.1', tuple(range(961, 971))),
-        ('dev', tuple(range(971, 972))),
+        ('dev', tuple(range(971, 973))),
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py
index c89caff2..839c032c 100644
--- a/pysollib/games/numerica.py
+++ b/pysollib/games/numerica.py
@@ -41,6 +41,7 @@ from pysollib.stack import \
         RK_FoundationStack, \
         RK_RowStack, \
         ReserveStack, \
+        SC_FoundationStack, \
         SS_FoundationStack, \
         Stack, \
         StackWrapper, \
@@ -176,6 +177,7 @@ class Numerica2Decks(Numerica):
 # ************************************************************************
 # * Lady Betty
 # * Last Chance
+# * Colours
 # ************************************************************************
 
 class LadyBetty(Numerica):
@@ -215,6 +217,40 @@ class LastChance(LadyBetty):
         self.s.talon.dealCards()
 
 
+class Colours(LadyBetty):
+    Foundation_Class = StackWrapper(SC_FoundationStack, mod=13, suit=ANY_SUIT)
+
+    def startGame(self):
+        self.startDealSample()
+        self.s.talon.dealRow(rows=self.s.foundations)
+        self.s.talon.dealCards()          # deal first card to WasteStack
+
+    def _shuffleHook(self, cards):
+        # prepare first cards
+        topcards = [None] * 4
+        evencolor = -1
+        oddcolor = -1
+        for c in cards[:]:
+            if 0 < c.rank <= 4 and topcards[c.rank - 1] is None:
+                if c.rank % 2 == 0:
+                    if evencolor != -1 and c.color != evencolor:
+                        continue
+                    if oddcolor != -1 and c.color == oddcolor:
+                        continue
+                    evencolor = c.color
+                elif c.rank % 2 == 1:
+                    if oddcolor != -1 and c.color != oddcolor:
+                        continue
+                    if evencolor != -1 and c.color == evencolor:
+                        continue
+                    oddcolor = c.color
+
+                topcards[c.rank - 1] = c
+                cards.remove(c)
+        topcards.reverse()
+        return cards + topcards
+
+
 # ************************************************************************
 # * Puss in the Corner
 # ************************************************************************
@@ -1460,3 +1496,5 @@ registerGame(GameInfo(931, TheBogey, "The Bogey",
                       GI.GT_1DECK_TYPE, 1, -1, GI.SL_BALANCED))
 registerGame(GameInfo(958, NinetyOne, "Ninety-One",
                       GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_SKILL))
+registerGame(GameInfo(972, Colours, "Colours",
+                      GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED))