From 764fb5207e84f709c32022aad853cf2663e9c6b7 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Sat, 15 Jun 2024 11:08:22 -0400
Subject: [PATCH] Added Carousel game.

---
 html-src/rules/carousel.html     | 13 +++++++++++++
 pysollib/gamedb.py               |  2 +-
 pysollib/games/picturegallery.py | 19 +++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 html-src/rules/carousel.html

diff --git a/html-src/rules/carousel.html b/html-src/rules/carousel.html
new file mode 100644
index 00000000..a15e650a
--- /dev/null
+++ b/html-src/rules/carousel.html
@@ -0,0 +1,13 @@
+<h1>Carousel</h1>
+<p>
+Picture Gallery type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Fill all of the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="greatwheel.html">Great Wheel</a>,
+but you can build on the stacks before the talon is
+empty.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 2413f447..c3604d1d 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -604,7 +604,7 @@ class GI:
          tuple(range(13168, 13170)) + tuple(range(18000, 18005)) +
          tuple(range(19000, 19012)) + tuple(range(22303, 22311)) +
          tuple(range(22353, 22361))),
-        ('dev', tuple(range(961, 962))),
+        ('dev', tuple(range(961, 963))),
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py
index dffa3429..e323ce85 100644
--- a/pysollib/games/picturegallery.py
+++ b/pysollib/games/picturegallery.py
@@ -317,6 +317,7 @@ class HugePictureGallery(PictureGallery):
 # ************************************************************************
 # * Great Wheel
 # * Greater Wheel
+# * Carousel
 # ************************************************************************
 
 
@@ -405,6 +406,20 @@ class GreaterWheel(GreatWheel):
     def createGame(self):
         PictureGallery.createGame(self, waste=True, numstacks=12)
 
+
+class Carousel_RowStack(BasicRowStack):
+    def acceptsCards(self, from_stack, cards):
+        if not self.cards:
+            return True
+        c1, c2 = self.cards[-1], cards[0]
+        return c1.suit == c2.suit and c1.rank == c2.rank+1
+
+    getBottomImage = Stack._getTalonBottomImage
+
+
+class Carousel(GreatWheel):
+    RowStack_Class = StackWrapper(Carousel_RowStack, max_accept=1)
+
 # ************************************************************************
 # * Mount Olympus
 # * Zeus
@@ -737,3 +752,7 @@ registerGame(GameInfo(932, DevilsGrip, "Devil's Grip",
                       ))
 registerGame(GameInfo(944, BlueJacket, "Blue Jacket",
                       GI.GT_PICTURE_GALLERY, 2, 0, GI.SL_MOSTLY_SKILL))
+registerGame(GameInfo(962, Carousel, "Carousel",
+                      GI.GT_PICTURE_GALLERY | GI.GT_STRIPPED, 2, 0,
+                      GI.SL_BALANCED, ranks=list(range(12))  # without Kings
+                      ))