-Klondike type. 2 decks. Unlimited redeals. - -
-Move all cards to the foundations. - -
-Like Double Klondike, -but deal three cards from the talon at a time. +
+Klondike type. 2 decks. Unlimited redeals. + +
+Move all cards to the foundations. + +
+Like Double Klondike, +but deal three cards from the talon at a time. diff --git a/html-src/rules/klondikebythrees.html b/html-src/rules/klondikedraw3.html similarity index 84% rename from html-src/rules/klondikebythrees.html rename to html-src/rules/klondikedraw3.html index 87a951ba..ee67b518 100644 --- a/html-src/rules/klondikebythrees.html +++ b/html-src/rules/klondikedraw3.html @@ -1,12 +1,12 @@ -
-Klondike type. 1 deck. Unlimited redeals. - -
-Move all cards to the foundations. - -
-Like Klondike, -but deal three cards from the talon at a time. +
+Klondike type. 1 deck. Unlimited redeals. + +
+Move all cards to the foundations. + +
+Like Klondike, +but deal three cards from the talon at a time. diff --git a/html-src/rules/quadruplecanfield.html b/html-src/rules/quadruplecanfield.html new file mode 100644 index 00000000..2381390f --- /dev/null +++ b/html-src/rules/quadruplecanfield.html @@ -0,0 +1,12 @@ +
+Canfield type. 4 decks. Unlimited redeals. + +
+Move all cards to the foundations. + +
+Like Canfield, +but with four decks and eight playing piles. diff --git a/html-src/rules/quadrupleklondike.html b/html-src/rules/quadrupleklondike.html new file mode 100644 index 00000000..1f534c35 --- /dev/null +++ b/html-src/rules/quadrupleklondike.html @@ -0,0 +1,12 @@ +
+Klondike type. 4 decks. Unlimited redeals. + +
+Move all cards to the foundations. + +
+Like Klondike, +but with four decks and 16 playing piles. diff --git a/html-src/rules/quadrupleklondikedraw3.html b/html-src/rules/quadrupleklondikedraw3.html new file mode 100644 index 00000000..fc89145a --- /dev/null +++ b/html-src/rules/quadrupleklondikedraw3.html @@ -0,0 +1,12 @@ +
+Klondike type. 4 decks. Unlimited redeals. + +
+Move all cards to the foundations. + +
+Like Quadruple Klondike, +but deal three cards from the talon at a time. diff --git a/html-src/rules/tripleklondikebythrees.html b/html-src/rules/tripleklondikedraw3.html similarity index 83% rename from html-src/rules/tripleklondikebythrees.html rename to html-src/rules/tripleklondikedraw3.html index cabfc094..1a743a3c 100644 --- a/html-src/rules/tripleklondikebythrees.html +++ b/html-src/rules/tripleklondikedraw3.html @@ -1,12 +1,12 @@ -
-Klondike type. 3 decks. Unlimited redeals. - -
-Move all cards to the foundations. - -
-Like Triple Klondike, -but deal three cards from the talon at a time. +
+Klondike type. 3 decks. Unlimited redeals. + +
+Move all cards to the foundations. + +
+Like Triple Klondike, +but deal three cards from the talon at a time. diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index 7692b3d3..b24b33cb 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -575,7 +575,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, 920)) + tuple(range(11017, 11020)) + + ('dev', tuple(range(906, 923)) + tuple(range(11017, 11020)) + tuple(range(22303, 22311)) + tuple(range(22353, 22361))), ) @@ -603,7 +603,7 @@ class GI: 105, # Canfield 158, # Imperial Trumps 279, # Kings - 903, # Ace Up + 903, # Aces Up 5034, # Mahjongg Flying Dragon 5401, # Mahjongg Taipei 12345, # Oonsoo diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index a0ad4a3d..631c28cc 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -652,6 +652,17 @@ class TripleCanfield(Canfield): Canfield.createGame(self, rows=7) +# ************************************************************************ +# * Quadruple Canfield +# ************************************************************************ + +class QuadrupleCanfield(Canfield): + INITIAL_RESERVE_CARDS = 39 + + def createGame(self): + Canfield.createGame(self, rows=8) + + # ************************************************************************ # * Acme # ************************************************************************ @@ -1041,3 +1052,5 @@ registerGame(GameInfo(835, CasinoCanfield, "Casino Canfield", altnames="Reno")) registerGame(GameInfo(896, ThePlot, "The Plot", GI.GT_CANFIELD, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(922, QuadrupleCanfield, "Quadruple Canfield", + GI.GT_CANFIELD, 4, -1, GI.SL_BALANCED)) diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index 173f0ebc..796364ac 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -182,6 +182,21 @@ class ChineseKlondike(DoubleKlondike): DoubleKlondike.createGame(self, rows=12) +# ************************************************************************ +# * Quadruple Klondike +# * Quadruple Klondike by Threes +# ************************************************************************ + +class QuadrupleKlondike(DoubleKlondike): + def createGame(self): + DoubleKlondike.createGame(self, rows=16) + + +class QuadrupleKlondikeByThrees(DoubleKlondike): + def createGame(self): + DoubleKlondike.createGame(self, rows=16, num_deal=3) + + # ************************************************************************ # * Lady Jane # * Inquisitor @@ -418,7 +433,7 @@ class PittTheYounger(Churchill): # register the game registerGame(GameInfo(21, DoubleKlondike, "Double Klondike", GI.GT_KLONDIKE, 2, -1, GI.SL_BALANCED)) -registerGame(GameInfo(28, DoubleKlondikeByThrees, "Double Klondike by Threes", +registerGame(GameInfo(28, DoubleKlondikeByThrees, "Double Klondike (Draw 3)", GI.GT_KLONDIKE, 2, -1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(25, Gargantua, "Gargantua", GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED, @@ -433,7 +448,7 @@ registerGame(GameInfo(51, Steps, "Steps", GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(273, TripleKlondike, "Triple Klondike", GI.GT_KLONDIKE, 3, -1, GI.SL_BALANCED)) -registerGame(GameInfo(274, TripleKlondikeByThrees, "Triple Klondike by Threes", +registerGame(GameInfo(274, TripleKlondikeByThrees, "Triple Klondike (Draw 3)", GI.GT_KLONDIKE, 3, -1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(495, LadyJane, "Lady Jane", GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) @@ -465,3 +480,8 @@ registerGame(GameInfo(828, Churchill, "Churchill", altnames=('Prime Minister'))) registerGame(GameInfo(885, PittTheYounger, "Pitt the Younger", GI.GT_GYPSY, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(920, QuadrupleKlondike, "Quadruple Klondike", + GI.GT_KLONDIKE, 4, -1, GI.SL_BALANCED)) +registerGame(GameInfo(921, QuadrupleKlondikeByThrees, + "Quadruple Klondike (Draw 3)", + GI.GT_KLONDIKE, 4, -1, GI.SL_BALANCED)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index cfb96d27..8100f536 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -1617,7 +1617,7 @@ registerGame(GameInfo(61, CasinoKlondike, "Casino Klondike", GI.GT_KLONDIKE | GI.GT_SCORE, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(129, VegasKlondike, "Vegas Klondike", GI.GT_KLONDIKE | GI.GT_SCORE, 1, 0, GI.SL_BALANCED)) -registerGame(GameInfo(18, KlondikeByThrees, "Klondike by Threes", +registerGame(GameInfo(18, KlondikeByThrees, "Klondike (Draw 3)", GI.GT_KLONDIKE, 1, -1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(58, ThumbAndPouch, "Thumb and Pouch", GI.GT_KLONDIKE, 1, 0, GI.SL_MOSTLY_LUCK)) @@ -1680,7 +1680,8 @@ registerGame(GameInfo(326, Lanes, "Lanes", registerGame(GameInfo(327, ThirtySix, "Thirty-Six", GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(350, Q_C_, "Q.C.", - GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) + GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED, + altnames=("K.C.",))) registerGame(GameInfo(361, NorthwestTerritory, "Northwest Territory", GI.GT_RAGLAN, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(362, Morehead, "Morehead",