-Two cards are dealt from the stock, but additional cards may be -dealt at any time. -
-If two cards of the same suit or rank are next to each other, or -separated by exactly two cards, the card that is further to the left -(in PySol, this is the card that is further from the deck) may be moved -on top of the other. +Cards are dealt from the stock in a sequence. If two cards of the same +suit or rank are next to each other, or separated by exactly two cards, +the card that is further to the left (in PySol, this is the card that is +further from the deck) may be moved on top of the other.
The game is won when only one card remains. diff --git a/html-src/rules/decade.html b/html-src/rules/decade.html new file mode 100644 index 00000000..96d1afde --- /dev/null +++ b/html-src/rules/decade.html @@ -0,0 +1,17 @@ +
+One-Deck game type. 1 deck. No redeal. + +
+Remove all the cards. + +
+Cards are dealt from the stock in a sequence. Any sequence +of two or more consecutive cards with a total rank of 10, 20, +or 30 may be removed. Face cards are valued at 10. The game +is won if all cards are removed. +
+In PySol, a sequence is removed by selecting the first and last +card of the sequence. diff --git a/html-src/rules/pushpin.html b/html-src/rules/pushpin.html new file mode 100644 index 00000000..900ac64b --- /dev/null +++ b/html-src/rules/pushpin.html @@ -0,0 +1,12 @@ +
+One deck type. 1 deck. No redeal. + +
+Remove all but two cards. + +
+Like Royal Marriage, +but the first and last cards are not set. diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index 5b6bbae9..d99b9517 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -423,7 +423,7 @@ class GI: ('fc-2.8', (343001,)), ('fc-2.12', tuple(range(774, 811)) + (16681,) + tuple(range(22217, 22219))), - ('fc-2.14', tuple(range(811, 816))) + ('fc-2.14', tuple(range(811, 817))) ) # deprecated - the correct way is to or a GI.GT_XXX flag diff --git a/pysollib/games/pushpin.py b/pysollib/games/pushpin.py index 034d49de..48531efa 100644 --- a/pysollib/games/pushpin.py +++ b/pysollib/games/pushpin.py @@ -384,6 +384,53 @@ class AccordionsRevenge(Accordion2): self.texts.base_rank.config(text=RANKS[self.finalrank] + ' - ' + SUITS_PL[self.finalsuit]) +# ************************************************************************ +# * Decade +# ************************************************************************ + + +class Decade_RowStack(PushPin_RowStack): + + def acceptsCards(self, from_stack, cards): + if not self.cards: + return False + firstcard = min(self.id, from_stack.id) + lastcard = max(self.id, from_stack.id) + 1 + + total = 0 + for x in range(firstcard, lastcard): + total += min(self.game.s.rows[x].cards[0].rank + 1, 10) + + return total in [10, 20, 30] + + def _dropPairMove(self, n, other_stack, frames=-1, shadow=-1): + game = self.game + old_state = game.enterState(game.S_FILL) + f = game.s.foundations[0] + game.updateStackMove(game.s.talon, 2 | 16) # for undo + if not game.demo: + game.playSample("droppair", priority=200) + + firstcard = min(self.id, other_stack.id) + lastcard = max(self.id, other_stack.id) + 1 + + for x in range(firstcard, lastcard): + game.moveMove(n, self.game.s.rows[x], f, + frames=frames, shadow=shadow) + + self.fillStack() + game.updateStackMove(game.s.talon, 1 | 16) # for redo + game.leaveState(old_state) + + clickHandler = ReserveStack.clickHandler + + +class Decade(PushPin): + RowStack_Class = Decade_RowStack + + def isGameWon(self): + return len(self.s.foundations[0].cards) == 52 + registerGame(GameInfo(287, PushPin, "Push Pin", GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) @@ -400,3 +447,6 @@ registerGame(GameInfo(773, RelaxedAccordion, "Relaxed Accordion", GI.GT_1DECK_TYPE | GI.GT_RELAXED, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(811, AccordionsRevenge, "Accordion's Revenge", GI.GT_1DECK_TYPE, 1, 0, GI.SL_SKILL)) +registerGame(GameInfo(816, Decade, "Decade", + GI.GT_1DECK_TYPE, 1, 0, GI.SL_SKILL, + altnames=('Ten Twenty Thirty')))