From 3464052a5c32547a7e09d493962e70eebae2e0fb Mon Sep 17 00:00:00 2001 From: Joe R Date: Thu, 11 Aug 2022 17:10:55 -0400 Subject: [PATCH] Organization updates for Ocean Towers/Double Seahaven Towers. --- html-src/rules/doubleseahaventowers.html | 13 +++++++++++++ pysollib/gamedb.py | 24 ++++++++++++------------ pysollib/games/freecell.py | 6 +++--- 3 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 html-src/rules/doubleseahaventowers.html diff --git a/html-src/rules/doubleseahaventowers.html b/html-src/rules/doubleseahaventowers.html new file mode 100644 index 00000000..0d36a2c9 --- /dev/null +++ b/html-src/rules/doubleseahaventowers.html @@ -0,0 +1,13 @@ +

Double Seahaven Towers

+

+FreeCell type. 2 decks. No redeal. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Like Seahaven Towers, +but with two decks, fourteen piles, and eight free cells +(six of which start occupied). diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index e9c2e24a..bf6b62e6 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -392,16 +392,16 @@ class GI: # Desert Fox, Deuces and Queens, Double Antares, # Double Antarctica, Double Arctica, Double Baker's Spider, # Double Cascade, Double Fourteens, Double Line 8, - # Double Majesty, Double Sea Towers, Double Spidercells, - # Doublet Cell 5, Doubt, Dream Fan, Dumfries Cell, - # Falcon Wing, Fan Nine, Fanny 6, Four By Ten, FreeCell AK, - # Gaps Alter, Gaps Diff, George V, Grandmother's Clock, - # In a Frame, Inverted FreeCell, Kings, Klondike FreeCell, - # La Cabane, La Double Entente, Little Gazette, Magic FreeCell, - # Mini Gaps, Montreal, Napoleon at Iena, Napoleon at Waterloo, - # Napoleon's Guards, Nationale, Oasis, Opera, Ordered Suits, - # Osmotic FreeCell, Pair FreeCell, Pairs 2, Petal, - # Reserved Thirteens, Sea Spider, Sept Piles 0, Short Solitaire, + # Double Majesty, Double Spidercells, Doublet Cell 5, Doubt, + # Dream Fan, Dumfries Cell, Falcon Wing, Fan Nine, Fanny 6, + # Four By Ten, FreeCell AK, Gaps Alter, Gaps Diff, George V, + # Grandmother's Clock, In a Frame, Inverted FreeCell, Kings, + # Klondike FreeCell, La Cabane, La Double Entente, + # Little Gazette, Magic FreeCell, Mini Gaps, Montreal, + # Napoleon at Iena, Napoleon at Waterloo, Napoleon's Guards, + # Nationale, Oasis, Opera, Ordered Suits, Osmotic FreeCell, + # Pair FreeCell, Pairs 2, Petal, Reserved Thirteens, + # Sea Spider, Sept Piles 0, Short Solitaire, # Simple Alternations, Smart Osmosis, Step By Step, Strategy 7, # Stripped FreeCell, Tarantula, Triple Dispute, Trusty Twenty, # Two Ways 3, Up Or Down, Versailles, Vertical FreeCell, @@ -414,8 +414,8 @@ class GI: 303, 309, 314, 318, 320, 322, 324, 325, 336, 338, 341, 363, 364, 372, 376, 383, 384, 385, 386, 390, 391, 393, 398, 405, 415, 416, 425, 451, 453, 461, 464, 466, 467, 476, 480, 484, - 511, 512, 516, 561, 610, 625, 629, 631, 638, 641, 647, 650, - 655, 678, 734, 751, 784, 825, 829, 834, 837, 844, 901, + 511, 512, 513, 516, 561, 610, 625, 629, 631, 638, 641, 647, + 650, 655, 678, 734, 751, 784, 825, 829, 834, 837, 844, 901, )), # xpat2 1.06 (we have 14 out of 16 games) diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index ba449dc3..eb2affc5 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -698,9 +698,9 @@ registerGame(GameInfo(464, FourColours, "Four Colours", registerGame(GameInfo(509, BigCell, "Big Cell", GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(513, OceanTowers, "Ocean Towers", - GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, - GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(513, OceanTowers, "Double Seahaven Towers", + GI.GT_FREECELL | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL, + altnames=("Ocean Towers"))) registerGame(GameInfo(520, GermanFreeCell, "German FreeCell", GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(542, KingCell, "KingCell",