From 8c41f7be61fb6b4a4dcc93c6d5da690030bb8283 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Sat, 24 Jul 2021 11:54:54 -0400
Subject: [PATCH] A more traditional Double FreeCell variant.

---
 html-src/rules/doublefreecell.html            | 22 +++++++++++++++++++
 html-src/rules/doublefreecelltraditional.html | 17 ++++++++++++++
 html-src/rules/triplefreecell.html            | 12 ++++++++++
 pysollib/gamedb.py                            |  2 +-
 pysollib/games/freecell.py                    | 13 +++++++++++
 5 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 html-src/rules/doublefreecell.html
 create mode 100644 html-src/rules/doublefreecelltraditional.html
 create mode 100644 html-src/rules/triplefreecell.html

diff --git a/html-src/rules/doublefreecell.html b/html-src/rules/doublefreecell.html
new file mode 100644
index 00000000..a9459138
--- /dev/null
+++ b/html-src/rules/doublefreecell.html
@@ -0,0 +1,22 @@
+<h1>Double FreeCell</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="freecell.html">FreeCell</a>,
+but with two decks and six free cells.  The
+aces are moved to the foundations at the start.
+<p>
+There is only one set of foundations - the foundations
+are built from ace to king, and then wrap around.
+
+<h3>Notes</h3>
+<p>
+This two deck FreeCell variation was invented by
+Thomas Warfield.  For a more traditional variation, see
+<a href="doublefreecelltraditional.html">Double FreeCell (Traditional)</a>.
diff --git a/html-src/rules/doublefreecelltraditional.html b/html-src/rules/doublefreecelltraditional.html
new file mode 100644
index 00000000..d08e8b39
--- /dev/null
+++ b/html-src/rules/doublefreecelltraditional.html
@@ -0,0 +1,17 @@
+<h1>Double FreeCell (Traditional)</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="freecell.html">FreeCell</a>,
+but with two decks and eight free cells.
+
+<h3>Notes</h3>
+<p>
+This is a more traditional two deck FreeCell game
+than <a href="doublefreecell.html">Double FreeCell</a>.
diff --git a/html-src/rules/triplefreecell.html b/html-src/rules/triplefreecell.html
new file mode 100644
index 00000000..2a41c243
--- /dev/null
+++ b/html-src/rules/triplefreecell.html
@@ -0,0 +1,12 @@
+<h1>Triple FreeCell</h1>
+<p>
+FreeCell type. 3 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="freecell.html">FreeCell</a>,
+but with three decks and ten free cells.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 42a48b13..292802bf 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -406,7 +406,7 @@ class GI:
         ('fc-2.8',   (343001,)),
         ('fc-2.12',   tuple(range(774, 811)) + (16681,) +
          tuple(range(22217, 22219))),
-        ('fc-2.14', tuple(range(811, 813)))
+        ('fc-2.14', tuple(range(811, 814)))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py
index e57a8606..e97547e3 100644
--- a/pysollib/games/freecell.py
+++ b/pysollib/games/freecell.py
@@ -267,6 +267,17 @@ class TripleFreecell(FreeCell):
         self._startDealNumRowsAndDealSingleRow(11)
 
 
+class DoubleFreecellTd(TripleFreecell):
+    def createGame(self):
+        TripleFreecell.createGame(self, reserves=8, rows=10, playcards=20)
+
+    def startGame(self):
+        self._startDealNumRows(9)
+        self.s.talon.dealRow()
+        r = self.s.rows
+        self.s.talon.dealRow(rows=r[:4])
+
+
 class Cell11(TripleFreecell):
     def createGame(self):
         TripleFreecell.createGame(self, rows=12, reserves=11)
@@ -702,3 +713,5 @@ registerGame(GameInfo(698, CanCan, "Can Can",
 registerGame(GameInfo(746, Limpopo, "Limpopo",
                       GI.GT_FREECELL | GI.GT_ORIGINAL, 2, 0,
                       GI.SL_MOSTLY_SKILL))
+registerGame(GameInfo(813, DoubleFreecellTd, "Double FreeCell (Traditional)",
+                      GI.GT_FREECELL | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL))