Fix flake8

html-src/rules/microbe.html

@@ -0,0 +1,27 @@
+<h1>Microbe</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 alternate color from King to Ace and move such sets to the foundations.
+
+<h3>Rules</h3>
+<p>
+The decks are separated.  From one deck, four cards are dealt to each of
+eleven tableau piles, with alternating cards face-up and face-down (the
+bottom and third from the bottom cards are face-down).  The remaining
+eight cards from that deck are combined with the other deck to form the
+talon.
+<p>
+Tableau piles are built down by alternate color, and any card or valid
+sequence of cards can be moved between tableau piles.  Any valid card or
+sequence can fill empty piles.
+<p>
+The object is to group the cards in sets of 13 cards, from King to Ace
+in an alternating color sequence. Such groups can be moved to the foundations.
+<p>
+When there are no moves left, you can deal one card from the talon to
+each tableau pile.  The game is won if all cards are grouped into sequences
+and moved to the foundations.

pysollib/gamedb.py

@@ -595,6 +595,7 @@ class GI:
          tuple(range(19000, 19012)) + tuple(range(22303, 22311)) +
          tuple(range(22353, 22361))),
         ('fc-3.1', tuple(range(961, 971))),
+        ('dev', tuple(range(971, 972))),
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag

pysollib/games/acesup.py

@@ -505,7 +505,7 @@ class MaineCoon(TabbyCat):
 # register the game
 registerGame(GameInfo(903, AcesUp, "Aces Up",                   # was: 52
                       GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK,
-                      altnames=("Aces High", "Drivel")))
+                      altnames=("Aces High", "Drivel", "Discard")))
 registerGame(GameInfo(206, Fortunes, "Fortunes",
                       GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK))
 registerGame(GameInfo(213, RussianAces, "Russian Aces",

pysollib/games/gypsy.py

@@ -1125,7 +1125,8 @@ registerGame(GameInfo(666, TrapdoorSpider, "Trapdoor Spider",
 registerGame(GameInfo(712, Leprechaun, "Leprechaun",
                       GI.GT_GYPSY | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(718, LockedCards, "Locked Cards",
-                      GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED))
+                      GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED,
+                      altnames=("Prisoners",)))
 registerGame(GameInfo(721, Thirty, "Thirty",
                       GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_STRIPPED, 1, 0,
                       GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12)))
@@ -1133,7 +1134,7 @@ registerGame(GameInfo(725, TopsyTurvyQueens, "Topsy-Turvy Queens",
                       GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED))
 registerGame(GameInfo(792, KingsSecrets, "King's Secrets",
                       GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED,
-                      altnames=('Royal Secrets',)))
+                      altnames=('Royal Secrets', "King's Captives")))
 registerGame(GameInfo(842, SwissPatience, "Swiss Patience",
                       GI.GT_GYPSY, 1, 0, GI.SL_BALANCED))
 registerGame(GameInfo(890, YeastDough, "Yeast Dough",

pysollib/games/pyramid.py

@@ -1895,7 +1895,7 @@ registerGame(GameInfo(699, DoublePyramid, "Double Pyramid",
                       GI.GT_PAIRING_TYPE, 2, 2, GI.SL_MOSTLY_LUCK))
 registerGame(GameInfo(700, Triangle, "Triangle",
                       GI.GT_PAIRING_TYPE, 1, 2, GI.SL_MOSTLY_LUCK,
-                      altnames=('Yield',)))
+                      altnames=('Yield', 'Funnel')))
 registerGame(GameInfo(701, UpAndDown, "Up and Down",
                       GI.GT_PAIRING_TYPE | GI.GT_ORIGINAL, 2, 2,
                       GI.SL_MOSTLY_LUCK))

pysollib/games/spider.py

@@ -1158,6 +1158,7 @@ class Tarantula(Spider):
 
 # ************************************************************************
 # * Fechter's Game
+# * Microbe
 # ************************************************************************
 
 class FechtersGame_Talon(TalonStack):
@@ -1180,14 +1181,7 @@ class FechtersGame_Talon(TalonStack):
 
 
 class FechtersGame_RowStack(AC_RowStack):
-    def canDropCards(self, stacks):
+    canDropCards = BasicRowStack.spiderCanDropCards
-        if len(self.cards) < 13:
-            return (None, 0)
-        cards = self.cards[-13:]
-        for s in stacks:
-            if s is not self and s.acceptsCards(self, cards):
-                return (s, 13)
-        return (None, 0)
 
 
 class FechtersGame(RelaxedSpider):
@@ -1208,6 +1202,17 @@ class FechtersGame(RelaxedSpider):
     shallHighlightMatch = Game._shallHighlightMatch_AC
 
 
+class Microbe(FechtersGame):
+    Talon_Class = DealRowTalonStack
+    RowStack_Class = StackWrapper(FechtersGame_RowStack, base_rank=ANY_RANK)
+
+    def createGame(self):
+        RelaxedSpider.createGame(self, rows=11)
+
+    def shuffle(self):
+        self.shuffleSeparateDecks()
+
+
 # ************************************************************************
 # * Bebop
 # ************************************************************************
@@ -1663,3 +1668,6 @@ 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))
+registerGame(GameInfo(971, Microbe, "Microbe",
+                      GI.GT_SPIDER | GI.GT_SEPARATE_DECKS, 2, 0,
+                      GI.SL_MOSTLY_SKILL))