From 99ae5c39bb8ca7de68f2b74caa21fbcbe2945d00 Mon Sep 17 00:00:00 2001 From: Joe R Date: Thu, 11 Aug 2022 19:33:10 -0400 Subject: [PATCH] Added/fixed variable redeals category in the game selection tree. --- pysollib/kivy/selectgame.py | 2 +- pysollib/pysolgtk/selectgame.py | 4 ++-- pysollib/tile/selectgame.py | 4 +++- pysollib/tk/selectgame.py | 4 +++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pysollib/kivy/selectgame.py b/pysollib/kivy/selectgame.py index 743d52b1..82fcc0a4 100644 --- a/pysollib/kivy/selectgame.py +++ b/pysollib/kivy/selectgame.py @@ -255,7 +255,7 @@ class SelectGameData(SelectDialogTreeData): lambda gi: gi.si.redeals == -2), SelectGameNode(None, _("Other number of redeals"), lambda gi: gi.si.redeals not in - (-1, 0, 1, 2, 3)), + (-2, -1, 0, 1, 2, 3)), )), s_by_compatibility, )), diff --git a/pysollib/pysolgtk/selectgame.py b/pysollib/pysolgtk/selectgame.py index a2b3159e..afce1222 100644 --- a/pysollib/pysolgtk/selectgame.py +++ b/pysollib/pysolgtk/selectgame.py @@ -271,9 +271,9 @@ class SelectGameDialogWithPreview(MfxDialog): (_("2 redeals"), lambda gi: gi.si.redeals == 2), (_("3 redeals"), lambda gi: gi.si.redeals == 3), (_("Unlimited redeals"), lambda gi: gi.si.redeals == -1), - # (_("Variable redeals"), lambda gi: gi.si.redeals == -2), + (_("Variable redeals"), lambda gi: gi.si.redeals == -2), (_("Other number of redeals"), - lambda gi: gi.si.redeals not in (-1, 0, 1, 2, 3)),) + lambda gi: gi.si.redeals not in (-2, -1, 0, 1, 2, 3)),) self._addGamesFromData(data, store, root_iter, _("by Number of Redeals"), all_games) diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py index fb86206c..dce9ed2f 100644 --- a/pysollib/tile/selectgame.py +++ b/pysollib/tile/selectgame.py @@ -231,9 +231,11 @@ class SelectGameData(SelectDialogTreeData): lambda gi: gi.si.redeals == 3), SelectGameNode(None, _("Unlimited redeals"), lambda gi: gi.si.redeals == -1), + SelectGameNode(None, _("Variable redeals"), + lambda gi: gi.si.redeals == -2), SelectGameNode( None, _("Other number of redeals"), - lambda gi: gi.si.redeals not in (-1, 0, 1, 2, 3)), + lambda gi: gi.si.redeals not in (-2, -1, 0, 1, 2, 3)), )), s_by_compatibility, )), diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index 0b11fe3b..c4085c32 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -230,9 +230,11 @@ class SelectGameData(SelectDialogTreeData): lambda gi: gi.si.redeals == 3), SelectGameNode(None, _("Unlimited redeals"), lambda gi: gi.si.redeals == -1), + SelectGameNode(None, _("Variable redeals"), + lambda gi: gi.si.redeals == -2), SelectGameNode( None, _("Other number of redeals"), - lambda gi: gi.si.redeals not in (-1, 0, 1, 2, 3)), + lambda gi: gi.si.redeals not in (-2, -1, 0, 1, 2, 3)), )), s_by_compatibility, )),