Add Joker Bombs game.

Author: joeraz

html-src/rules/jokerbombs.html

@@ -0,0 +1,14 @@
+<h1>Joker Bombs</h1>
+<p>
+One-Deck game type. 1 joker deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards except the four Aces to the single foundation.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="acesup.html">Aces Up</a>,
+but with jokers.  Jokers can be removed at any time - if a joker
+is removed, all of the cards under it are removed and shuffled back
+into the talon.

pysollib/gamedb.py

@@ -607,7 +607,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, 984)) + tuple(range(16686, 16687))),
+        ('dev', tuple(range(981, 985)) + tuple(range(16686, 16687))),
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag

pysollib/games/acesup.py

@@ -161,6 +161,46 @@ class RussianAces(AcesUp):
     Talon_Class = RussianAces_Talon
 
 
+# ************************************************************************
+# * Joker Bombs
+# ************************************************************************
+
+class JokerBombs_Foundation(AcesUp_Foundation):
+    def acceptsCards(self, from_stack, cards):
+        if cards[0].suit == 4:
+            return True
+
+        return AcesUp_Foundation.acceptsCards(self, from_stack, cards)
+
+
+class JokerBombs_RowStack(AcesUp_RowStack):
+    def moveMove(self, ncards, to_stack, frames=-1, shadow=-1):
+        if self.cards[-1].suit == 4:
+            s = BasicRowStack.moveMove(self, ncards, to_stack, frames=frames,
+                                       shadow=shadow)
+
+            old_state = self.game.enterState(self.game.S_FILL)
+            self.game.saveStateMove(2 | 16)  # for undo
+
+            while self.cards:
+                self.game.flipMove(self)
+                self.game.moveMove(1, self, self.game.s.talon, frames=frames)
+            self.game.shuffleStackMove(self.game.s.talon)
+
+            self.game.saveStateMove(1 | 16)  # for redo
+            self.game.leaveState(old_state)
+
+            return s
+        else:
+            return BasicRowStack.moveMove(self, ncards, to_stack,
+                                          frames=frames, shadow=shadow)
+
+
+class JokerBombs(AcesUp):
+    RowStack_Class = StackWrapper(JokerBombs_RowStack, max_accept=1)
+    Foundation_Class = JokerBombs_Foundation
+
+
 # ************************************************************************
 # * Perpetual Motion
 # ************************************************************************
@@ -500,12 +540,12 @@ def createGame(self):
 
 # register the game
 registerGame(GameInfo(903, AcesUp, "Aces Up",                   # was: 52
-                      GI.GT_1DECK_TYPE | GI.GT_CHILDREN, 1, 0, GI.SL_LUCK,
+                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK,
                       altnames=("Aces High", "Drivel", "Discard")))
 registerGame(GameInfo(206, Fortunes, "Fortunes",
-                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK))
+                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
 registerGame(GameInfo(213, RussianAces, "Russian Aces",
-                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK))
+                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK))
 registerGame(GameInfo(130, PerpetualMotion, "Perpetual Motion",
                       GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK,
                       altnames=("First Law", "Narcotic")))
@@ -526,3 +566,6 @@ def createGame(self):
                       GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL))
 registerGame(GameInfo(934, Valentine, "Valentine",
                       GI.GT_1DECK_TYPE, 1, -1, GI.SL_LUCK))
+registerGame(GameInfo(984, JokerBombs, "Joker Bombs",
+                      GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK,
+                      subcategory=GI.GS_JOKER_DECK, trumps=list(range(2))))