From 81150b4681fa331545a7d6251e2bc2a52f843e01 Mon Sep 17 00:00:00 2001 From: Joe R Date: Wed, 26 Feb 2025 19:55:01 -0500 Subject: [PATCH] Add Relaxed Cruel game --- html-src/rules/relaxedcruel.html | 12 ++++++++++++ pysollib/gamedb.py | 2 +- pysollib/games/bakersdozen.py | 8 ++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 html-src/rules/relaxedcruel.html diff --git a/html-src/rules/relaxedcruel.html b/html-src/rules/relaxedcruel.html new file mode 100644 index 0000000000..1df20a683d --- /dev/null +++ b/html-src/rules/relaxedcruel.html @@ -0,0 +1,12 @@ +

Relaxed Cruel

+

+Baker's Dozen type. 1 deck. Unlimited redeals. + +

Object

+

+Move all cards to the foundations. + +

Quick Description

+

+Just like Cruel, +but the number of cards you can move as a sequence is not restricted. diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index b46a08fc0c..f76b109290 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -594,7 +594,7 @@ def _callback(gi, gt=game_type): tuple(range(19000, 19012)) + tuple(range(22303, 22311)) + tuple(range(22353, 22361))), ('fc-3.1', tuple(range(961, 971))), - ('dev', tuple(range(971, 977)) + tuple(range(18005, 18007)) + + ('dev', tuple(range(971, 978)) + tuple(range(18005, 18007)) + (44, 526,)), ) diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py index 6d47382783..e0e230ef99 100644 --- a/pysollib/games/bakersdozen.py +++ b/pysollib/games/bakersdozen.py @@ -225,6 +225,7 @@ def startGame(self): # ************************************************************************ # * Cruel +# * Relaxed Cruel # * Unusual # ************************************************************************ @@ -310,6 +311,10 @@ def startGame(self): shallHighlightMatch = Game._shallHighlightMatch_SS +class RelaxedCruel(Cruel): + RowStack_Class = StackWrapper(SS_RowStack, base_rank=NO_RANK) + + class Unusual(Cruel): def createGame(self): @@ -453,3 +458,6 @@ def startGame(self): GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(907, Martha, "Stewart", GI.GT_BAKERS_DOZEN, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(977, RelaxedCruel, "Relaxed Cruel", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN | GI.GT_RELAXED, 1, -1, + GI.SL_BALANCED))