diff --git a/html-src/rules/hexaklonbythrees.html b/html-src/rules/hexaklondraw3.html similarity index 95% rename from html-src/rules/hexaklonbythrees.html rename to html-src/rules/hexaklondraw3.html index 1d2d28b4..6eea32d5 100644 --- a/html-src/rules/hexaklonbythrees.html +++ b/html-src/rules/hexaklondraw3.html @@ -1,26 +1,26 @@ -

Hex A Klon by Three

-Klondike type. One deck. Unlimited redeals. - -

Object

-Move all cards to the Foundations. - -

Quick description

-Similar to Klondike -with Hex A Deck -variations. - -

Rules

-Game play is like Klondike with the Wizards being wild. They can be played -on the tableau as any rank or color. Once a Wizard is played on a row however -that row may become unmovable. If a Wizard is played in it's proper rank -position the row can still be moved. A stack with two Wizards can be moved -only if they are both in their rank position and they are not adjacent to -each other. The Wizards will not move off of the tableau until all the other -cards have been moved to the foundations. Cards are dealt from the talon three -at a time. Any card or sequence may be played on the canvas. Cards may -be played from the foundations. - -

Strategy

-Keep the Wizards off of piles that contain face down cards. Once all the -cards on the tableau are face up try to get the Wizards out of the way. Put -them all on one row stack until the suit cards have been moved to the foundations. +

Hex A Klon (Draw 3)

+Klondike type. One deck. Unlimited redeals. + +

Object

+Move all cards to the Foundations. + +

Quick description

+Similar to Klondike +with Hex A Deck +variations. + +

Rules

+Game play is like Klondike with the Wizards being wild. They can be played +on the tableau as any rank or color. Once a Wizard is played on a row however +that row may become unmovable. If a Wizard is played in it's proper rank +position the row can still be moved. A stack with two Wizards can be moved +only if they are both in their rank position and they are not adjacent to +each other. The Wizards will not move off of the tableau until all the other +cards have been moved to the foundations. Cards are dealt from the talon three +at a time. Any card or sequence may be played on the canvas. Cards may +be played from the foundations. + +

Strategy

+Keep the Wizards off of piles that contain face down cards. Once all the +cards on the tableau are face up try to get the Wizards out of the way. Put +them all on one row stack until the suit cards have been moved to the foundations. diff --git a/html-src/rules/jokeklon.html b/html-src/rules/jokeklon.html new file mode 100644 index 00000000..d6e85dcf --- /dev/null +++ b/html-src/rules/jokeklon.html @@ -0,0 +1,17 @@ +

Joke Klon

+

+Klondike type. 1 joker deck. Unlimited redeals. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Like Klondike, +but with jokers. Any card or sequence can be played on a joker, +and a joker can be played on any card or sequence, or an empty +space. Jokers can be moved to their foundation once all the other +cards have been moved to the foundations. +

+A french deck variant of Hex A Klon. diff --git a/html-src/rules/jokeklondraw3.html b/html-src/rules/jokeklondraw3.html new file mode 100644 index 00000000..e16776bb --- /dev/null +++ b/html-src/rules/jokeklondraw3.html @@ -0,0 +1,12 @@ +

Joke Klon (Draw 3)

+

+Klondike type. 1 joker deck. Unlimited redeals. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Like Joke Klon, +but deal three cards from the talon at a time. diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index ae7e0289..45524ca2 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -598,7 +598,7 @@ class GI: ('fc-2.20', tuple(range(855, 897))), ('fc-2.21', tuple(range(897, 900)) + tuple(range(11014, 11017)) + tuple(range(13160, 13163)) + (16682,)), - ('dev', tuple(range(906, 956)) + tuple(range(11017, 11020)) + + ('dev', tuple(range(906, 958)) + tuple(range(11017, 11020)) + tuple(range(5600, 5624)) + tuple(range(18000, 18005)) + tuple(range(19000, 19012)) + tuple(range(22303, 22311)) + tuple(range(22353, 22361))), diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 69d9884f..e8ae2938 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -505,6 +505,31 @@ class Wildcards(Somerset): self.s.talon.dealRow(rows=self.s.rows[7:]) self.s.talon.dealRow(rows=self.s.rows[8:]) + +# ************************************************************************ +# * Joke Klon +# ************************************************************************ + +class JokeKlon_RowStack(KingAC_RowStack): + def acceptsCards(self, from_stack, cards): + stackcards = self.cards + if (stackcards and stackcards[-1].suit == 4) or cards[0].suit == 4: + return 1 + if not self.basicAcceptsCards(from_stack, cards): + return 0 + return KingAC_RowStack.acceptsCards(self, from_stack, cards) + + +class JokeKlon(Klondike): + RowStack_Class = JokeKlon_RowStack + Foundation_Class = Wildcards_Foundation + + +class JokeKlonByThrees(KlondikeByThrees): + RowStack_Class = JokeKlon_RowStack + Foundation_Class = Wildcards_Foundation + + # ************************************************************************ # * Canister # * American Canister @@ -1768,3 +1793,9 @@ registerGame(GameInfo(954, Wildcards, "Wildcards", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, subcategory=GI.GS_JOKER_DECK, trumps=list(range(2)))) +registerGame(GameInfo(956, JokeKlon, "Joke Klon", + GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED, + subcategory=GI.GS_JOKER_DECK, trumps=list(range(2)))) +registerGame(GameInfo(957, JokeKlonByThrees, "Joke Klon (Draw 3)", + GI.GT_KLONDIKE, 1, -1, GI.SL_MOSTLY_LUCK, + subcategory=GI.GS_JOKER_DECK, trumps=list(range(2)))) diff --git a/pysollib/games/special/hexadeck.py b/pysollib/games/special/hexadeck.py index e85ac3d1..81fa35d7 100644 --- a/pysollib/games/special/hexadeck.py +++ b/pysollib/games/special/hexadeck.py @@ -1618,7 +1618,7 @@ r(165, BitsNBytes, 'Bits n Bytes', GI.GT_HEXADECK, 1, 1, GI.SL_BALANCED) r(166, HexAKlon, 'Hex A Klon', GI.GT_HEXADECK, 1, -1, GI.SL_BALANCED) r(16666, KlondikePlus16, 'Klondike Plus 16', GI.GT_HEXADECK, 1, 1, GI.SL_BALANCED) -r(16667, HexAKlonByThrees, 'Hex A Klon by Threes', GI.GT_HEXADECK, 1, -1, +r(16667, HexAKlonByThrees, 'Hex A Klon (Draw 3)', GI.GT_HEXADECK, 1, -1, GI.SL_BALANCED) r(16668, KingOnlyHexAKlon, 'King Only Hex A Klon', GI.GT_HEXADECK, 1, -1, GI.SL_BALANCED)