diff --git a/html-src/rules/wildflower.html b/html-src/rules/wildflower.html new file mode 100644 index 00000000..6cbeef6f --- /dev/null +++ b/html-src/rules/wildflower.html @@ -0,0 +1,12 @@ +
+Raglan type. 1 deck. No redeal. + +
+Move all cards to the foundations. + +
+Like Flower Garden, but sequences +of cards of the same suit can be moved as a unit. diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index 92c88ae3..48e9e87a 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -545,7 +545,7 @@ class GI: tuple(range(22217, 22219))), ('fc-2.14', tuple(range(811, 827))), ('fc-2.15', tuple(range(827, 855)) + tuple(range(22400, 22407))), - ('dev', tuple(range(855, 861))) + ('dev', tuple(range(855, 862))) ) # deprecated - the correct way is to or a GI.GT_XXX flag diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index f6db4448..996d935d 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -48,6 +48,7 @@ from pysollib.stack import \ SC_RowStack, \ SS_FoundationStack, \ SS_RowStack, \ + Spider_SS_RowStack, \ Stack, \ StackWrapper, \ SuperMoveAC_RowStack, \ @@ -526,6 +527,7 @@ class OpenJumbo(Jumbo): # ************************************************************************ # * Stonewall # * Flower Garden +# * Wildflower # ************************************************************************ class Stonewall(Klondike): @@ -565,6 +567,10 @@ class FlowerGarden(Stonewall): shallHighlightMatch = Game._shallHighlightMatch_RK +class Wildflower(FlowerGarden): + RowStack_Class = Spider_SS_RowStack + + # ************************************************************************ # * King Albert # * Raglan @@ -1513,7 +1519,7 @@ registerGame(GameInfo(221, Stonewall, "Stonewall", GI.GT_RAGLAN, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(222, FlowerGarden, "Flower Garden", GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, - altnames=("The Bouquet", "The Garden",))) + altnames=("The Bouquet", "The Garden", "Le Parterre"))) registerGame(GameInfo(233, KingAlbert, "King Albert", GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, altnames=("Idiot's Delight",))) @@ -1623,3 +1629,5 @@ registerGame(GameInfo(852, Guardian, "Guardian", registerGame(GameInfo(855, HalfKlondike, "Half Klondike", GI.GT_KLONDIKE | GI.GT_STRIPPED, 1, -1, GI.SL_BALANCED, suits=(1, 2))) +registerGame(GameInfo(861, Wildflower, "Wildflower", + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL))