From 8b957386ce6e1f820ac1a0a5f77d356940e08056 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Fri, 31 Dec 2021 19:52:56 -0500
Subject: [PATCH] Added Malmaison game.

---
 html-src/rules/malmaison.html  | 15 +++++++++++++++
 html-src/rules/marierose.html  |  2 +-
 pysollib/gamedb.py             |  2 +-
 pysollib/games/fortythieves.py | 10 ++++++++++
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 html-src/rules/malmaison.html

diff --git a/html-src/rules/malmaison.html b/html-src/rules/malmaison.html
new file mode 100644
index 00000000..09459c1a
--- /dev/null
+++ b/html-src/rules/malmaison.html
@@ -0,0 +1,15 @@
+<h1>Malmaison</h1>
+<p>
+Forty Thieves type. 4 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+A four deck variation of <a href="josephine.html">Josephine</a>.
+<p>
+Like <a href="fortythieves.html">Forty Thieves</a>,
+but with four decks and eighty dealt cards.  Also,
+sequences of cards may be moved together.
diff --git a/html-src/rules/marierose.html b/html-src/rules/marierose.html
index 3e4fca6a..7742b39c 100644
--- a/html-src/rules/marierose.html
+++ b/html-src/rules/marierose.html
@@ -1,6 +1,6 @@
 <h1>Marie Rose</h1>
 <p>
-Forty Thieves type. 2 decks. No redeal.
+Forty Thieves type. 3 decks. No redeal.
 
 <h3>Object</h3>
 <p>
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index f44d23a2..2c4fb275 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -521,7 +521,7 @@ class GI:
         ('fc-2.12',   tuple(range(774, 811)) + (16681,) +
          tuple(range(22217, 22219))),
         ('fc-2.14', tuple(range(811, 827))),
-        ('fc-2.16', tuple(range(827, 848)))
+        ('fc-2.16', tuple(range(827, 849)))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py
index ffb04455..663dd1e8 100644
--- a/pysollib/games/fortythieves.py
+++ b/pysollib/games/fortythieves.py
@@ -159,6 +159,7 @@ class FortyThieves(Game):
 # * Carre Napoleon
 # * Josephine
 # * Marie Rose
+# * Malmaison
 # * Big Courtyard
 # * San Juan Hill
 # * Famous Fifty
@@ -242,6 +243,13 @@ class MarieRose(Josephine):
         FortyThieves.createGame(self, rows=12, playcards=16, XCARDS=96)
 
 
+class Malmaison(MarieRose):
+    DEAL = (0, 8)
+
+    def createGame(self):
+        FortyThieves.createGame(self, rows=10, playcards=16, XCARDS=128)
+
+
 class BigCourtyard(Courtyard):
     def createGame(self):
         FortyThieves.createGame(self, rows=12, playcards=16, XCARDS=96)
@@ -1466,3 +1474,5 @@ registerGame(GameInfo(838, TheSpark, "The Spark",
 registerGame(GameInfo(847, Pluto, "Pluto",
                       GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL,
                       altnames=("Square")))
+registerGame(GameInfo(848, Malmaison, "Malmaison",
+                      GI.GT_FORTY_THIEVES, 4, 0, GI.SL_MOSTLY_SKILL))