From ed3fa526deb6d71cecbc217d677d4dd554f020e3 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Sun, 30 Oct 2022 20:36:11 -0400
Subject: [PATCH] Added Station game.

---
 html-src/rules/station.html | 17 +++++++++++++++++
 pysollib/gamedb.py          |  2 +-
 pysollib/games/montana.py   | 22 ++++++++++++++++++++--
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 html-src/rules/station.html

diff --git a/html-src/rules/station.html b/html-src/rules/station.html
new file mode 100644
index 00000000..7f3b8acb
--- /dev/null
+++ b/html-src/rules/station.html
@@ -0,0 +1,17 @@
+<h1>Station</h1>
+<p>
+Montana type. 1 deck. 2 redeals.
+
+<h3>Object</h3>
+<p>
+Group all the cards in sets of 12 cards in ascending sequence
+by suit from Two to King.
+
+<h3>Quick Description</h3>
+<p>
+Just like <a href="montana.html">Montana</a>,
+but the spaces after each redeal are at the end of each row.
+
+<h3>Notes</h3>
+<p>
+<i>Autodrop</i> is disabled for this game.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 9e6047c6..97ba6b8d 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -544,7 +544,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, 858)))
+        ('dev', tuple(range(855, 859)))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py
index cc313e83..406e52e8 100644
--- a/pysollib/games/montana.py
+++ b/pysollib/games/montana.py
@@ -93,7 +93,7 @@ class Montana_Talon(TalonStack):
         # move out-of-sequence cards from the Tableau to the Talon
         stacks = []
         gaps = [None] * 4 * decks
-        for g in range(4*decks):
+        for g in range(4 * decks):
             i = g * RSTEP
             r = rows[i]
             if r.cards and r.cards[-1].rank == RBASE:
@@ -265,6 +265,21 @@ class Spaces(Montana):
     Talon_Class = StackWrapper(Spaces_Talon, max_rounds=3)
 
 
+# ************************************************************************
+# * Station
+# ************************************************************************
+
+class Station_Talon(Montana_Talon):
+    def getRedealSpaces(self, stacks, gaps):
+        # use the last space of each row.
+        return [self.game.s.rows[12], self.game.s.rows[25],
+                self.game.s.rows[38], self.game.s.rows[51]]
+
+
+class Station(Montana):
+    Talon_Class = StackWrapper(Station_Talon, max_rounds=3)
+
+
 # ************************************************************************
 # * Blue Moon
 # ************************************************************************
@@ -647,7 +662,7 @@ class Pretzel(Montana):
 # register the game
 registerGame(GameInfo(53, Montana, "Montana",
                       GI.GT_MONTANA | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL,
-                      si={"ncards": 48}, altnames="Gaps"))
+                      si={"ncards": 48}, altnames=("Gaps", "Vacancies")))
 registerGame(GameInfo(116, Spaces, "Spaces",
                       GI.GT_MONTANA | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL,
                       si={"ncards": 48}, altnames="Addiction"))
@@ -687,3 +702,6 @@ registerGame(GameInfo(795, Pretzel, "Pretzel",
                       GI.GT_MONTANA | GI.GT_OPEN | GI.GT_STRIPPED, 1, 0,
                       GI.SL_MOSTLY_SKILL, ranks=(0, 1, 2, 3, 4),
                       si={"ncards": 16}))
+registerGame(GameInfo(858, Station, "Station",
+                      GI.GT_MONTANA | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL,
+                      si={"ncards": 48}))