From c4e87a12943e4c5eb0e94599b7a1a54617b3dc24 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Tue, 12 Sep 2023 18:22:39 -0400
Subject: [PATCH] Added Astrocyte game.

---
 html-src/rules/astrocyte.html | 21 ++++++++++++++++
 pysollib/gamedb.py            |  3 ++-
 pysollib/games/spider.py      | 47 +++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 html-src/rules/astrocyte.html

diff --git a/html-src/rules/astrocyte.html b/html-src/rules/astrocyte.html
new file mode 100644
index 00000000..6d770511
--- /dev/null
+++ b/html-src/rules/astrocyte.html
@@ -0,0 +1,21 @@
+<h1>Astrocyte</h1>
+<p>
+Spider type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Group all the cards in sets of 13 cards in descending sequence
+by suit from King to Ace and move such sets to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="spider.html">Spider</a>,
+but with eight columns of eight cards each, plus four free cells.
+
+<h3>Notes</h3>
+<p>
+Astrocyte was invented by Jan Wolter, and first appeared in his app
+<a href="https://politaire.com">Politaire</a>.  The game was a combination
+of a couple different variants of <a href="spidercells.html">Spidercells</a>,
+and is named for star-shaped cells in the brain that are sometimes called
+"spider cells".
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 536cc86c..d03f6db3 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -492,6 +492,7 @@ class GI:
                              415, 427, 458, 495, 496, 497, 508,
                              800, 814, 820, 825, 889, 911,)),
         ("Mary Whitmore Jones", (421, 624,)),
+        ("Jan Wolter", (917,)),
         )
 
     GAMES_BY_PYSOL_VERSION = (
@@ -574,7 +575,7 @@ class GI:
         ('fc-2.20', tuple(range(855, 897))),
         ('fc-2.21', tuple(range(897, 900)) + tuple(range(11014, 11017)) +
          tuple(range(13160, 13163)) + (16682,)),
-        ('dev', tuple(range(906, 917)) + tuple(range(11017, 11020)) +
+        ('dev', tuple(range(906, 918)) + tuple(range(11017, 11020)) +
          tuple(range(22303, 22311)) + tuple(range(22353, 22361))),
     )
 
diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py
index 258eca41..b1f5fd25 100644
--- a/pysollib/games/spider.py
+++ b/pysollib/games/spider.py
@@ -1480,6 +1480,51 @@ class ScorpionTowers(Game):
         return True
 
 
+# ************************************************************************
+# * Astrocyte
+# ************************************************************************
+
+class Astrocyte(Game):
+
+    def createGame(self):
+
+        # create layout
+        l, s = Layout(self), self.s
+
+        # set window
+        self.setSize(l.XM + 14 * l.XS, l.YM + 2 * l.YS + 20 * l.YOFFSET)
+
+        # create stacks
+        x, y = l.XM + 1.5 * l.XS, l.YM
+        for i in range(4):
+            stack = ReserveStack(x, y, self, max_cards=1)
+            s.reserves.append(stack)
+            stack.CARD_YOFFSET = l.YOFFSET
+            x += l.XS
+
+        x, y = l.XM + 6 * l.XS, l.YM
+        for i in range(8):
+            s.foundations.append(Spider_SS_Foundation(x, y, self))
+            x += l.XS
+
+        x, y = l.XM + 3 * l.XS, l.YM + l.YS
+        for i in range(8):
+            s.rows.append(Spider_RowStack(x, y, self))
+            x += l.XS
+
+        x, y = l.XM, l.YM
+        s.talon = DealRowTalonStack(x, y, self)
+        l.createText(s.talon, "ne")
+
+        # define stack-groups
+        l.defaultStackGroups()
+
+    def startGame(self):
+        for i in range(7):
+            self.s.talon.dealRow(flip=0, frames=0)
+        self._startAndDealRow()
+
+
 # register the game
 registerGame(GameInfo(10, RelaxedSpider, "Relaxed Spider",
                       GI.GT_SPIDER | GI.GT_RELAXED, 2, 0, GI.SL_MOSTLY_SKILL))
@@ -1614,3 +1659,5 @@ registerGame(GameInfo(825, ScorpionTowers, "Scorpion Towers",
                       GI.GT_SPIDER | GI.GT_OPEN, 1, 0, GI.SL_SKILL))
 registerGame(GameInfo(870, FairMaids, "Fair Maids",
                       GI.GT_SPIDER, 1, 0, GI.SL_BALANCED))
+registerGame(GameInfo(917, Astrocyte, "Astrocyte",
+                      GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL))