Add Double Eight Off game

Author: joeraz

html-src/rules/doubleeightoff.html

@@ -0,0 +1,13 @@
+<h1>Double Eight Off</h1>
+<p>
+FreeCell type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="eightoff.html">Eight Off</a>,
+but with two decks and twelve piles of eight cards each,
+with all the free cells starting full.

pysollib/gamedb.py

@@ -607,7 +607,7 @@ def _callback(gi, gt=game_type):
         ('fc-3.4', tuple(range(971, 981)) + tuple(range(5419, 5421)) +
          tuple(range(16683, 16686)) + tuple(range(18005, 18007)) +
          (44, 526, 5906, 22399,)),
-        ('dev', tuple(range(981, 985)) + tuple(range(16686, 16687))),
+        ('dev', tuple(range(981, 986)) + tuple(range(16686, 16687))),
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag

pysollib/games/bakersgame.py

@@ -73,6 +73,7 @@ class EightOff(KingOnlyBakersGame):
     def createGame(self, rows=8, reserves=8):
         # create layout
         l, s = Layout(self), self.s
+        decks = self.gameinfo.decks
 
         # set window
         # (piles up to 16 cards are playable without
@@ -82,10 +83,11 @@ def createGame(self, rows=8, reserves=8):
         self.setSize(l.XM + maxrows*l.XS, l.YM + l.YS + h + l.YS)
 
         # create stacks
-        x, y = l.XM + (maxrows-4)*l.XS//2, l.YM
+        x, y = l.XM + (maxrows - (4 * decks)) * l.XS // 2, l.YM
         for i in range(4):
-            s.foundations.append(SS_FoundationStack(x, y, self, i))
-            x = x + l.XS
+            for j in range(decks):
+                s.foundations.append(SS_FoundationStack(x, y, self, i))
+                x = x + l.XS
         x, y = l.XM + (maxrows-rows)*l.XS//2, y + l.YS
         for i in range(rows):
             s.rows.append(self.RowStack_Class(x, y, self))
@@ -111,6 +113,17 @@ def startGame(self):
         self.s.talon.dealRow(rows=[r[0], r[2], r[4], r[6]])
 
 
+class DoubleEightOff(EightOff):
+
+    def createGame(self, rows=8, reserves=8):
+        EightOff.createGame(self, rows=12)
+
+    def startGame(self):
+        self._startDealNumRows(7)
+        self.s.talon.dealRow()
+        self.s.talon.dealRow(rows=self.s.reserves)
+
+
 # ************************************************************************
 # * Seahaven Towers (Baker's Game in a different layout)
 # ************************************************************************
@@ -328,3 +341,5 @@ def fillStack(self, stack):
 registerGame(GameInfo(713, Flipper, "Flipper",
                       GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0,
                       GI.SL_MOSTLY_SKILL))
+registerGame(GameInfo(985, DoubleEightOff, "Double Eight Off",
+                      GI.GT_FREECELL | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL))