Added Beehive game.

html-src/rules/beehive.html

@@ -0,0 +1,25 @@
+<h1>Beehive</h1>
+<p>
+Canfield type. 1 deck. Unlimited redeals.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundation.
+
+<h3>Rules</h3>
+<p>
+Six tableau piles are dealt forming the "garden", and there is a
+thirteen card reserve called the "beehive".
+<p>
+Piles in the tableau/garden are built by the same rank.  Once all four
+cards of the same rank are in a tableau pile, that pile may be moved to
+the foundation.  If a tableau pile is empty, the top card from the
+reserve/beehive is dealt in its place.  If the reserve is empty, any card
+from the tableau or waste pile may be dealt in its place.
+<p>
+Cards may be dealt from the stock three at a time, and may be played on
+the tableau piles.  The top card of the reserve/beehive may also be moved
+to a matching tableau pile.
+<p>
+The game is won when all cards have been matched up and moved to the
+foundation.

pysollib/games/canfield.py

@@ -6,6 +6,7 @@ from pysollib.mygettext import _
 from pysollib.pysoltk import MfxCanvasText
 from pysollib.stack import \
         AC_RowStack, \
+        AbstractFoundationStack, \
         KingAC_RowStack, \
         OpenStack, \
         RK_RowStack, \
@@ -14,7 +15,8 @@ from pysollib.stack import \
         SS_RowStack, \
         StackWrapper, \
         WasteStack, \
-        WasteTalonStack
+        WasteTalonStack, \
+        isRankSequence
 from pysollib.util import KING, QUEEN, RANKS, UNLIMITED_REDEALS
 
 
@@ -72,13 +74,14 @@ class Canfield(Game):
     INITIAL_RESERVE_CARDS = 13
     INITIAL_RESERVE_FACEUP = 0
     FILL_EMPTY_ROWS = 1
+    SEPARATE_FOUNDATIONS = True
 
     #
     # game layout
     #
 
     def createGame(self, rows=4, max_rounds=-1, num_deal=3,
-                   text=True, round_text=False):
+                   text=True, round_text=False, dir=-1):
         # create layout
         lay, s = Layout(self), self.s
         decks = self.gameinfo.decks
@@ -113,11 +116,17 @@ class Canfield(Game):
         lay.createText(s.waste, "s")
         x += lay.XM
         y = lay.YM
-        for i in range(4):
+        if (self.SEPARATE_FOUNDATIONS):
-            for j in range(decks):
+            for i in range(4):
-                x += lay.XS
+                for j in range(decks):
-                s.foundations.append(self.Foundation_Class(x, y, self, i,
+                    x += lay.XS
-                                                           mod=13, max_move=0))
+                    s.foundations.append(self.Foundation_Class(x, y,
+                                                               self, i,
+                                                               mod=13,
+                                                               max_move=0))
+        else:
+            x += (lay.XS * rows)
+            s.foundations.append(self.Foundation_Class(x, y, self, -1))
         if text:
             if rows > 4 * decks:
                 tx, ty, ta, tf = lay.getTextAttr(None, "se")
@@ -137,7 +146,7 @@ class Canfield(Game):
         if text:
             y += lay.TEXT_HEIGHT
         for i in range(rows):
-            s.rows.append(self.RowStack_Class(x, y, self))
+            s.rows.append(self.RowStack_Class(x, y, self, dir=dir))
             x += lay.XS
 
         # define stack-groups
@@ -166,17 +175,18 @@ class Canfield(Game):
         self.startDealSample()
         self.base_card = None
         self.updateText()
-        # deal base_card to Foundations, update foundations cap.base_rank
+        if (self.SEPARATE_FOUNDATIONS):
-        self.base_card = self.s.talon.getCard()
+            # deal base_card to Foundations, update foundations cap.base_rank
-        for s in self.s.foundations:
+            self.base_card = self.s.talon.getCard()
-            s.cap.base_rank = self.base_card.rank
+            for s in self.s.foundations:
-        n = self.base_card.suit * self.gameinfo.decks
+                s.cap.base_rank = self.base_card.rank
-        if self.s.foundations[n].cards:
+            n = self.base_card.suit * self.gameinfo.decks
-            assert self.gameinfo.decks > 1
+            if self.s.foundations[n].cards:
-            n = n + 1
+                assert self.gameinfo.decks > 1
-        self.flipMove(self.s.talon)
+                n = n + 1
-        self.moveMove(1, self.s.talon, self.s.foundations[n])
+            self.flipMove(self.s.talon)
-        self.updateText()
+            self.moveMove(1, self.s.talon, self.s.foundations[n])
+            self.updateText()
         # fill the Reserve
         for i in range(self.INITIAL_RESERVE_CARDS):
             if self.INITIAL_RESERVE_FACEUP:
@@ -856,6 +866,36 @@ class Lafayette(Game):
     shallHighlightMatch = Game._shallHighlightMatch_AC
 
 
+# ************************************************************************
+# * Beehive
+# ************************************************************************
+
+class Beehive_Foundation(AbstractFoundationStack):
+    def acceptsCards(self, from_stack, cards):
+        if len(cards) < 4:
+            return False
+        return isRankSequence(cards, dir=0)
+
+
+class Beehive(Canfield):
+    Foundation_Class = Beehive_Foundation
+    RowStack_Class = StackWrapper(RK_RowStack)
+
+    SEPARATE_FOUNDATIONS = False
+
+    def createGame(self):
+        Canfield.createGame(self, rows=6, dir=0)
+
+    def _restoreGameHook(self, game):
+        pass
+
+    def _loadGameHook(self, p):
+        pass
+
+    def _saveGameHook(self, p):
+        pass
+
+
 # register the game
 registerGame(GameInfo(105, Canfield, "Canfield",                # was: 262
                       GI.GT_CANFIELD | GI.GT_CONTRIB, 1, -1, GI.SL_BALANCED))
@@ -906,3 +946,5 @@ registerGame(GameInfo(605, Skippy, "Skippy",
                       GI.GT_FAN_TYPE, 2, 0, GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(642, Lafayette, "Lafayette",
                       GI.GT_CANFIELD, 1, -1, GI.SL_BALANCED))
+registerGame(GameInfo(789, Beehive, "Beehive",
+                      GI.GT_CANFIELD, 1, -1, GI.SL_BALANCED))