From f91817ee51604b9603557122c6996df88613e077 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Sun, 13 Dec 2020 21:36:16 -0500
Subject: [PATCH] Added additional multi-deck variations of Golf and Forty
 Thieves.

---
 html-src/rules/doublegolf.html    | 12 ++++++++++
 html-src/rules/eightythieves.html | 12 ++++++++++
 html-src/rules/sixtythieves.html  | 12 ++++++++++
 pysollib/games/fortythieves.py    | 20 +++++++++++++++++
 pysollib/games/golf.py            | 37 ++++++++++++++++++++++---------
 5 files changed, 82 insertions(+), 11 deletions(-)
 create mode 100644 html-src/rules/doublegolf.html
 create mode 100644 html-src/rules/eightythieves.html
 create mode 100644 html-src/rules/sixtythieves.html

diff --git a/html-src/rules/doublegolf.html b/html-src/rules/doublegolf.html
new file mode 100644
index 00000000..a99f6d4d
--- /dev/null
+++ b/html-src/rules/doublegolf.html
@@ -0,0 +1,12 @@
+<h1>Double Golf</h1>
+<p>
+Golf type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the waste stack.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="golf.html">Golf</a>,
+but with two decks and nine dealt columns.
diff --git a/html-src/rules/eightythieves.html b/html-src/rules/eightythieves.html
new file mode 100644
index 00000000..bea0f302
--- /dev/null
+++ b/html-src/rules/eightythieves.html
@@ -0,0 +1,12 @@
+<h1>Eighty Thieves</h1>
+<p>
+Forty Thieves type. 4 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="fortythieves.html">Forty Thieves</a>,
+but with four decks and eighty dealt cards.
diff --git a/html-src/rules/sixtythieves.html b/html-src/rules/sixtythieves.html
new file mode 100644
index 00000000..2257a5df
--- /dev/null
+++ b/html-src/rules/sixtythieves.html
@@ -0,0 +1,12 @@
+<h1>Sixty Thieves</h1>
+<p>
+Forty Thieves type. 3 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="fortythieves.html">Forty Thieves</a>,
+but with three decks and sixty dealt cards.
diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py
index ab5495c2..9f013b06 100644
--- a/pysollib/games/fortythieves.py
+++ b/pysollib/games/fortythieves.py
@@ -162,6 +162,8 @@ class FortyThieves(Game):
 # * Big Courtyard
 # * San Juan Hill
 # * Famous Fifty
+# * Sixty Thieves
+# * Eighty Thieves
 # *   rows build down by suit
 # ************************************************************************
 
@@ -270,6 +272,20 @@ class FamousFifty(FortyThieves):
     DEAL = (0, 5)
 
 
+class SixtyThieves(FortyThieves):
+    DEAL = (0, 5)
+
+    def createGame(self):
+        FortyThieves.createGame(self, rows=12, playcards=16, XCARDS=96)
+
+
+class EightyThieves(FortyThieves):
+    DEAL = (0, 8)
+
+    def createGame(self):
+        FortyThieves.createGame(self, rows=10, playcards=16, XCARDS=128)
+
+
 # ************************************************************************
 # * Deuces
 # ************************************************************************
@@ -1349,3 +1365,7 @@ registerGame(GameInfo(751, BlindPatience, "Blind Patience",
 registerGame(GameInfo(765, Foothold, "Foothold",
                       GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 2, 0,
                       GI.SL_MOSTLY_SKILL))
+registerGame(GameInfo(775, SixtyThieves, "Sixty Thieves",
+                      GI.GT_FORTY_THIEVES, 3, 0, GI.SL_MOSTLY_SKILL))
+registerGame(GameInfo(776, EightyThieves, "Eighty Thieves",
+                      GI.GT_FORTY_THIEVES, 4, 0, GI.SL_MOSTLY_SKILL))
diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py
index 9878d947..21e8c419 100644
--- a/pysollib/games/golf.py
+++ b/pysollib/games/golf.py
@@ -140,23 +140,23 @@ class Golf(Game):
     # game layout
     #
 
-    def createGame(self):
+    def createGame(self, columns=7):
         # create layout
         layout, s = Layout(self), self.s
 
         # set window
         playcards = 5
-        w1, w2 = 8*layout.XS+layout.XM, 2*layout.XS
-        if w2 + 52*layout.XOFFSET > w1:
-            layout.XOFFSET = int((w1 - w2) / 52)
-        self.setSize(
-            w1,
-            layout.YM+3*layout.YS +
-            (playcards-1)*layout.YOFFSET+layout.TEXT_HEIGHT)
+        w1, w2 = (columns + 1) * layout.XS + layout.XM, 2 * layout.XS
+
+        totalcards = 52 * self.gameinfo.decks
+        if w2 + totalcards * layout.XOFFSET > w1:
+            layout.XOFFSET = int((w1 - w2) / totalcards)
+        self.setSize(w1, layout.YM + 3 * layout.YS +
+                     (playcards - 1) * layout.YOFFSET + layout.TEXT_HEIGHT)
 
         # create stacks
         x, y = layout.XM + layout.XS // 2, layout.YM
-        for i in range(7):
+        for i in range(columns):
             s.rows.append(Golf_RowStack(x, y, self))
             x = x + layout.XS
         x, y = layout.XM, self.height - layout.YS
@@ -178,8 +178,8 @@ class Golf(Game):
     # game overrides
     #
 
-    def startGame(self):
-        self._startDealNumRows(4)
+    def startGame(self, num_rows=5):
+        self._startDealNumRows(num_rows - 1)
         self.s.talon.dealRow()
         self.s.talon.dealCards()          # deal first card to WasteStack
 
@@ -203,6 +203,19 @@ class Golf(Game):
             return (self.sg.dropstacks, self.sg.dropstacks, ())
 
 
+# ************************************************************************
+# * Double Golf
+# ************************************************************************
+
+class DoubleGolf(Golf):
+
+    def createGame(self):
+        Golf.createGame(self, 9)
+
+    def startGame(self):
+        Golf.startGame(self, 7)
+
+
 # ************************************************************************
 # *
 # ************************************************************************
@@ -1193,3 +1206,5 @@ registerGame(GameInfo(764, Beacon, "Beacon",
                       GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(768, RelaxedThreeFirTrees, "Relaxed Three Fir-trees",
                       GI.GT_GOLF, 2, 0, GI.SL_BALANCED))
+registerGame(GameInfo(777, DoubleGolf, "Double Golf",
+                      GI.GT_GOLF, 2, 0, GI.SL_BALANCED))