From 11ee25afc2a345d18ca1ffaafd05f04646fd666c Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Wed, 22 Feb 2023 21:20:37 -0500
Subject: [PATCH] Added Preference game.

---
 html-src/rules/preference.html | 12 ++++++++++++
 pysollib/gamedb.py             |  2 +-
 pysollib/games/fortythieves.py | 23 +++++++++++++++++++----
 3 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 html-src/rules/preference.html

diff --git a/html-src/rules/preference.html b/html-src/rules/preference.html
new file mode 100644
index 00000000..f14ce5af
--- /dev/null
+++ b/html-src/rules/preference.html
@@ -0,0 +1,12 @@
+<h1>Preference</h1>
+<p>
+Forty Thieves type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="fortunesfavor.html">Fortune's Favor</a>,
+but with only eight tableau piles.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 0697cfb3..caca4357 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -558,7 +558,7 @@ class GI:
          tuple(range(22217, 22219))),
         ('fc-2.14', tuple(range(811, 827))),
         ('fc-2.15', tuple(range(827, 855)) + tuple(range(22400, 22407))),
-        ('dev', tuple(range(855, 895)))
+        ('dev', tuple(range(855, 896)))
     )
 
     # 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 376796ef..a474d512 100644
--- a/pysollib/games/fortythieves.py
+++ b/pysollib/games/fortythieves.py
@@ -686,15 +686,19 @@ class Octave(Game):
 # ************************************************************************
 
 class FortunesFavor(Game):
+    ROWS = 2
+    COLS = 6
 
     def createGame(self):
 
         l, s = Layout(self), self.s
 
-        w, h = l.XM+8*l.XS, 2*l.YM+3*l.YS
+        w, h = l.XM + (2 + self.COLS) * l.XS, 2 * l.YM + (1 + self.ROWS) * l.YS
         self.setSize(w, h)
 
-        x, y = l.XM+3*l.XS, l.YM
+        offset = 2 + ((self.COLS - 4) / 2)
+
+        x, y = l.XM + offset * l.XS, l.YM
         for i in range(4):
             s.foundations.append(SS_FoundationStack(x, y, self, suit=i))
             x += l.XS
@@ -705,9 +709,9 @@ class FortunesFavor(Game):
         s.waste = WasteStack(x, y, self)
         l.createText(s.waste, 'se')
         y = 2*l.YM+l.YS
-        for i in range(2):
+        for i in range(self.ROWS):
             x = l.XM+2*l.XS
-            for j in range(6):
+            for j in range(self.COLS):
                 stack = SS_RowStack(x, y, self, max_move=1)
                 stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0
                 s.rows.append(stack)
@@ -735,6 +739,15 @@ class FortunesFavor(Game):
     shallHighlightMatch = Game._shallHighlightMatch_SS
 
 
+# ************************************************************************
+# * Preference
+# ************************************************************************
+
+class Preference(FortunesFavor):
+    ROWS = 2
+    COLS = 4
+
+
 # ************************************************************************
 # * Octagon
 # ************************************************************************
@@ -1526,3 +1539,5 @@ registerGame(GameInfo(848, Malmaison, "Malmaison",
                       GI.GT_FORTY_THIEVES, 4, 0, GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(884, JacksInTheBox, "Jacks in the Box",
                       GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL))
+registerGame(GameInfo(895, Preference, "Preference",
+                      GI.GT_FORTY_THIEVES, 1, 0, GI.SL_LUCK))