From 0a55fffdb7653a694964c213c38e4a0340d8db5b Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Sat, 17 Dec 2022 19:59:16 -0500
Subject: [PATCH] Added Vineyard game.

---
 html-src/rules/vineyard.html  | 19 +++++++++++++++++++
 pysollib/gamedb.py            |  3 ++-
 pysollib/games/bakersdozen.py | 19 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 html-src/rules/vineyard.html

diff --git a/html-src/rules/vineyard.html b/html-src/rules/vineyard.html
new file mode 100644
index 00000000..b82daaeb
--- /dev/null
+++ b/html-src/rules/vineyard.html
@@ -0,0 +1,19 @@
+<h1>Vineyard</h1>
+<p>
+Baker's Dozen type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="bakersdozen.html">Baker's Dozen</a>,
+but 10 piles, which are built down by alternate color,
+and any card can fill an empty space.
+
+<h3>Notes</h3>
+<p>
+Vineyard was invented by Peter Voke, and was first created in
+the Solitaire Wizard of the Pretty Good Solitaire app.  It has
+since been ported to many other solitaire apps.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 70f55d5f..6d81fdcd 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -464,6 +464,7 @@ class GI:
         ("John Stoneham", (201,)),
         ("Bryan Stout", (655,)),
         ("Bill Taylor", (349,)),
+        ("Peter Voke", (876,)),
         ("Thomas Warfield", (189, 264, 300, 320, 336, 337, 359,
                              415, 427, 458, 495, 496, 497, 508,
                              800, 814, 820, 825,)),
@@ -547,7 +548,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, 876)))
+        ('dev', tuple(range(855, 877)))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py
index f74e0b24..21621dd1 100644
--- a/pysollib/games/bakersdozen.py
+++ b/pysollib/games/bakersdozen.py
@@ -40,7 +40,8 @@ from pysollib.stack import \
         TalonStack, \
         UD_AC_RowStack, \
         UD_SS_RowStack
-from pysollib.util import ACE, KING, NO_RANK, UNLIMITED_ACCEPTS, \
+from pysollib.util import ACE, ANY_RANK, KING, NO_RANK, \
+        UNLIMITED_ACCEPTS, \
         UNLIMITED_MOVES
 
 
@@ -181,6 +182,7 @@ class SpanishPatienceII(PortugueseSolitaire):
 
 # ************************************************************************
 # * Good Measure
+# * Vineyard
 # ************************************************************************
 
 class GoodMeasure(BakersDozen):
@@ -204,6 +206,18 @@ class GoodMeasure(BakersDozen):
             self.moveMove(1, self.s.talon, self.s.foundations[c.suit])
 
 
+class Vineyard(CastlesInSpain):
+    RowStack_Class = StackWrapper(AC_RowStack, max_move=1, max_accept=1,
+                                  base_rank=ANY_RANK)
+
+    def createGame(self):
+        CastlesInSpain.createGame(self, rows=10)
+
+    def startGame(self):
+        CastlesInSpain.startGame(self, flip=(1, 1, 1, 1))
+        self.s.talon.dealRow(self.s.rows[0:2])
+
+
 # ************************************************************************
 # * Cruel
 # * Unusual
@@ -429,3 +443,6 @@ registerGame(GameInfo(823, Unusual, "Unusual",
 registerGame(GameInfo(860, BakersDozen2Decks, "Baker's Dozen (2 Decks)",
                       GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 0,
                       GI.SL_MOSTLY_SKILL))
+registerGame(GameInfo(876, Vineyard, "Vineyard",
+                      GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0,
+                      GI.SL_MOSTLY_SKILL))