Add Antares game

Author: joeraz

html-src/rules/antares.html

@@ -0,0 +1,29 @@
+<h1>Antares</h1>
+<p>
+FreeCell type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+There are eight tableau piles, divided into two sets.  The first set of tableau
+piles contains four piles, each with seven cards dealt to it, and are built
+down by alternate color, with only one card being moved at a time.  The second
+set consists of four piles, with six cards dealt to each, and are built down by
+same suit, and cards can be moved regardless of sequence.  Empty piles on the
+left stacks can be filled with any card, whereas piles on the right can only be
+filled with kings.
+<p>
+A sequence can be moved from one set to the other, regardless of whether it matches
+the rules of the piles it moved to, but in this case, the sequence cannot be moved
+further.
+<p>
+The foundations are built up by same suit, from ace to king.  The game is won if
+all cards are moved to the foundations.
+
+<h3>History</h3>
+<p>
+Demons and Thieves is a combination of FreeCell-type and Scorpion-type
+games.  It was invented by Thomas Warfield.

pysollib/gamedb.py

@@ -437,23 +437,22 @@ def _callback(gi, gt=game_type):
         # from XM Solitaire should be researched before being added to PySol.
         #
         # still missing:
-        #       Agnes Three, Antares, Avenue, Baker's Fan, Baker's Spider,
-        #       Bedeviled, Binding, Black Spider, California, Color Cell,
-        #       Cornelius, Desert Fox, Double Antares, Double Antarctica,
-        #       Double Arctica, Double Baker's Spider, Double Cascade,
-        #       Double Majesty, Double Spidercells, Doublet Cell 5, Doubt,
-        #       Dream Fan, Dumfries Cell, Falcon Wing, Fan Nine, Four By Ten,
-        #       FreeCell AK, Gaps Alter, Gaps Diff, George V,
-        #       Grandmother's Clock, In a Frame, Inverted FreeCell, Kings,
-        #       Klondike FreeCell, La Cabane, La Double Entente,
-        #       Little Gazette, Magic FreeCell, Mini Gaps, Montreal,
-        #       Napoleon at Iena, Napoleon at Waterloo, Napoleon's Guards,
-        #       Oasis, Opera, Ordered Suits, Osmotic FreeCell, Pair FreeCell,
-        #       Pairs 2, Reserved Thirteens, Sept Piles 0, Short Solitaire,
-        #       Simple Alternations, Smart Osmosis, Step By Step,
-        #       Stripped FreeCell, Tarantula, Triple Dispute, Trusty Twenty,
-        #       Two Ways 3, Up Or Down, Versailles, Vertical FreeCell,
-        #       Wasp Baby, Yukon FreeCell
+        #       Agnes Three, Avenue, Baker's Fan, Baker's Spider, Bedeviled,
+        #       Binding, Black Spider, California, Color Cell, Cornelius,
+        #       Desert Fox, Double Antares, Double Antarctica, Double Arctica,
+        #       Double Baker's Spider, Double Cascade, Double Majesty,
+        #       Double Spidercells, Doublet Cell 5, Doubt, Dream Fan,
+        #       Dumfries Cell, Falcon Wing, Fan Nine, Four By Ten, FreeCell AK,
+        #       Gaps Alter, Gaps Diff, George V, Grandmother's Clock,
+        #       In a Frame, Inverted FreeCell, Kings, Klondike FreeCell,
+        #       La Cabane, La Double Entente, Little Gazette, Magic FreeCell,
+        #       Mini Gaps, Montreal, Napoleon at Iena, Napoleon at Waterloo,
+        #       Napoleon's Guards, Oasis, Opera, Ordered Suits,
+        #       Osmotic FreeCell, Pair FreeCell, Pairs 2, Reserved Thirteens,
+        #       Sept Piles 0, Short Solitaire, Simple Alternations,
+        #       Smart Osmosis, Step By Step, Stripped FreeCell, Tarantula,
+        #       Triple Dispute, Trusty Twenty, Two Ways 3, Up Or Down,
+        #       Versailles, Vertical FreeCell, Wasp Baby, Yukon FreeCell
         ("XM Solitaire", (
             2, 8, 9, 13, 15, 18, 19, 20, 29, 30, 31, 34, 36, 38, 41, 42,
             45, 46, 50, 53, 54, 56, 57, 64, 77, 78, 86, 96, 97, 98, 105,
@@ -465,7 +464,7 @@ def _callback(gi, gt=game_type):
             476, 480, 484, 511, 512, 513, 516, 561, 610, 613, 625, 629,
             631, 638, 641, 647, 650, 655, 678, 684, 702, 734, 751, 784,
             825, 829, 834, 837, 844, 862, 867, 880, 889, 901, 911, 933,
-            941, 947, 953, 966
+            941, 947, 953, 966, 983
         )),
 
         # xpat2 1.06 (we have 14 out of 16 games)
@@ -513,7 +512,7 @@ def _callback(gi, gt=game_type):
         ("Thomas Warfield", (189, 264, 300, 320, 336, 337, 359,
                              415, 427, 458, 495, 496, 497, 508,
                              800, 814, 820, 825, 889, 911, 926,
-                             941, 966)),
+                             941, 966, 983)),
         ("Mary Whitmore Jones", (421, 624,)),
         ("Jan Wolter", (917, 939, 946, 963,)),
         )
@@ -607,7 +606,7 @@ def _callback(gi, gt=game_type):
         ('fc-3.4', tuple(range(971, 981)) + tuple(range(5419, 5421)) +
          tuple(range(16683, 16686)) + tuple(range(18005, 18007)) +
          (44, 526, 5906, 22399,)),
-        ('dev', tuple(range(981, 983)) + tuple(range(16686, 16687))),
+        ('dev', tuple(range(981, 984)) + tuple(range(16686, 16687))),
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag

pysollib/games/demonsandthieves.py

@@ -3,13 +3,16 @@
 from pysollib.layout import Layout
 from pysollib.pysoltk import MfxCanvasText
 from pysollib.stack import \
-        AC_RowStack, \
-        OpenStack, \
-        SS_FoundationStack, \
-        SS_RowStack, \
-        WasteStack, \
-        WasteTalonStack
-from pysollib.util import ANY_RANK, RANKS
+    AC_RowStack, \
+    InitialDealTalonStack, \
+    OpenStack, \
+    ReserveStack, \
+    SS_FoundationStack, \
+    SS_RowStack, \
+    WasteStack, \
+    WasteTalonStack, \
+    Yukon_SS_RowStack
+from pysollib.util import ANY_RANK, KING, RANKS
 
 
 # ************************************************************************
@@ -36,6 +39,7 @@ class DemonsAndThieves_SS_RowStack(DemonsAndThieves_StackMethods, SS_RowStack):
 
 
 class DemonsAndThieves(Game):
+
     def createGame(self, max_rounds=3, num_deal=1,
                    text=True, round_text=True, dir=-1):
         # create layout
@@ -170,6 +174,62 @@ def _saveGameHook(self, p):
         p.dump(self.base_card.id)
 
 
+# ************************************************************************
+# * Antares
+# ************************************************************************
+
+class Antares(Game):
+
+    def createGame(self):
+        # create layout
+        lay, s = Layout(self), self.s
+        decks = self.gameinfo.decks
+
+        # (piles up to 20 cards are playable in default window size)
+        h = max(3 * lay.YS, lay.YS + 13 * 10)
+        self.setSize(
+            lay.XM + 8.5 * lay.XS + lay.XM,
+            lay.YM + lay.YS + lay.TEXT_HEIGHT + h)
+
+        x, y = lay.XM, h
+        self.s.talon = InitialDealTalonStack(x, y, self)
+
+        # create stacks
+        x, y = lay.XM, lay.YM
+        for i in range(4):
+            for j in range(decks):
+                s.reserves.append(ReserveStack(x, y, self, max_accept=1))
+                x += lay.XS
+        x += (lay.XS * .5)
+        for i in range(4):
+            for j in range(decks):
+                s.foundations.append(SS_FoundationStack(x, y, self, i,
+                                                        max_move=0))
+                x += lay.XS
+
+        x, y = lay.XM, lay.YM + lay.YS
+
+        for i in range(4):
+            s.rows.append(DemonsAndThieves_AC_RowStack(x, y, self,
+                                                       base_rank=ANY_RANK))
+            x += lay.XS
+        x += (lay.XS * .5)
+        for i in range(4):
+            s.rows.append(Yukon_SS_RowStack(x, y, self, base_rank=KING))
+            x += lay.XS
+
+        # define stack-groups
+        lay.defaultStackGroups()
+
+    def startGame(self):
+        self._startDealNumRows(5)
+        self.s.talon.dealRow()
+        r = self.s.rows
+        self.s.talon.dealRow(rows=r[:4])
+
+
 # register the game
 registerGame(GameInfo(889, DemonsAndThieves, "Demons and Thieves",
                       GI.GT_FORTY_THIEVES, 2, 2, GI.SL_MOSTLY_SKILL))
+registerGame(GameInfo(983, Antares, "Antares",
+                      GI.GT_FREECELL, 1, 0, GI.SL_MOSTLY_SKILL))