Added Quadruple Yukon variant.

html-src/rules/quadrupleyukon.html

@@ -0,0 +1,12 @@
+<h1>Quadruple Yukon</h1>
+<p>
+Yukon type. 4 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="yukon.html">Yukon</a>,
+but with four decks and 16 playing piles.

pysollib/gamedb.py

@@ -593,7 +593,7 @@ class GI:
         ('fc-2.20', tuple(range(855, 897))),
         ('fc-2.21', tuple(range(897, 900)) + tuple(range(11014, 11017)) +
          tuple(range(13160, 13163)) + (16682,)),
-        ('dev', tuple(range(906, 942)) + tuple(range(11017, 11020)) +
+        ('dev', tuple(range(906, 943)) + tuple(range(11017, 11020)) +
          tuple(range(5600, 5624)) + tuple(range(18000, 18005)) +
          tuple(range(22303, 22311)) + tuple(range(22353, 22361))),
     )

pysollib/games/yukon.py

@@ -378,6 +378,23 @@ class TripleRussianSolitaire(TripleYukon):
     shallHighlightMatch = Game._shallHighlightMatch_SS
 
 
+# ************************************************************************
+# * Quadruple Yukon
+# ************************************************************************
+
+class QuadrupleYukon(Yukon):
+    def createGame(self):
+        Yukon.createGame(self, rows=16, playcards=34)
+
+    def startGame(self):
+        for i in range(1, len(self.s.rows)):
+            self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0)
+        self.s.talon.dealRow(rows=self.s.rows[1:13], flip=1, frames=0)
+        for i in range(4):
+            self.s.talon.dealRow(rows=self.s.rows[1:], flip=1, frames=0)
+        self._startAndDealRow()
+
+
 # ************************************************************************
 # * Ten Across
 # ************************************************************************
@@ -896,3 +913,5 @@ registerGame(GameInfo(925, YukonCells, "Yukon Cells",
                       GI.GT_YUKON, 1, 0, GI.SL_BALANCED))
 registerGame(GameInfo(936, YukonKings, "Yukon Kings",
                       GI.GT_YUKON, 1, 0, GI.SL_BALANCED))
+registerGame(GameInfo(942, QuadrupleYukon, "Quadruple Yukon",
+                      GI.GT_YUKON, 4, 0, GI.SL_BALANCED))

pysollib/layout.py

@@ -23,6 +23,7 @@
 
 
 # imports
+import math
 
 # PySol imports
 from pysollib.mfxutil import Struct
@@ -659,11 +660,12 @@ class Layout:
         XS, YS = self.XS, self.YS
 
         decks = self.game.gameinfo.decks
+        fpc = max(1, math.floor(decks / 2))
         suits = len(self.game.gameinfo.suits) + bool(self.game.gameinfo.trumps)
 
         # set size so that at least 2//3 of a card is visible with 20 cards
-        h = CH*2//3 + (playcards-1)*self.YOFFSET
+        h = CH * 2 // 3 + (playcards - 1) * self.YOFFSET
-        h = YM + max(h, suits*YS)
+        h = YM + max(h, suits * YS * fpc)
 
         # create rows
         x, y = XM, YM
@@ -673,9 +675,9 @@ class Layout:
         self.setRegion(self.s.rows, (-999, -999, x - CW // 2, 999999))
 
         # create foundations
-        for suit in range(suits):
+        for suit in range(suits * fpc):
-            for i in range(decks):
+            for i in range(decks // fpc):
-                self.s.foundations.append(S(x+i*XS, y, suit=suit))
+                self.s.foundations.append(S(x + i * XS, y, suit=suit // fpc))
             y += YS
 
         # create talon
@@ -686,7 +688,7 @@ class Layout:
             self._setText(s, 'se')
 
         # set window
-        self.size = (XM + (rows+decks)*XS,  h)
+        self.size = (XM + (rows + (decks // fpc)) * XS,  h)
 
     #
     # Easy layout