From 8bef814a0511a675f3ac07254d1a8e3a123523b7 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Tue, 22 Nov 2022 21:48:30 -0500
Subject: [PATCH] Combined Gargantua and Jumbo games - they're the same game.

---
 html-src/rules/jumbo.html         | 12 ----------
 html-src/rules/opengargantua.html | 13 +++++++++++
 html-src/rules/openjumbo.html     | 14 ------------
 pysollib/gamedb.py                |  1 +
 pysollib/games/harp.py            | 11 ++++++++-
 pysollib/games/klondike.py        | 38 ++++++++++++++++---------------
 6 files changed, 44 insertions(+), 45 deletions(-)
 delete mode 100644 html-src/rules/jumbo.html
 create mode 100644 html-src/rules/opengargantua.html
 delete mode 100644 html-src/rules/openjumbo.html

diff --git a/html-src/rules/jumbo.html b/html-src/rules/jumbo.html
deleted file mode 100644
index 9fbb8866..00000000
--- a/html-src/rules/jumbo.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<h1>Jumbo</h1>
-<p>
-Klondike type. 2 decks. One redeal.
-
-<h3>Object</h3>
-<p>
-Move all cards to the foundations.
-
-<h3>Quick Description</h3>
-<p>
-Like <a href="klondike.html">Klondike</a>,
-but with two decks and nine playing piles.
diff --git a/html-src/rules/opengargantua.html b/html-src/rules/opengargantua.html
new file mode 100644
index 00000000..9772580f
--- /dev/null
+++ b/html-src/rules/opengargantua.html
@@ -0,0 +1,13 @@
+<h1>Open Gargantua</h1>
+<p>
+Klondike type. 2 decks. One redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Just like <a href="doubleklondike.html">Double Klondike</a>,
+but only one redeal and all cards face-up.  A variant of
+<a href="gargantua.html">Gargantua</a> with all cards face-up.
diff --git a/html-src/rules/openjumbo.html b/html-src/rules/openjumbo.html
deleted file mode 100644
index adb24971..00000000
--- a/html-src/rules/openjumbo.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<h1>Open Jumbo</h1>
-<p>
-Klondike type. 2 decks. One redeal.
-
-<h3>Object</h3>
-<p>
-Move all cards to the foundations.
-
-<h3>Quick Description</h3>
-<p>
-Like <a href="klondike.html">Klondike</a>,
-but with two decks and nine playing piles,
-and all cards face-up.  A variant of
-<a href="jumbo.html">Jumbo</a> with all cards face-up.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 87ad3763..4f547e32 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -288,6 +288,7 @@ class GI:
          155: 5034,             # Mahjongg - Flying Dragon
          156: 5035,             # Mahjongg - Fortress Towers
          262: 105,              # Canfield
+         283: 25,               # Gargantua/Jumbo
          902: 88,               # Trefoil
          904: 68,               # Lexington Harp
          237: 22231,            # Three Peaks
diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py
index 35bbab36..50559427 100644
--- a/pysollib/games/harp.py
+++ b/pysollib/games/harp.py
@@ -114,6 +114,11 @@ class Gargantua(DoubleKlondike):
         DoubleKlondike.createGame(self, max_rounds=2)
 
 
+class OpenGargantua(Gargantua):
+    def startGame(self):
+        DoubleKlondike.startGame(self, flip=1)
+
+
 class Pantagruel(DoubleKlondike):
     RowStack_Class = AC_RowStack
 
@@ -406,7 +411,11 @@ registerGame(GameInfo(21, DoubleKlondike, "Double Klondike",
 registerGame(GameInfo(28, DoubleKlondikeByThrees, "Double Klondike by Threes",
                       GI.GT_KLONDIKE, 2, -1, GI.SL_MOSTLY_LUCK))
 registerGame(GameInfo(25, Gargantua, "Gargantua",
-                      GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED))
+                      GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED,
+                      altnames=("Jumbo",)))
+registerGame(GameInfo(333, OpenGargantua, "Open Gargantua",
+                      GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED,
+                      altnames=("Open Jumbo",)))
 registerGame(GameInfo(15, BigHarp, "Big Harp",
                       GI.GT_KLONDIKE, 2, 0, GI.SL_BALANCED))
 registerGame(GameInfo(51, Steps, "Steps",
diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py
index 996d935d..3024e9d3 100644
--- a/pysollib/games/klondike.py
+++ b/pysollib/games/klondike.py
@@ -506,22 +506,24 @@ class BatsfordAgain(Batsford):
 
 # ************************************************************************
 # * Jumbo
+# * (Removed as it's a duplicate of Gargantua)
 # ************************************************************************
 
-class Jumbo(Klondike):
-    def createGame(self):
-        lay = Klondike.createGame(self, rows=9, max_rounds=2, round_text=True)
-        lay.createRoundText(self.s.talon, 'ne', dx=lay.XS)
-
-    def startGame(self, flip=0):
-        for i in range(9):
-            self.s.talon.dealRow(rows=self.s.rows[:i], flip=flip, frames=0)
-        self._startAndDealRowAndCards()
-
-
-class OpenJumbo(Jumbo):
-    def startGame(self):
-        Jumbo.startGame(self, flip=1)
+# class Jumbo(Klondike):
+#     def createGame(self):
+#         lay = Klondike.createGame(self, rows=9, max_rounds=2,
+#                                   round_text=True)
+#         lay.createRoundText(self.s.talon, 'ne', dx=lay.XS)
+#
+#     def startGame(self, flip=0):
+#         for i in range(9):
+#             self.s.talon.dealRow(rows=self.s.rows[:i], flip=flip, frames=0)
+#         self._startAndDealRowAndCards()
+#
+#
+# class OpenJumbo(Jumbo):
+#     def startGame(self):
+#         Jumbo.startGame(self, flip=1)
 
 
 # ************************************************************************
@@ -1533,10 +1535,10 @@ registerGame(GameInfo(236, AgnesBernauer, "Agnes Bernauer",
                       GI.GT_RAGLAN, 1, 0, GI.SL_BALANCED))
 registerGame(GameInfo(263, Phoenix, "Phoenix",
                       GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL))
-registerGame(GameInfo(283, Jumbo, "Jumbo",
-                      GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED))
-registerGame(GameInfo(333, OpenJumbo, "Open Jumbo",
-                      GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED))
+# registerGame(GameInfo(283, Jumbo, "Jumbo",
+#                       GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED))
+# registerGame(GameInfo(333, OpenJumbo, "Open Jumbo",
+#                       GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED))
 registerGame(GameInfo(326, Lanes, "Lanes",
                       GI.GT_KLONDIKE, 1, 1, GI.SL_BALANCED))
 registerGame(GameInfo(327, ThirtySix, "Thirty Six",