From ac06c9157d6f917d998da86c577d00f37f54ae42 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Tue, 9 May 2023 20:44:39 -0400
Subject: [PATCH] Added Aces Square game.

---
 html-src/rules/acessquare.html | 22 ++++++++++++++++++++
 pysollib/gamedb.py             |  2 +-
 pysollib/games/montecarlo.py   | 38 ++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 html-src/rules/acessquare.html

diff --git a/html-src/rules/acessquare.html b/html-src/rules/acessquare.html
new file mode 100644
index 00000000..756e4122
--- /dev/null
+++ b/html-src/rules/acessquare.html
@@ -0,0 +1,22 @@
+<h1>Aces Square</h1>
+<p>
+One-Deck game type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards except the four Aces to the single foundation.
+
+<h3>Rules</h3>
+<p>
+Cards are dealt to a square of four rows of four cards each.
+You can remove pairs of cards of the same suit that are in the
+same row or column, and do not contain aces.  Empty spaces are
+immediately filled from the talon, and can no longer be filled
+when they're empty.
+<p>
+The game is won when all cards are removed in this way except
+for the four aces.
+
+<h3>Notes</h3>
+<p>
+<i>Autodrop</i> is disabled for this game.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 3840a35e..ac1b8c53 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -559,7 +559,7 @@ class GI:
         ('fc-2.14', tuple(range(811, 827))),
         ('fc-2.15', tuple(range(827, 855)) + tuple(range(22400, 22407))),
         ('fc-2.20', tuple(range(855, 897))),
-        ('dev', tuple(range(897, 898)) + tuple(range(13160, 13163)))
+        ('dev', tuple(range(897, 899)) + tuple(range(13160, 13163)))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py
index fb28c9b9..d0df9315 100644
--- a/pysollib/games/montecarlo.py
+++ b/pysollib/games/montecarlo.py
@@ -993,6 +993,42 @@ class RightAndLeft(Game):
         self._startAndDealRow()
 
 
+# ************************************************************************
+# * Aces Square
+# ************************************************************************
+
+class AcesSquare_RowStack(MonteCarlo_RowStack):
+    def acceptsCards(self, from_stack, cards):
+        if not OpenStack.acceptsCards(self, from_stack, cards):
+            return False
+        if self.cards[-1].rank == 0 or cards[0].rank == 0:
+            return False
+
+        return (self.game.isNeighbour(from_stack, self)
+                and self.cards[-1].suit == cards[0].suit)
+
+
+class AcesSquare(MonteCarlo):
+    Talon_Class = AutoDealTalonStack
+    RowStack_Class = AcesSquare_RowStack
+
+    def createGame(self):
+        MonteCarlo.createGame(self, rows=4, cols=4)
+
+    def isGameWon(self):
+        return len(self.s.foundations[0].cards) == 48
+
+    def fillStack(self, stack):
+        if stack in self.s.rows:
+            if len(stack.cards) == 0 and len(self.s.talon.cards) > 0:
+                self.flipMove(self.s.talon)
+                self.moveMove(1, self.s.talon, stack)
+
+    def isNeighbour(self, stack1, stack2):
+        return (stack1.id // 4 == stack2.id // 4 or
+                stack1.id % 4 == stack2.id % 4)
+
+
 # register the game
 registerGame(GameInfo(89, MonteCarlo, "Monte Carlo",
                       GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK,
@@ -1057,3 +1093,5 @@ registerGame(GameInfo(874, PatientPairs, "Patient Pairs",
 registerGame(GameInfo(875, PatientPairsOpen, "Patient Pairs (Open)",
                       GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0,
                       GI.SL_MOSTLY_SKILL, rules_filename="patientpairs.html"))
+registerGame(GameInfo(898, AcesSquare, "Aces Square",
+                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED))