-Klondike type with different deal style. 2 decks. No redeals. - -
-Move all cards to the foundations. - -
-Foundations are built up in suit from Ace to King. -
-The playing piles build down by alternate color, and an empty space -can only be filled by a King or a sequence starting with a King. -
-When you click on the talon, one card is played on each stack, -except for stacks that are a single sequence starting with a King. -
-Cards from the "Devil's Six" on the top of the board can only -be moved directly to the foundations, and has to be played in order -of the stack. +
+Gypsy type. 2 decks. No redeals. + +
+Move all cards to the foundations. + +
+Foundations are built up in suit from Ace to King. +
+The playing piles build down by alternate color, and an empty space +can only be filled by a King or a sequence starting with a King. +
+When you click on the talon, one card is played on each stack, +except for stacks that are a single sequence starting with a King. +
+Cards from the "Devil's Six" on the top of the board can only +be moved directly to the foundations, and has to be played in order +of the stack. diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index fa311f8d..102c7ae0 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -323,6 +323,16 @@ class GI: 22231, )), + # Hoyle Card Games + # still missing: + # Bowling (Schwader version), Euchre, Slide, Arcade games + ("Hoyle Card Games", ( + 2, 8, 9, 11, 13, 19, 24, 29, 31, 34, 36, 38, 42, 53, 57, 64, + 105, 112, 126, 133, 134, 135, 139, 147, 173, 222, 234, 235, + 256, 258, 296, 330, 398, 484, 619, 657, 737, 784, 800, 805, + 901, 903, + )), + # KDE Patience 0.7.3 from KDE 1.1.2 (we have 6 out of 9 games) # ("KDE Patience 0.7.3", (2, 7, 8, 18, 256, 903,)), # KDE Patience 2.0 from KDE 2.1.2 (we have 11 out of 13 games) @@ -336,6 +346,26 @@ class GI: # Microsoft Solitaire (we have all 5 games) ("Microsoft Solitaire Collection", (2, 8, 11, 38, 22231,)), + # Solitaire Royale + # still missing: Pairs + ("Solitaire Royale", ( + 2, 36, 38, 105, 128, 176, 256, 328, 484, 835 + )), + + # Solitude for Windows + # still missing: + # Bowling (Sackson version), Four Kingdoms, Icicles, Pluto, + # Six By Six + ("Solitude for Windows", ( + 2, 8, 11, 13, 19, 24, 25, 29, 30, 31, 33, 34, 36, 38, 42, + 43, 45, 48, 50, 53, 56, 57, 58, 59, 60, 62, 64, 67, 69, 71, + 86, 87, 88, 89, 95, 96, 97, 98, 100, 104, 105, 107, 109, + 112, 125, 128, 133, 134, 135, 139, 146, 147, 171, 172, 173, + 221, 222, 224, 228, 233, 234, 235, 256, 257, 258, 282, 314, + 327, 330, 355, 356, 398, 406, 414, 418, 434, 437, 484, 593, + 737, 751, 805, 830, 845, 901, 903 + )), + # XM Solitaire # NOTE: This collection has a lot of games with the same name as # established games but completely different rules, or more obscure @@ -390,9 +420,12 @@ class GI: ("David Bernazzani", (314, 830,)), ("Gordon Bower", (763, 783,)), ("Art Cabral", (9,)), - ("Richard A. Canfield", (105,)), + ("Richard A. Canfield", (105, 835,)), + ("Lillian Davies and Christa Baran", (605,)), ("Robert Harbin", (381,)), ("Robert Hogue", (22216, 22217, 22218, 22231,)), + ("Erik den Hollander", (344, 544,)), + ("Rick Holzgrafe", (756, 757,)), ("Charles Jewell", (220, 309,)), ("Michael Keller", (592,)), ("Fred Lunde", (459,)), @@ -400,8 +433,9 @@ class GI: 303, 362, 547, 738, 845)), ("Toby Ord", (788,)), - ("David Parlett", (64, 98, 294, 338, 654, 796, 812)), + ("David Parlett", (64, 98, 294, 338, 654, 796, 812, 844)), ("Randy Rasa", (187, 190, 191, 192,)), + ("Gregg Seelhoff", (347,)), ("Adam Selene", (366,)), ("Jim Sizelove", (555001,)), ("Captain Jeffrey T. Spaulding", (400,)), @@ -491,7 +525,7 @@ class GI: # deprecated - the correct way is to or a GI.GT_XXX flag # in the registerGame() call - _CHILDREN_GAMES = [16, 33, 55, 90, 91, 96, 97, 176, 903, ] + _CHILDREN_GAMES = [16, 33, 55, 90, 91, 96, 97, 176, 328, 329, 903, ] _OPEN_GAMES = [] diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index f7ad1a71..3faff155 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -944,7 +944,8 @@ registerGame(GameInfo(103, AmericanToad, "American Toad", registerGame(GameInfo(102, VariegatedCanfield, "Variegated Canfield", GI.GT_CANFIELD, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(112, EagleWing, "Eagle Wing", - GI.GT_CANFIELD, 1, 2, GI.SL_BALANCED)) + GI.GT_CANFIELD, 1, 2, GI.SL_BALANCED, + altnames="Thirteen Down")) registerGame(GameInfo(315, Gate, "Gate", GI.GT_CANFIELD, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(316, LittleGate, "Little Gate", @@ -975,4 +976,5 @@ registerGame(GameInfo(642, Lafayette, "Lafayette", registerGame(GameInfo(789, Beehive, "Beehive", GI.GT_CANFIELD, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(835, CasinoCanfield, "Casino Canfield", - GI.GT_CANFIELD | GI.GT_SCORE, 1, 0, GI.SL_BALANCED)) + GI.GT_CANFIELD | GI.GT_SCORE, 1, 0, GI.SL_BALANCED, + altnames="Reno")) diff --git a/pysollib/games/capricieuse.py b/pysollib/games/capricieuse.py index c0354522..f45a325b 100644 --- a/pysollib/games/capricieuse.py +++ b/pysollib/games/capricieuse.py @@ -237,7 +237,8 @@ class Choice(Game): # register the game registerGame(GameInfo(292, Capricieuse, "Capricieuse", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 2, - GI.SL_MOSTLY_SKILL)) + GI.SL_MOSTLY_SKILL, + altnames=('Capricious',))) registerGame(GameInfo(293, Nationale, "Nationale", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL, diff --git a/pysollib/games/grandduchess.py b/pysollib/games/grandduchess.py index df6ae92f..17219990 100644 --- a/pysollib/games/grandduchess.py +++ b/pysollib/games/grandduchess.py @@ -154,7 +154,8 @@ class GrandDuchessPlus(GrandDuchess): registerGame(GameInfo(557, GrandDuchess, "Grand Duchess", - GI.GT_2DECK_TYPE, 2, 3)) + GI.GT_2DECK_TYPE, 2, 3, + altnames=('Duchess de Luynes'))) registerGame(GameInfo(617, Parisienne, "Parisienne", GI.GT_2DECK_TYPE, 2, 3, rules_filename='grandduchess.html', diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index a9d32da6..86cffe9c 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -442,5 +442,6 @@ registerGame(GameInfo(689, Brush, "Brush", GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(822, DoubleTrigon, "Double Trigon", GI.GT_KLONDIKE, 2, -1, GI.SL_BALANCED)) -registerGame(GameInfo(828, Churchill, "Churchill Solitaire", - GI.GT_GYPSY, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(828, Churchill, "Churchill", + GI.GT_GYPSY, 2, 0, GI.SL_BALANCED, + altnames=('Prime Minister'))) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 00999e8c..836fdb28 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -1392,7 +1392,8 @@ class EightSages(Klondike): # register the game registerGame(GameInfo(2, Klondike, "Klondike", - GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) + GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED, + altnames=("Classic Solitaire", "American Patience"))) registerGame(GameInfo(61, CasinoKlondike, "Casino Klondike", GI.GT_KLONDIKE | GI.GT_SCORE, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(129, VegasKlondike, "Vegas Klondike", diff --git a/pysollib/games/larasgame.py b/pysollib/games/larasgame.py index dd3fb6d6..488965db 100644 --- a/pysollib/games/larasgame.py +++ b/pysollib/games/larasgame.py @@ -448,7 +448,7 @@ class DoubleLarasGame(RelaxedLarasGame): registerGame(GameInfo(37, LarasGame, "Lara's Game", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, - altnames=("Thirteen Packs",))) + altnames=("Thirteen Packs", "Leoni's Own", "Weavers"))) registerGame(GameInfo(13006, RelaxedLarasGame, "Lara's Game Relaxed", GI.GT_2DECK_TYPE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(13007, DoubleLarasGame, "Lara's Game Doubled", diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 8efe135c..822d0b64 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -1357,7 +1357,8 @@ class TwilightZone(Game): # register the game registerGame(GameInfo(54, RoyalCotillion, "Royal Cotillion", - GI.GT_2DECK_TYPE, 2, 0, GI.SL_LUCK)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_LUCK, + altnames=("Lords and Ladies",))) registerGame(GameInfo(55, OddAndEven, "Odd and Even", GI.GT_2DECK_TYPE, 2, 1, GI.SL_LUCK)) registerGame(GameInfo(143, Kingdom, "Kingdom", diff --git a/pysollib/games/special/hanoi.py b/pysollib/games/special/hanoi.py index 44efdb4b..d1b7bfd0 100644 --- a/pysollib/games/special/hanoi.py +++ b/pysollib/games/special/hanoi.py @@ -163,7 +163,8 @@ class HanoiSequence(TowerOfHanoy): # register the game registerGame(GameInfo(124, TowerOfHanoy, "Tower of Hanoy", GI.GT_HANOI | GI.GT_OPEN, 1, 0, GI.SL_SKILL, - suits=(2,), ranks=list(range(9)))) + suits=(2,), ranks=list(range(9)), + altnames=("Tower of Hanoi"))) registerGame(GameInfo(207, HanoiPuzzle4, "Hanoi Puzzle 4", GI.GT_HANOI | GI.GT_OPEN, 1, 0, GI.SL_SKILL, suits=(2,), ranks=list(range(4)), diff --git a/pysollib/games/special/memory.py b/pysollib/games/special/memory.py index 8f5af7a8..094278c5 100644 --- a/pysollib/games/special/memory.py +++ b/pysollib/games/special/memory.py @@ -389,7 +389,8 @@ registerGame(GameInfo(177, Memory40, "Memory 40", GI.GT_MEMORY | GI.GT_SCORE, 2, 0, GI.SL_SKILL, suits=(0, 2), ranks=(0, 4, 5, 6, 7, 8, 9, 10, 11, 12))) registerGame(GameInfo(178, Concentration, "Concentration", - GI.GT_MEMORY | GI.GT_SCORE, 1, 0, GI.SL_SKILL)) + GI.GT_MEMORY | GI.GT_SCORE, 1, 0, GI.SL_SKILL, + altnames=("Pelmanism"))) registerGame(GameInfo(843, MemorySequence, "Memory Sequence", GI.GT_MEMORY | GI.GT_SCORE, 1, 0, GI.SL_SKILL, suits=(1,), altnames=('Ace Through King',))) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 7586dc21..5f521d37 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -1386,7 +1386,8 @@ class CatherineTheGreat(Game): # register the game registerGame(GameInfo(330, Sultan, "Sultan", GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK, - altnames=("Sultan of Turkey",))) + altnames=("Sultan of Turkey", + "Emperor of Germany"))) registerGame(GameInfo(331, SultanPlus, "Sultan +", GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(354, Boudoir, "Boudoir",