anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Order imports based on flake8-import-order.

Browse source 
Tested on ci. See https://github.com/PyCQA/flake8-import-order . In the
process did some other cleanups and
https://en.wikipedia.org/wiki/Code_refactoring .
This commit is contained in:
Shlomi Fish 2019-01-11 18:43:29 +02:00
parent 8f8e1304f8
commit ed18fd8156
210 changed files with 1238 additions and 1952 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.appveyor.yml
View file

@ -8,13 +8,14 @@ install:
- choco install strawberryperl - choco install strawberryperl
- copy %PYTHON%\python.exe %PYTHON%\python3.exe - copy %PYTHON%\python.exe %PYTHON%\python3.exe
- SET PATH=%PYTHON%;C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH% - SET PATH=%PYTHON%;C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%
- python3 -mpip install Pillow
- python3 -mpip install flake8 - python3 -mpip install flake8
- python3 -mpip install random2 - python3 -mpip install flake8-import-order
- python3 -mpip install py2exe - python3 -mpip install py2exe
- python3 -mpip install pycotap - python3 -mpip install pycotap
- python3 -mpip install six
- python3 -mpip install Pillow
- python3 -mpip install pygame - python3 -mpip install pygame
- python3 -mpip install random2
- python3 -mpip install six
- perl -v - perl -v
- copy C:\msys64\mingw64\bin\mingw32-make.exe C:\msys64\mingw64\bin\make.exe - copy C:\msys64\mingw64\bin\mingw32-make.exe C:\msys64\mingw64\bin\make.exe
- SET PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH% - SET PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%

2
.travis.yml
View file

@ -24,7 +24,7 @@ before_install:
install: install:
- sudo cpanm Code::TidyAll::Plugin::Flake8 Perl::Tidy Test::Code::TidyAll Test::Differences Test::TrailingSpace - sudo cpanm Code::TidyAll::Plugin::Flake8 Perl::Tidy Test::Code::TidyAll Test::Differences Test::TrailingSpace
- export PY_MODS='pycotap random2 six' - export PY_MODS='pycotap random2 six'
- "`which python3` -m pip install --upgrade flake8 $PY_MODS" - "`which python3` -m pip install --upgrade flake8 flake8-import-order $PY_MODS"
- "sudo /usr/bin/python3 -m pip install --upgrade $PY_MODS || true" - "sudo /usr/bin/python3 -m pip install --upgrade $PY_MODS || true"
- "sudo `which python2` -m pip install --upgrade $PY_MODS" - "sudo `which python2` -m pip install --upgrade $PY_MODS"
- which python - which python

13
android/initsdk.py
View file

@ -1,15 +1,18 @@
#! /usr/bin/env python3 #! /usr/bin/env python3
# -*- coding: iso-8859-1 -*- # -*- coding: iso-8859-1 -*-
import sys
import os
import requests
import logging
import hashlib
import glob import glob
import hashlib
import logging
import os
import sys
from zipfile import ZipFile, ZipInfo from zipfile import ZipFile, ZipInfo
from clint.textui import progress from clint.textui import progress
import requests
cachefiles = [ cachefiles = [
('https://dl.google.com/android/repository/platform-tools-latest-linux.zip', ('https://dl.google.com/android/repository/platform-tools-latest-linux.zip',
'', '',

1
data/themes/clearlooks/create_imgs.py
View file

@ -2,6 +2,7 @@
# -*- mode: python; coding: koi8-r; -*- # -*- mode: python; coding: koi8-r; -*-
import os import os
import gtk import gtk
imdir = 'images' imdir = 'images'

10
html-src/gen-html.py
View file

@ -1,13 +1,13 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import sys
import os
import builtins import builtins
from pysollib.mygettext import fix_gettext import os
import sys
from pysollib.gamedb import GAME_DB from pysollib.gamedb import GAME_DB
from pysollib.gamedb import GI from pysollib.gamedb import GI
from pysollib.mfxutil import latin1_normalize from pysollib.mfxutil import latin1_normalize
from pysollib.mygettext import fix_gettext
# outdir = '../html' # outdir = '../html'
pysollib_dir = '../' pysollib_dir = '../'
@ -15,10 +15,10 @@ pysollib_dir = '../'
builtins._ = lambda x: x builtins._ = lambda x: x
builtins.n_ = lambda x: x builtins.n_ = lambda x: x
import pysollib.games # noqa: F402 import pysollib.games # noqa: F402,I100,I202
import pysollib.games.mahjongg # noqa: F402 import pysollib.games.mahjongg # noqa: F402
import pysollib.games.ultra # noqa: F402
import pysollib.games.special # noqa: F401,F402 import pysollib.games.special # noqa: F401,F402
import pysollib.games.ultra # noqa: F401,F402
try: try:
os.mkdir('html') os.mkdir('html')

3
pysol.py
View file

@ -33,8 +33,7 @@ init()
# HAS TO BE after call to init(). # HAS TO BE after call to init().
# See docs/README.SOURCE. # See docs/README.SOURCE.
# Flake8 test would complain here E402, so disabled # Flake8 test would complain here E402, so disabled
from pysollib.main import main # noqa: E402,I202
from pysollib.main import main # noqa: E402
# Execute it. # Execute it.
# import profile # import profile

45
pysollib/actions.py
View file

@ -21,41 +21,34 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
import os
import locale import locale
import os
# PySol imports from pysollib.gamedb import GI
from pysollib.help import help_about, help_html
from pysollib.mfxutil import Struct, openURL from pysollib.mfxutil import Struct, openURL
from pysollib.mfxutil import print_err from pysollib.mfxutil import print_err
from pysollib.pysolrandom import constructRandom
from pysollib.settings import TITLE, PACKAGE_URL
from pysollib.settings import TOP_TITLE
from pysollib.settings import DEBUG
from pysollib.gamedb import GI
# stats imports
from pysollib.stats import FileStatsFormatter
from pysollib.pysoltk import SingleGame_StatsDialog, AllGames_StatsDialog
from pysollib.pysoltk import FullLog_StatsDialog, SessionLog_StatsDialog
from pysollib.pysoltk import Status_StatsDialog, Top_StatsDialog
from pysollib.pysoltk import ProgressionDialog
from pysollib.pysoltk import GameInfoDialog
# toolkit imports
from pysollib.mygettext import _ from pysollib.mygettext import _
from pysollib.pysoltk import MfxMessageDialog, MfxSimpleEntry from pysollib.pysolrandom import constructRandom
from pysollib.pysoltk import MfxExceptionDialog from pysollib.pysoltk import AllGames_StatsDialog, SingleGame_StatsDialog
from pysollib.pysoltk import PlayerOptionsDialog
from pysollib.pysoltk import TimeoutsDialog
from pysollib.pysoltk import ColorsDialog from pysollib.pysoltk import ColorsDialog
from pysollib.pysoltk import FontsDialog
from pysollib.pysoltk import EditTextDialog from pysollib.pysoltk import EditTextDialog
from pysollib.pysoltk import FontsDialog
from pysollib.pysoltk import FullLog_StatsDialog, SessionLog_StatsDialog
from pysollib.pysoltk import GameInfoDialog
from pysollib.pysoltk import MfxExceptionDialog
from pysollib.pysoltk import MfxMessageDialog, MfxSimpleEntry
from pysollib.pysoltk import PlayerOptionsDialog
from pysollib.pysoltk import ProgressionDialog
from pysollib.pysoltk import PysolMenubarTk, PysolToolbarTk
from pysollib.pysoltk import Status_StatsDialog, Top_StatsDialog
from pysollib.pysoltk import TimeoutsDialog
from pysollib.pysoltk import create_find_card_dialog from pysollib.pysoltk import create_find_card_dialog
from pysollib.pysoltk import create_solver_dialog from pysollib.pysoltk import create_solver_dialog
from pysollib.pysoltk import PysolMenubarTk, PysolToolbarTk from pysollib.settings import DEBUG
from pysollib.help import help_about, help_html from pysollib.settings import PACKAGE_URL, TITLE
from pysollib.settings import TOP_TITLE
from pysollib.stats import FileStatsFormatter
# ************************************************************************ # ************************************************************************

47
pysollib/app.py
View file

@ -28,37 +28,34 @@ import re
import traceback import traceback
from pickle import UnpicklingError from pickle import UnpicklingError
# PySol imports from pysollib.gamedb import GAME_DB, GI, loadGame
from pysollib.mfxutil import destruct, Struct
from pysollib.mfxutil import pickle, unpickle
from pysollib.mfxutil import getusername, getprefdir
from pysollib.mfxutil import latin1_normalize, print_err
from pysollib.mfxutil import USE_PIL
from pysollib.util import CARDSET, IMAGE_EXTENSIONS
from pysollib.settings import PACKAGE, VERSION_TUPLE, WIN_SYSTEM
from pysollib.resource import CSI, CardsetConfig, Cardset, CardsetManager
from pysollib.resource import Tile, TileManager
from pysollib.resource import Sample, SampleManager
from pysollib.resource import Music, MusicManager
from pysollib.images import Images, SubsampledImages from pysollib.images import Images, SubsampledImages
from pysollib.pysolrandom import PysolRandom from pysollib.mfxutil import Struct, destruct
from pysollib.gamedb import GI, GAME_DB, loadGame from pysollib.mfxutil import USE_PIL
from pysollib.options import Options from pysollib.mfxutil import getprefdir, getusername
from pysollib.settings import TOP_SIZE, TOOLKIT from pysollib.mfxutil import latin1_normalize, print_err
from pysollib.settings import DEBUG from pysollib.mfxutil import pickle, unpickle
from pysollib.winsystems import TkSettings
# Toolkit imports
from pysollib.mygettext import _ from pysollib.mygettext import _
from pysollib.pysoltk import wm_withdraw, loadImage from pysollib.options import Options
from pysollib.pysoltk import MfxDialog, MfxMessageDialog, MfxExceptionDialog from pysollib.pysolrandom import PysolRandom
from pysollib.pysoltk import TclError, MfxScrolledCanvas from pysollib.pysoltk import HTMLViewer
from pysollib.pysoltk import HelpStatusbar, PysolStatusbar
from pysollib.pysoltk import MfxDialog, MfxExceptionDialog, MfxMessageDialog
from pysollib.pysoltk import MfxScrolledCanvas, TclError
from pysollib.pysoltk import PysolProgressBar from pysollib.pysoltk import PysolProgressBar
from pysollib.pysoltk import PysolStatusbar, HelpStatusbar
from pysollib.pysoltk import SelectCardsetDialogWithPreview from pysollib.pysoltk import SelectCardsetDialogWithPreview
from pysollib.pysoltk import SelectDialogTreeData from pysollib.pysoltk import SelectDialogTreeData
from pysollib.pysoltk import HTMLViewer
from pysollib.pysoltk import destroy_find_card_dialog from pysollib.pysoltk import destroy_find_card_dialog
from pysollib.pysoltk import loadImage, wm_withdraw
from pysollib.resource import CSI, Cardset, CardsetConfig, CardsetManager
from pysollib.resource import Music, MusicManager
from pysollib.resource import Sample, SampleManager
from pysollib.resource import Tile, TileManager
from pysollib.settings import DEBUG
from pysollib.settings import PACKAGE, VERSION_TUPLE, WIN_SYSTEM
from pysollib.settings import TOOLKIT, TOP_SIZE
from pysollib.util import CARDSET, IMAGE_EXTENSIONS
from pysollib.winsystems import TkSettings
if TOOLKIT == 'tk': if TOOLKIT == 'tk':
from pysollib.ui.tktile.solverdialog import destroy_solver_dialog from pysollib.ui.tktile.solverdialog import destroy_solver_dialog
else: else:

9
pysollib/configobj/configobj.py
View file

@ -17,13 +17,14 @@
# Comments, suggestions and bug reports welcome. # Comments, suggestions and bug reports welcome.
import sys
import os import os
import re import re
import six import sys
from six import string_types
from warnings import warn from warnings import warn
import six
from six import string_types
INTP_VER = sys.version_info[:2] INTP_VER = sys.version_info[:2]
if INTP_VER < (2, 2): if INTP_VER < (2, 2):
raise RuntimeError("Python v.2.2 or later needed") raise RuntimeError("Python v.2.2 or later needed")

5
pysollib/configobj/validate.py
View file

@ -124,9 +124,10 @@
A badly formatted set of arguments will raise a ``VdtParamError``. A badly formatted set of arguments will raise a ``VdtParamError``.
""" """
import sys
import six
import re import re
import sys
import six
__docformat__ = "restructuredtext en" __docformat__ = "restructuredtext en"

33
pysollib/customgame.py
View file

@ -21,28 +21,28 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
import six from pysollib.game import Game
from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, \ from pysollib.hint import Yukon_Hint
KING, \ from pysollib.layout import Layout
UNLIMITED_MOVES from pysollib.stack import \
from pysollib.stack import Spider_AC_Foundation, \
AC_RowStack, \ AC_RowStack, \
BO_RowStack, \ BO_RowStack, \
DealReserveRedealTalonStack, \ DealReserveRedealTalonStack, \
DealRowRedealTalonStack, \ DealRowRedealTalonStack, \
RK_RowStack, \
GroundsForADivorceTalonStack, \ GroundsForADivorceTalonStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \ OpenStack, \
RK_RowStack, \
ReserveStack, \ ReserveStack, \
SC_RowStack, \
SS_RowStack, \
SpiderTalonStack, \
Spider_AC_Foundation, \
Spider_AC_RowStack, \ Spider_AC_RowStack, \
Spider_RK_Foundation, \ Spider_RK_Foundation, \
Spider_SS_Foundation, \ Spider_SS_Foundation, \
Spider_SS_RowStack, \ Spider_SS_RowStack, \
SpiderTalonStack, \
SC_RowStack, \
SS_RowStack, \
StackWrapper, \ StackWrapper, \
SuperMoveAC_RowStack, \ SuperMoveAC_RowStack, \
SuperMoveBO_RowStack, \ SuperMoveBO_RowStack, \
@ -56,14 +56,15 @@ from pysollib.stack import Spider_AC_Foundation, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack, \
Yukon_AC_RowStack, \ Yukon_AC_RowStack, \
Yukon_SS_RowStack, \ Yukon_RK_RowStack, \
Yukon_RK_RowStack Yukon_SS_RowStack
from pysollib.game import Game from pysollib.util import ACE, ANY_RANK, ANY_SUIT, \
from pysollib.layout import Layout KING, \
from pysollib.hint import Yukon_Hint UNLIMITED_MOVES
from pysollib.wizardutil import WizardWidgets from pysollib.wizardutil import WizardWidgets
import six
# ************************************************************************ # ************************************************************************
# * # *
# ************************************************************************ # ************************************************************************

42
pysollib/game.py
View file

@ -23,35 +23,35 @@
# imports # imports
import time
import math import math
import time
import traceback import traceback
import six
from pysollib.mygettext import _
from gettext import ungettext
from six import BytesIO
from six.moves import range
from pickle import Pickler, Unpickler, UnpicklingError from pickle import Pickler, Unpickler, UnpicklingError
# PySol imports from pysollib.gamedb import GI
from pysollib.mfxutil import Image, ImageTk, USE_PIL from pysollib.mfxutil import Image, ImageTk, USE_PIL
from pysollib.mfxutil import destruct, Struct, SubclassResponsibility from pysollib.mfxutil import Struct, SubclassResponsibility, destruct
from pysollib.mfxutil import uclock, usleep
from pysollib.mfxutil import format_time, print_err from pysollib.mfxutil import format_time, print_err
from pysollib.mfxutil import uclock, usleep
from pysollib.mygettext import _
from pysollib.mygettext import ungettext
from pysollib.pysolrandom import LCRandom31, PysolRandom, constructRandom, \
random__long2str, random__str2long
from pysollib.pysoltk import CURSOR_WATCH
from pysollib.pysoltk import Card
from pysollib.pysoltk import EVENT_HANDLED, EVENT_PROPAGATE
from pysollib.pysoltk import MfxCanvasLine, MfxCanvasRectangle, MfxCanvasText
from pysollib.pysoltk import MfxExceptionDialog, MfxMessageDialog
from pysollib.pysoltk import after, after_cancel, after_idle
from pysollib.pysoltk import bind, wm_map
from pysollib.settings import DEBUG
from pysollib.settings import PACKAGE, TITLE, TOOLKIT, TOP_TITLE from pysollib.settings import PACKAGE, TITLE, TOOLKIT, TOP_TITLE
from pysollib.settings import VERSION, VERSION_TUPLE from pysollib.settings import VERSION, VERSION_TUPLE
from pysollib.settings import DEBUG
from pysollib.gamedb import GI import six
from pysollib.pysolrandom import PysolRandom, LCRandom31, constructRandom, \ from six import BytesIO
random__long2str, random__str2long from six.moves import range
from pysollib.pysoltk import EVENT_HANDLED, EVENT_PROPAGATE
from pysollib.pysoltk import CURSOR_WATCH
from pysollib.pysoltk import bind, wm_map
from pysollib.pysoltk import after, after_idle, after_cancel
from pysollib.pysoltk import MfxMessageDialog, MfxExceptionDialog
from pysollib.pysoltk import MfxCanvasText, MfxCanvasLine, MfxCanvasRectangle
from pysollib.pysoltk import Card
if TOOLKIT == 'tk': if TOOLKIT == 'tk':
from pysollib.ui.tktile.solverdialog import reset_solver_dialog from pysollib.ui.tktile.solverdialog import reset_solver_dialog
else: else:

10
pysollib/gamedb.py
View file

@ -22,16 +22,14 @@
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
import six
import imp import imp
# PySol imports
from pysollib.mfxutil import Struct, print_err
from pysollib.resource import CSI
import pysollib.settings import pysollib.settings
from pysollib.mfxutil import Struct, print_err
from pysollib.mygettext import _, n_ from pysollib.mygettext import _, n_
from pysollib.resource import CSI
import six
# ************************************************************************ # ************************************************************************
# * constants # * constants

27
pysollib/games/acesup.py
View file

@ -20,30 +20,25 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
from pysollib.game import Game
# imports from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.montecarlo import MonteCarlo_RowStack
# PySol imports from pysollib.layout import Layout
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, NO_RANK, \
UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
BasicRowStack, \ BasicRowStack, \
DealRowTalonStack, \ DealRowTalonStack, \
isRankSequence, \
OpenStack, \ OpenStack, \
ReserveStack, \
RK_RowStack, \ RK_RowStack, \
TalonStack, \ ReserveStack, \
Spider_RK_Foundation, \ Spider_RK_Foundation, \
Stack, \ Stack, \
StackWrapper StackWrapper, \
from pysollib.game import Game TalonStack, \
from pysollib.layout import Layout isRankSequence
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, NO_RANK, \
from pysollib.games.montecarlo import MonteCarlo_RowStack UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
# ************************************************************************ # ************************************************************************

19
pysollib/games/algerian.py
View file

@ -21,27 +21,24 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
# PySol imports from pysollib.hint import CautiousDefaultHint
from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.layout import Layout
from pysollib.util import ACE, KING
from pysollib.stack import \ from pysollib.stack import \
DealRowTalonStack, \ DealRowTalonStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
UD_SS_RowStack, \ StackWrapper, \
StackWrapper UD_SS_RowStack
from pysollib.game import Game from pysollib.util import ACE, KING
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
# ************************************************************************ # ************************************************************************
# * Carthage # * Carthage
# ************************************************************************ # ************************************************************************
class Carthage_Talon(DealRowTalonStack): class Carthage_Talon(DealRowTalonStack):
def dealCards(self, sound=False): def dealCards(self, sound=False):
if sound: if sound:

17
pysollib/games/auldlangsyne.py
View file

@ -21,31 +21,26 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
# PySol imports from pysollib.games.numerica import Numerica_Hint
from pysollib.layout import Layout
from pysollib.mygettext import _ from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, QUEEN
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
BasicRowStack, \ BasicRowStack, \
DealRowTalonStack, \ DealRowTalonStack, \
OpenStack, \ OpenStack, \
OpenTalonStack, \ OpenTalonStack, \
RK_FoundationStack, \
RedealTalonStack, \ RedealTalonStack, \
ReserveStack, \ ReserveStack, \
RK_FoundationStack, \
SS_FoundationStack, \ SS_FoundationStack, \
Stack, \ Stack, \
StackWrapper, \ StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, QUEEN
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.games.numerica import Numerica_Hint
# ************************************************************************ # ************************************************************************

23
pysollib/games/bakersdozen.py
View file

@ -21,12 +21,12 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
# PySol imports from pysollib.hint import CautiousDefaultHint
from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.hint import FreeCellSolverWrapper
from pysollib.util import ACE, KING, NO_RANK, UNLIMITED_ACCEPTS, \ from pysollib.layout import Layout
UNLIMITED_MOVES from pysollib.mfxutil import kwdefault
from pysollib.stack import \ from pysollib.stack import \
AC_FoundationStack, \ AC_FoundationStack, \
AC_RowStack, \ AC_RowStack, \
@ -34,16 +34,13 @@ from pysollib.stack import \
RK_RowStack, \ RK_RowStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
StackWrapper, \
SuperMoveAC_RowStack, \ SuperMoveAC_RowStack, \
TalonStack, \ TalonStack, \
UD_AC_RowStack, \ UD_AC_RowStack, \
UD_SS_RowStack, \ UD_SS_RowStack
StackWrapper from pysollib.util import ACE, KING, NO_RANK, UNLIMITED_ACCEPTS, \
from pysollib.mfxutil import kwdefault UNLIMITED_MOVES
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.hint import FreeCellSolverWrapper
# ************************************************************************ # ************************************************************************

20
pysollib/games/bakersgame.py
View file

@ -21,12 +21,12 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.util import KING from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.freecell import FreeCell
from pysollib.hint import DefaultHint
from pysollib.hint import FreeCellSolverWrapper, FreeCellType_Hint
from pysollib.layout import Layout
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
FreeCell_SS_RowStack, \ FreeCell_SS_RowStack, \
@ -36,13 +36,9 @@ from pysollib.stack import \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
SuperMoveSS_RowStack, \ StackWrapper, \
StackWrapper SuperMoveSS_RowStack
from pysollib.layout import Layout from pysollib.util import KING
from pysollib.hint import DefaultHint
from pysollib.hint import FreeCellType_Hint, FreeCellSolverWrapper
from pysollib.games.freecell import FreeCell
# ************************************************************************ # ************************************************************************
# * Baker's Game # * Baker's Game

31
pysollib/games/beleagueredcastle.py
View file

@ -21,39 +21,32 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
# PySol imports from pysollib.hint import CautiousDefaultHint, FreeCellType_Hint
from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.hint import FreeCellSolverWrapper
from pysollib.util import ACE, ANY_RANK, NO_RANK, KING, QUEEN, RANKS from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \ OpenStack, \
ReserveStack, \
RK_FoundationStack, \ RK_FoundationStack, \
RK_RowStack, \ RK_RowStack, \
Spider_SS_RowStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
Spider_SS_RowStack, \
StackWrapper, \
SuperMoveRK_RowStack, \ SuperMoveRK_RowStack, \
TalonStack, \ TalonStack, \
UD_AC_RowStack, \ UD_AC_RowStack, \
UD_RK_RowStack, \ UD_RK_RowStack, \
UD_SS_RowStack, \ UD_SS_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
StackWrapper from pysollib.util import ACE, ANY_RANK, KING, NO_RANK, QUEEN, RANKS
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint, FreeCellType_Hint
from pysollib.hint import FreeCellSolverWrapper
from pysollib.pysoltk import MfxCanvasText
# ************************************************************************
# *
# ************************************************************************
class BeleagueredCastleType_Hint(CautiousDefaultHint): class BeleagueredCastleType_Hint(CautiousDefaultHint):
# FIXME: demo is not too clever in this game # FIXME: demo is not too clever in this game
pass pass

19
pysollib/games/bisley.py
View file

@ -21,27 +21,24 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
# PySol imports from pysollib.hint import CautiousDefaultHint
from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.layout import Layout
from pysollib.util import ACE, NO_RANK, KING, RANKS, UNLIMITED_REDEALS from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
BasicRowStack, \ BasicRowStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
StackWrapper, \
UD_AC_RowStack, \ UD_AC_RowStack, \
UD_RK_RowStack, \ UD_RK_RowStack, \
UD_SS_RowStack, \ UD_SS_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
StackWrapper from pysollib.util import ACE, KING, NO_RANK, RANKS, UNLIMITED_REDEALS
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
# ************************************************************************ # ************************************************************************

26
pysollib/games/braid.py
View file

@ -21,13 +21,15 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
import math import math
# PySol imports from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _ from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ACE, NO_RANK, KING, RANKS, UNLIMITED_CARDS
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
BasicRowStack, \ BasicRowStack, \
@ -36,19 +38,11 @@ from pysollib.stack import \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
WasteStack, \
WasteTalonStack, \
Stack, \ Stack, \
StackWrapper StackWrapper, \
from pysollib.mfxutil import kwdefault WasteStack, \
from pysollib.game import Game WasteTalonStack
from pysollib.layout import Layout from pysollib.util import ACE, KING, NO_RANK, RANKS, UNLIMITED_CARDS
from pysollib.hint import DefaultHint, CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
# ************************************************************************
# *
# ************************************************************************
class Braid_Hint(DefaultHint): class Braid_Hint(DefaultHint):

25
pysollib/games/bristol.py
View file

@ -21,32 +21,25 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
# PySol imports from pysollib.hint import CautiousDefaultHint
from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.layout import Layout
from pysollib.util import ACE, ANY_RANK, NO_RANK, KING, RANKS, UNLIMITED_CARDS from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
KingAC_RowStack, \ KingAC_RowStack, \
OpenStack, \ OpenStack, \
OpenTalonStack, \ OpenTalonStack, \
ReserveStack, \
RK_FoundationStack, \ RK_FoundationStack, \
RK_RowStack, \ RK_RowStack, \
ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
StackWrapper, \
TalonStack, \ TalonStack, \
WasteStack, \ WasteStack
StackWrapper from pysollib.util import ACE, ANY_RANK, KING, NO_RANK, RANKS, UNLIMITED_CARDS
from pysollib.game import Game
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
# ************************************************************************
# *
# ************************************************************************
class Bristol_Hint(CautiousDefaultHint): class Bristol_Hint(CautiousDefaultHint):

15
pysollib/games/buffalobill.py
View file

@ -21,18 +21,15 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
# PySol imports from pysollib.layout import Layout
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import KING
from pysollib.stack import \ from pysollib.stack import \
BasicRowStack, \ BasicRowStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
SS_FoundationStack, \ ReserveStack, \
ReserveStack SS_FoundationStack
from pysollib.game import Game from pysollib.util import KING
from pysollib.layout import Layout
# ************************************************************************ # ************************************************************************
# * Buffalo Bill # * Buffalo Bill

19
pysollib/games/calculation.py
View file

@ -1,26 +1,19 @@
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import DefaultHint from pysollib.hint import DefaultHint
from pysollib.pysoltk import MfxCanvasText, get_text_width from pysollib.layout import Layout
from pysollib.mygettext import _ from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText, get_text_width
from pysollib.util import ANY_SUIT, KING, \
RANKS
from pysollib.stack import \ from pysollib.stack import \
BasicRowStack, \ BasicRowStack, \
DealRowTalonStack, \ DealRowTalonStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
RK_FoundationStack, \ RK_FoundationStack, \
Stack, \ Stack, \
StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
StackWrapper from pysollib.util import ANY_SUIT, KING, RANKS
# ************************************************************************
# *
# ************************************************************************
class Calculation_Hint(DefaultHint): class Calculation_Hint(DefaultHint):

27
pysollib/games/camelot.py
View file

@ -21,22 +21,13 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint, CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.numerica import Numerica_Hint from pysollib.games.numerica import Numerica_Hint
from pysollib.hint import AbstractHint, CautiousDefaultHint
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, \ from pysollib.layout import Layout
RANKS, QUEEN, \ from pysollib.mygettext import _
UNLIMITED_CARDS from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
BasicRowStack, \ BasicRowStack, \
@ -45,10 +36,12 @@ from pysollib.stack import \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
StackWrapper from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, \
QUEEN, RANKS, \
UNLIMITED_CARDS
# ************************************************************************ # ************************************************************************
# * Camelot # * Camelot
# ************************************************************************ # ************************************************************************

17
pysollib/games/canfield.py
View file

@ -1,12 +1,9 @@
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.mygettext import _ from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
from pysollib.util import KING, RANKS, QUEEN, UNLIMITED_REDEALS
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
KingAC_RowStack, \ KingAC_RowStack, \
@ -15,12 +12,10 @@ from pysollib.stack import \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
StackWrapper from pysollib.util import KING, QUEEN, RANKS, UNLIMITED_REDEALS
# ************************************************************************
# *
# ************************************************************************
class Canfield_Hint(CautiousDefaultHint): class Canfield_Hint(CautiousDefaultHint):

20
pysollib/games/capricieuse.py
View file

@ -21,26 +21,20 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.games.gypsy import DieRussische_Foundation from pysollib.games.gypsy import DieRussische_Foundation
from pysollib.hint import CautiousDefaultHint
from pysollib.util import ANY_SUIT, KING from pysollib.layout import Layout
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
RedealTalonStack, \
RK_FoundationStack, \ RK_FoundationStack, \
RedealTalonStack, \
SS_FoundationStack, \ SS_FoundationStack, \
UD_SS_RowStack, \ StackWrapper, \
StackWrapper UD_SS_RowStack
from pysollib.util import ANY_SUIT, KING
# ************************************************************************ # ************************************************************************

26
pysollib/games/curdsandwhey.py
View file

@ -21,36 +21,32 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
import pysollib.game import pysollib.game
from pysollib.layout import Layout from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint, CautiousDefaultHint from pysollib.hint import AbstractHint, CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, UNLIMITED_ACCEPTS, \ from pysollib.mfxutil import kwdefault
UNLIMITED_MOVES from pysollib.mygettext import _
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \
AC_RowStack, \ AC_RowStack, \
AbstractFoundationStack, \
BasicRowStack, \ BasicRowStack, \
DealRowTalonStack, \ DealRowTalonStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
isRankSequence, \
isSameSuitSequence, \
OpenStack, \ OpenStack, \
OpenTalonStack, \ OpenTalonStack, \
RK_RowStack, \ RK_RowStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
StackWrapper, \
TalonStack, \ TalonStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack, \
StackWrapper isRankSequence, \
isSameSuitSequence
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
# ************************************************************************ # ************************************************************************
# * Curds and Whey # * Curds and Whey

14
pysollib/games/daddylonglegs.py
View file

@ -1,21 +1,15 @@
# vim:ts=4:et:nowrap:fileencoding=utf-8 # vim:ts=4:et:nowrap:fileencoding=utf-8
# #
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.util import ACE
from pysollib.stack import \ from pysollib.stack import \
DealRowTalonStack, \ DealRowTalonStack, \
StackWrapper, \
Yukon_SS_RowStack, \ Yukon_SS_RowStack, \
isSameSuitSequence, \ isSameSuitSequence
StackWrapper from pysollib.util import ACE
# *********************************************************************** # ***********************************************************************
# Daddy Longlegs (by Jim Sizelove) # Daddy Longlegs (by Jim Sizelove)

9
pysollib/games/dieboesesieben.py
View file

@ -21,16 +21,11 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.gypsy import \ from pysollib.games.gypsy import \
DieKoenigsbergerin_Talon, DieRussische_Foundation DieKoenigsbergerin_Talon, DieRussische_Foundation
from pysollib.layout import Layout
from pysollib.stack import AC_RowStack from pysollib.stack import AC_RowStack
# ************************************************************************ # ************************************************************************

16
pysollib/games/diplomat.py
View file

@ -21,27 +21,21 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.fortythieves import FortyThieves_Hint from pysollib.games.fortythieves import FortyThieves_Hint
from pysollib.games.spider import Spider_Hint from pysollib.games.spider import Spider_Hint
from pysollib.layout import Layout
from pysollib.util import ACE, KING
from pysollib.stack import \ from pysollib.stack import \
RK_RowStack, \ RK_RowStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
Spider_SS_RowStack, \ Spider_SS_RowStack, \
StackWrapper, \
UD_SS_RowStack, \ UD_SS_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
StackWrapper from pysollib.util import ACE, KING
# ************************************************************************ # ************************************************************************
# * Diplomat # * Diplomat

11
pysollib/games/doublets.py
View file

@ -21,21 +21,16 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.util import ANY_SUIT, KING
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
ReserveStack, \ ReserveStack, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
from pysollib.util import ANY_SUIT, KING
# ************************************************************************ # ************************************************************************
# * Doublets # * Doublets

14
pysollib/games/eiffeltower.py
View file

@ -21,21 +21,15 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
import pysollib.game import pysollib.game
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout from pysollib.layout import Layout
# from pysollib.util import ACE
from pysollib.stack import \ from pysollib.stack import \
OpenStack, \ OpenStack, \
StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
StackWrapper
# ************************************************************************ # ************************************************************************
# * Eiffel Tower # * Eiffel Tower

21
pysollib/games/fan.py
View file

@ -21,19 +21,13 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.hint import FreeCellSolverWrapper from pysollib.hint import FreeCellSolverWrapper
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ACE, KING, NO_RANK, UNLIMITED_CARDS
from pysollib.stack import \ from pysollib.stack import \
AC_FoundationStack, \ AC_FoundationStack, \
AC_RowStack, \ AC_RowStack, \
@ -50,17 +44,14 @@ from pysollib.stack import \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
Stack, \ Stack, \
StackWrapper, \
SuperMoveSS_RowStack, \ SuperMoveSS_RowStack, \
TalonStack, \ TalonStack, \
UD_RK_RowStack, \ UD_RK_RowStack, \
UD_SS_RowStack, \ UD_SS_RowStack
StackWrapper from pysollib.util import ACE, KING, NO_RANK, UNLIMITED_CARDS
# ************************************************************************
# *
# ************************************************************************
class Fan_Hint(CautiousDefaultHint): class Fan_Hint(CautiousDefaultHint):
# FIXME: demo is not too clever in this game # FIXME: demo is not too clever in this game
pass pass

24
pysollib/games/fortythieves.py
View file

@ -21,19 +21,11 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import DefaultHint, CautiousDefaultHint
from pysollib.games.gypsy import DieRussische_Foundation from pysollib.games.gypsy import DieRussische_Foundation
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, \ from pysollib.layout import Layout
UNLIMITED_MOVES, UNLIMITED_REDEALS
from pysollib.stack import \ from pysollib.stack import \
AC_FoundationStack, \ AC_FoundationStack, \
AC_RowStack, \ AC_RowStack, \
@ -45,17 +37,15 @@ from pysollib.stack import \
SS_RowStack, \ SS_RowStack, \
Spider_SS_RowStack, \ Spider_SS_RowStack, \
Stack, \ Stack, \
StackWrapper, \
TalonStack, \ TalonStack, \
UD_AC_RowStack, \ UD_AC_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
StackWrapper from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, \
UNLIMITED_MOVES, UNLIMITED_REDEALS
# ************************************************************************
# *
# ************************************************************************
class FortyThieves_Hint(CautiousDefaultHint): class FortyThieves_Hint(CautiousDefaultHint):
# FIXME: demo is not too clever in this game # FIXME: demo is not too clever in this game
pass pass

22
pysollib/games/freecell.py
View file

@ -21,20 +21,13 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import DefaultHint
from pysollib.hint import FreeCellType_Hint, FreeCellSolverWrapper
from pysollib.games.spider import Spider_AC_Foundation from pysollib.games.spider import Spider_AC_Foundation
from pysollib.hint import DefaultHint
from pysollib.util import ACE, ANY_SUIT, KING, NO_RANK, UNLIMITED_CARDS from pysollib.hint import FreeCellSolverWrapper, FreeCellType_Hint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.stack import \ from pysollib.stack import \
AC_FoundationStack, \ AC_FoundationStack, \
AC_RowStack, \ AC_RowStack, \
@ -48,10 +41,11 @@ from pysollib.stack import \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
Stack, \ Stack, \
StackWrapper, \
SuperMoveAC_RowStack, \ SuperMoveAC_RowStack, \
SuperMoveRK_RowStack, \ SuperMoveRK_RowStack, \
isAlternateColorSequence, \ isAlternateColorSequence
StackWrapper from pysollib.util import ACE, ANY_SUIT, KING, NO_RANK, UNLIMITED_CARDS
# ************************************************************************ # ************************************************************************
# * FreeCell # * FreeCell

16
pysollib/games/glenwood.py
View file

@ -21,19 +21,12 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.canfield import Canfield_Hint from pysollib.games.canfield import Canfield_Hint
from pysollib.hint import CautiousDefaultHint
from pysollib.util import ANY_RANK, RANKS from pysollib.layout import Layout
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
AbstractFoundationStack, \ AbstractFoundationStack, \
@ -42,6 +35,7 @@ from pysollib.stack import \
SS_RowStack, \ SS_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
from pysollib.util import ANY_RANK, RANKS
# ************************************************************************ # ************************************************************************
# * Glenwood # * Glenwood

33
pysollib/games/golf.py
View file

@ -21,24 +21,16 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
import pysollib.game import pysollib.game
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint
from pysollib.hint import BlackHoleSolverWrapper
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.pileon import FourByFour_Hint from pysollib.games.pileon import FourByFour_Hint
from pysollib.hint import AbstractHint, CautiousDefaultHint, DefaultHint
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, RANKS, \ from pysollib.hint import BlackHoleSolverWrapper
SUITS, \ from pysollib.layout import Layout
UNLIMITED_REDEALS from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
BasicRowStack, \ BasicRowStack, \
@ -51,16 +43,15 @@ from pysollib.stack import \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
Stack, \ Stack, \
StackWrapper, \
TalonStack, \ TalonStack, \
UD_RK_RowStack, \ UD_RK_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack, \
isSameSuitSequence, \ isSameSuitSequence
StackWrapper from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, RANKS, \
SUITS, \
# ************************************************************************ UNLIMITED_REDEALS
# *
# ************************************************************************
class Golf_Hint(AbstractHint): class Golf_Hint(AbstractHint):

9
pysollib/games/grandduchess.py
View file

@ -21,20 +21,15 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.util import ACE, KING
from pysollib.stack import \ from pysollib.stack import \
ArbitraryStack, \ ArbitraryStack, \
BasicRowStack, \ BasicRowStack, \
RedealTalonStack, \ RedealTalonStack, \
SS_FoundationStack SS_FoundationStack
from pysollib.util import ACE, KING
# ************************************************************************ # ************************************************************************
# * Grand Duchess # * Grand Duchess

15
pysollib/games/grandfathersclock.py
View file

@ -21,20 +21,10 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.hint import DefaultHint, CautiousDefaultHint
# ************************************************************************
# *
# ************************************************************************
from pysollib.util import ACE, ANY_SUIT, JACK, KING, QUEEN
from pysollib.stack import \ from pysollib.stack import \
AC_FoundationStack, \ AC_FoundationStack, \
BasicRowStack, \ BasicRowStack, \
@ -47,6 +37,7 @@ from pysollib.stack import \
SS_RowStack, \ SS_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
from pysollib.util import ACE, ANY_SUIT, JACK, KING, QUEEN
class GrandfathersClock_Hint(CautiousDefaultHint): class GrandfathersClock_Hint(CautiousDefaultHint):

26
pysollib/games/gypsy.py
View file

@ -21,21 +21,13 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.spider import Spider_Hint, Spider_RowStack, \
Spider_SS_Foundation
from pysollib.hint import KlondikeType_Hint, YukonType_Hint from pysollib.hint import KlondikeType_Hint, YukonType_Hint
from pysollib.layout import Layout
from pysollib.games.spider import Spider_SS_Foundation, \ from pysollib.mfxutil import kwdefault
Spider_RowStack, Spider_Hint
from pysollib.util import ACE, ANY_SUIT, KING, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
AbstractFoundationStack, \ AbstractFoundationStack, \
@ -49,17 +41,19 @@ from pysollib.stack import \
SS_RowStack, \ SS_RowStack, \
Spider_SS_RowStack, \ Spider_SS_RowStack, \
Stack, \ Stack, \
StackWrapper, \
TalonStack, \ TalonStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack, \
Yukon_AC_RowStack, \ Yukon_AC_RowStack
StackWrapper from pysollib.util import ACE, ANY_SUIT, KING, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
# ************************************************************************ # ************************************************************************
# * Gypsy # * Gypsy
# ************************************************************************ # ************************************************************************
class Gypsy(Game): class Gypsy(Game):
Layout_Method = staticmethod(Layout.gypsyLayout) Layout_Method = staticmethod(Layout.gypsyLayout)
Talon_Class = DealRowTalonStack Talon_Class = DealRowTalonStack

22
pysollib/games/harp.py
View file

@ -21,31 +21,25 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.spider import Spider_Hint
from pysollib.games.spider import Spider_RowStack, Spider_SS_Foundation
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.hint import KlondikeType_Hint from pysollib.hint import KlondikeType_Hint
from pysollib.layout import Layout
from pysollib.games.spider import Spider_RowStack, Spider_SS_Foundation, \ from pysollib.mfxutil import kwdefault
Spider_Hint
from pysollib.util import ACE, KING
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
BO_RowStack, \ BO_RowStack, \
KingAC_RowStack, \ KingAC_RowStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \
Spider_SS_RowStack, \ Spider_SS_RowStack, \
StackWrapper, \ StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
SS_RowStack from pysollib.util import ACE, KING
# ************************************************************************ # ************************************************************************
# * Double Klondike (Klondike with 2 decks and 9 rows) # * Double Klondike (Klondike with 2 decks and 9 rows)

11
pysollib/games/headsandtails.py
View file

@ -21,22 +21,17 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.util import KING
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \ OpenStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack SS_RowStack
from pysollib.util import KING
# ************************************************************************ # ************************************************************************
# * Heads and Tails # * Heads and Tails

21
pysollib/games/katzenschwanz.py
View file

@ -21,21 +21,12 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import FreeCellType_Hint, CautiousDefaultHint from pysollib.hint import CautiousDefaultHint, FreeCellType_Hint
from pysollib.hint import FreeCellSolverWrapper from pysollib.hint import FreeCellSolverWrapper
from pysollib.layout import Layout
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, RANKS, \
QUEEN, \
UNLIMITED_ACCEPTS
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
AbstractFoundationStack, \ AbstractFoundationStack, \
@ -50,10 +41,8 @@ from pysollib.stack import \
TalonStack, \ TalonStack, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK, \
# ************************************************************************ QUEEN, RANKS, UNLIMITED_ACCEPTS
# *
# ************************************************************************
class DerKatzenschwanz_Hint(FreeCellType_Hint): class DerKatzenschwanz_Hint(FreeCellType_Hint):

30
pysollib/games/klondike.py
View file

@ -21,24 +21,17 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault, Struct
from pysollib.game import Game
import pysollib.game import pysollib.game
from pysollib.layout import Layout from pysollib.game import Game
from pysollib.hint import CautiousDefaultHint from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import KlondikeType_Hint
from pysollib.hint import FreeCellSolverWrapper
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.canfield import CanfieldRush_Talon from pysollib.games.canfield import CanfieldRush_Talon
from pysollib.hint import CautiousDefaultHint
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK from pysollib.hint import FreeCellSolverWrapper
from pysollib.hint import KlondikeType_Hint
from pysollib.layout import Layout
from pysollib.mfxutil import Struct, kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
BO_RowStack, \ BO_RowStack, \
@ -53,14 +46,15 @@ from pysollib.stack import \
ReserveStack, \ ReserveStack, \
SC_RowStack, \ SC_RowStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \
Stack, \ Stack, \
StackWrapper, \ StackWrapper, \
SuperMoveAC_RowStack, \ SuperMoveAC_RowStack, \
UD_SS_RowStack, \ UD_SS_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack, \
isSameColorSequence, \ isSameColorSequence
SS_RowStack from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, NO_RANK
# ************************************************************************ # ************************************************************************
# * Klondike # * Klondike

7
pysollib/games/labyrinth.py
View file

@ -21,15 +21,8 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
# from pysollib.gamedb import registerGame, GameInfo
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.layout import Layout
# from pysollib.util import
from pysollib.stack import \ from pysollib.stack import \
BasicRowStack, \ BasicRowStack, \
DealRowTalonStack, \ DealRowTalonStack, \

17
pysollib/games/larasgame.py
View file

@ -21,28 +21,17 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.mygettext import _
# from pysollib.util import
from pysollib.stack import \ from pysollib.stack import \
OpenStack, \ OpenStack, \
SS_FoundationStack, \ SS_FoundationStack, \
Stack, \ Stack, \
WasteTalonStack WasteTalonStack
# ************************************************************************
# *
# ************************************************************************
class LarasGame_Hint(CautiousDefaultHint): class LarasGame_Hint(CautiousDefaultHint):
pass pass

25
pysollib/games/mahjongg/mahjongg.py
View file

@ -21,29 +21,26 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Imports
from six.moves import range
import re import re
import time import time
from gettext import ungettext
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault, Struct, Image
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint from pysollib.hint import AbstractHint
from pysollib.settings import TOOLKIT, DEBUG from pysollib.layout import Layout
from pysollib.pysoltk import MfxCanvasText, MfxCanvasImage from pysollib.mfxutil import Image, Struct, kwdefault
from pysollib.pysoltk import bind, EVENT_HANDLED, ANCHOR_NW from pysollib.mygettext import _
from pysollib.mygettext import ungettext
from pysollib.pysoltk import ANCHOR_NW, EVENT_HANDLED, bind
from pysollib.pysoltk import MfxCanvasImage, MfxCanvasText
from pysollib.pysoltk import MfxMessageDialog from pysollib.pysoltk import MfxMessageDialog
from pysollib.settings import DEBUG, TOOLKIT
from pysollib.util import ANY_SUIT, NO_RANK
from pysollib.stack import \ from pysollib.stack import \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack OpenStack
from pysollib.util import ANY_SUIT, NO_RANK
from six.moves import range
def factorial(x): def factorial(x):

33
pysollib/games/mahjongg/shisensho.py
View file

@ -21,32 +21,23 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Imports from pysollib.gamedb import GI, GameInfo, registerGame
from gettext import ungettext from pysollib.games.mahjongg.mahjongg import AbstractMahjonggGame, \
from six.moves import range Mahjongg_RowStack, \
comp_cardset
from pysollib.settings import TOOLKIT
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.layout import Layout
from pysollib.hint import AbstractHint from pysollib.hint import AbstractHint
from pysollib.pysoltk import MfxCanvasText, MfxCanvasLine from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.games.mahjongg.mahjongg import Mahjongg_RowStack, \ from pysollib.mygettext import _
AbstractMahjonggGame, comp_cardset from pysollib.mygettext import ungettext
from pysollib.pysoltk import MfxCanvasLine, MfxCanvasText
from pysollib.util import ANY_SUIT from pysollib.settings import TOOLKIT
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
InitialDealTalonStack InitialDealTalonStack
from pysollib.util import ANY_SUIT
# ************************************************************************ from six.moves import range
# *
# ************************************************************************
class Shisen_Hint(AbstractHint): class Shisen_Hint(AbstractHint):

17
pysollib/games/matriarchy.py
View file

@ -21,23 +21,18 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
from pysollib.util import KING, QUEEN, VARIABLE_REDEALS
from pysollib.stack import \ from pysollib.stack import \
SS_RowStack, \
Stack, \ Stack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
SS_RowStack from pysollib.util import KING, QUEEN, VARIABLE_REDEALS
# ************************************************************************ # ************************************************************************
# * Talon # * Talon

11
pysollib/games/montana.py
View file

@ -21,16 +21,10 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import DefaultHint from pysollib.hint import DefaultHint
from pysollib.layout import Layout
from pysollib.util import ACE, NO_SUIT
from pysollib.stack import \ from pysollib.stack import \
BasicRowStack, \ BasicRowStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
@ -40,6 +34,7 @@ from pysollib.stack import \
TalonStack, \ TalonStack, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
from pysollib.util import ACE, NO_SUIT
# ************************************************************************ # ************************************************************************
# * # *

15
pysollib/games/montecarlo.py
View file

@ -21,16 +21,10 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import DefaultHint from pysollib.hint import DefaultHint
from pysollib.layout import Layout
from pysollib.util import ANY_RANK, ANY_SUIT, KING, NO_RANK, UNLIMITED_REDEALS
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
BasicRowStack, \ BasicRowStack, \
@ -38,9 +32,10 @@ from pysollib.stack import \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \ OpenStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \
StackWrapper, \ StackWrapper, \
TalonStack, \ TalonStack
SS_FoundationStack from pysollib.util import ANY_RANK, ANY_SUIT, KING, NO_RANK, UNLIMITED_REDEALS
# ************************************************************************ # ************************************************************************
# * # *

25
pysollib/games/napoleon.py
View file

@ -21,29 +21,24 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.braid import Braid_Foundation from pysollib.games.braid import Braid_Foundation
from pysollib.hint import CautiousDefaultHint
from pysollib.util import ACE, KING, RANKS, UNLIMITED_CARDS from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
BasicRowStack, \ BasicRowStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
Stack, \ Stack, \
UD_SS_RowStack, \ StackWrapper, \
StackWrapper UD_SS_RowStack
from pysollib.util import ACE, KING, RANKS, UNLIMITED_CARDS
# ************************************************************************ # ************************************************************************
# * stacks # * stacks

10
pysollib/games/needle.py
View file

@ -21,16 +21,10 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
# from pysollib.util import ANY_SUIT, KING
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \

20
pysollib/games/numerica.py
View file

@ -21,21 +21,14 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
import time import time
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.hint import DefaultHint, CautiousDefaultHint
from pysollib.mfxutil import kwdefault from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, \
UNLIMITED_ACCEPTS, \
UNLIMITED_CARDS
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
BasicRowStack, \ BasicRowStack, \
@ -52,10 +45,9 @@ from pysollib.stack import \
TalonStack, \ TalonStack, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, \
# ************************************************************************ UNLIMITED_ACCEPTS, \
# * UNLIMITED_CARDS
# ************************************************************************
class Numerica_Hint(DefaultHint): class Numerica_Hint(DefaultHint):

15
pysollib/games/osmosis.py
View file

@ -21,25 +21,20 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.util import ANY_RANK, ANY_SUIT, UNLIMITED_REDEALS
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
BasicRowStack, \ BasicRowStack, \
FullStackWrapper, \ FullStackWrapper, \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \ OpenStack, \
ReserveStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
ReserveStack from pysollib.util import ANY_RANK, ANY_SUIT, UNLIMITED_REDEALS
# ************************************************************************ # ************************************************************************
# * Osmosis # * Osmosis

9
pysollib/games/parallels.py
View file

@ -21,19 +21,14 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.util import ACE, KING
from pysollib.stack import \ from pysollib.stack import \
BasicRowStack, \ BasicRowStack, \
DealRowTalonStack, \ DealRowTalonStack, \
SS_FoundationStack SS_FoundationStack
from pysollib.util import ACE, KING
# ************************************************************************ # ************************************************************************
# * Parallels # * Parallels

12
pysollib/games/pasdedeux.py
View file

@ -21,24 +21,16 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint from pysollib.hint import AbstractHint
from pysollib.layout import Layout
from pysollib.stack import \ from pysollib.stack import \
InvisibleStack, \ InvisibleStack, \
ReserveStack, \ ReserveStack, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
# ************************************************************************
# *
# ************************************************************************
class PasDeDeux_Hint(AbstractHint): class PasDeDeux_Hint(AbstractHint):
# FIXME: this is very simple # FIXME: this is very simple

11
pysollib/games/picturegallery.py
View file

@ -21,16 +21,10 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint from pysollib.hint import AbstractHint
from pysollib.layout import Layout
from pysollib.util import ACE, KING, QUEEN
from pysollib.stack import \ from pysollib.stack import \
BasicRowStack, \ BasicRowStack, \
DealRowTalonStack, \ DealRowTalonStack, \
@ -42,6 +36,7 @@ from pysollib.stack import \
StackWrapper, \ StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
from pysollib.util import ACE, KING, QUEEN
# ************************************************************************ # ************************************************************************
# * # *

17
pysollib/games/pileon.py
View file

@ -21,32 +21,27 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.hint import DefaultHint, CautiousDefaultHint from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, RANKS
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
AbstractFoundationStack, \ AbstractFoundationStack, \
DealRowTalonStack, \ DealRowTalonStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
RK_RowStack, \ RK_RowStack, \
ReserveStack, \
Stack, \ Stack, \
UD_AC_RowStack, \ UD_AC_RowStack, \
UD_RK_RowStack, \ UD_RK_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack, \
cardsFaceDown, \ cardsFaceDown, \
isRankSequence, \ isRankSequence
ReserveStack from pysollib.util import ACE, ANY_RANK, ANY_SUIT, RANKS
# ************************************************************************ # ************************************************************************
# * PileOn # * PileOn

19
pysollib/games/pushpin.py
View file

@ -21,25 +21,16 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint from pysollib.hint import AbstractHint
from pysollib.layout import Layout
from pysollib.util import ANY_RANK, ANY_SUIT
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
DealRowTalonStack, \ DealRowTalonStack, \
Stack, \ ReserveStack, \
ReserveStack Stack
from pysollib.util import ANY_RANK, ANY_SUIT
# ************************************************************************
# *
# ************************************************************************
class PushPin_Hint(AbstractHint): class PushPin_Hint(AbstractHint):

17
pysollib/games/pyramid.py
View file

@ -21,18 +21,11 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import DefaultHint from pysollib.hint import DefaultHint
from pysollib.layout import Layout
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, QUEEN, \
UNLIMITED_CARDS, UNLIMITED_REDEALS
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
BasicRowStack, \ BasicRowStack, \
@ -41,13 +34,15 @@ from pysollib.stack import \
FaceUpWasteTalonStack, \ FaceUpWasteTalonStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \ OpenStack, \
ReserveStack, \
Stack, \ Stack, \
StackWrapper, \ StackWrapper, \
TalonStack, \ TalonStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack, \
getNumberOfFreeStacks, \ getNumberOfFreeStacks
ReserveStack from pysollib.util import ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK, QUEEN, \
UNLIMITED_CARDS, UNLIMITED_REDEALS
# ************************************************************************ # ************************************************************************

22
pysollib/games/royalcotillion.py
View file

@ -21,19 +21,12 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import DefaultHint, CautiousDefaultHint
from pysollib.games.unionsquare import UnionSquare_Foundation from pysollib.games.unionsquare import UnionSquare_Foundation
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.stack import \ from pysollib.stack import \
AC_FoundationStack, \ AC_FoundationStack, \
AC_RowStack, \ AC_RowStack, \
@ -45,6 +38,7 @@ from pysollib.stack import \
RK_FoundationStack, \ RK_FoundationStack, \
RK_RowStack, \ RK_RowStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
Stack, \ Stack, \
StackWrapper, \ StackWrapper, \
@ -52,14 +46,14 @@ from pysollib.stack import \
UD_SS_RowStack, \ UD_SS_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack, \
isSameSuitSequence, \ isSameSuitSequence
SS_FoundationStack from pysollib.util import ACE, ANY_RANK, ANY_SUIT, JACK, KING, NO_RANK
# ************************************************************************ # ************************************************************************
# * Royal Cotillion # * Royal Cotillion
# ************************************************************************ # ************************************************************************
class RoyalCotillion_Foundation(SS_FoundationStack): class RoyalCotillion_Foundation(SS_FoundationStack):
def getBottomImage(self): def getBottomImage(self):
if self.cap.base_rank == 1: if self.cap.base_rank == 1:

12
pysollib/games/royaleast.py
View file

@ -21,19 +21,15 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.stack import \ from pysollib.stack import \
RK_RowStack, \ RK_RowStack, \
SS_FoundationStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
SS_FoundationStack
# ************************************************************************ # ************************************************************************
# * Royal East # * Royal East

14
pysollib/games/sanibel.py
View file

@ -21,19 +21,15 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports from pysollib.gamedb import GI, GameInfo, registerGame
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.layout import Layout
from pysollib.hint import Yukon_Hint
from pysollib.games.gypsy import Gypsy from pysollib.games.gypsy import Gypsy
from pysollib.hint import Yukon_Hint
from pysollib.layout import Layout
from pysollib.stack import \ from pysollib.stack import \
Yukon_AC_RowStack, \ SS_FoundationStack, \
StackWrapper, \ StackWrapper, \
WasteTalonStack, \ WasteTalonStack, \
SS_FoundationStack Yukon_AC_RowStack
# ************************************************************************ # ************************************************************************
# * Sanibel # * Sanibel

15
pysollib/games/siebenbisas.py
View file

@ -21,25 +21,20 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.util import ACE, KING, QUEEN
from pysollib.stack import \ from pysollib.stack import \
BasicRowStack, \ BasicRowStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
InvisibleStack, \ InvisibleStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \
Stack, \ Stack, \
getPileFromStacks, \ getPileFromStacks, \
isSameSuitSequence, \ isSameSuitSequence
SS_FoundationStack from pysollib.util import ACE, KING, QUEEN
# ************************************************************************ # ************************************************************************
# * # *

15
pysollib/games/simplex.py
View file

@ -21,21 +21,16 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
import pysollib.game import pysollib.game
from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.util import ANY_RANK, ANY_SUIT
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \
SequenceRowStack, \ SequenceRowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
AbstractFoundationStack from pysollib.util import ANY_RANK, ANY_SUIT
# ************************************************************************ # ************************************************************************
# * Simplex # * Simplex

12
pysollib/games/special/hanoi.py
View file

@ -21,18 +21,14 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.stack import \ from pysollib.stack import \
BasicRowStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
isRankSequence, \ isRankSequence
BasicRowStack
# ************************************************************************ # ************************************************************************
# * Tower of Hanoy # * Tower of Hanoy

10
pysollib/games/special/memory.py
View file

@ -21,17 +21,11 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
# from pysollib.util import ANY_SUIT
from pysollib.stack import \ from pysollib.stack import \
InitialDealTalonStack, \ InitialDealTalonStack, \
InvisibleStack, \ InvisibleStack, \

15
pysollib/games/special/pegged.py
View file

@ -21,25 +21,16 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint from pysollib.hint import AbstractHint
from pysollib.layout import Layout
from pysollib.util import ANY_SUIT
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
InvisibleStack, \ InvisibleStack, \
ReserveStack ReserveStack
from pysollib.util import ANY_SUIT
# ************************************************************************
# *
# ************************************************************************
class Pegged_Hint(AbstractHint): class Pegged_Hint(AbstractHint):

8
pysollib/games/special/poker.py
View file

@ -21,15 +21,11 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
InitialDealTalonStack, \ InitialDealTalonStack, \
InvisibleStack, \ InvisibleStack, \

28
pysollib/games/special/tarock.py
View file

@ -21,33 +21,27 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# Imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.braid import Braid_Foundation, Braid_BraidStack, \
Braid_RowStack, Braid_ReserveStack, Braid
from pysollib.games.bakersdozen import Cruel_Talon from pysollib.games.bakersdozen import Cruel_Talon
from pysollib.games.braid import Braid, Braid_ReserveStack, Braid_RowStack
from pysollib.util import ANY_RANK, NO_RANK, UNLIMITED_ACCEPTS, UNLIMITED_MOVES from pysollib.games.braid import Braid_BraidStack, Braid_Foundation
from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \ OpenStack, \
RK_RowStack, \ RK_RowStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
SS_RowStack, \
StackWrapper, \ StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
SS_RowStack from pysollib.util import ANY_RANK, NO_RANK, UNLIMITED_ACCEPTS, UNLIMITED_MOVES
# ************************************************************************ # ************************************************************************
# * Tarock Talon Stacks # * Tarock Talon Stacks

25
pysollib/games/spider.py
View file

@ -21,22 +21,15 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
import pysollib.game import pysollib.game
from pysollib.layout import Layout from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.hint import SpiderType_Hint, YukonType_Hint
from pysollib.hint import FreeCellSolverWrapper from pysollib.hint import FreeCellSolverWrapper
from pysollib.hint import SpiderType_Hint, YukonType_Hint
from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, \ from pysollib.layout import Layout
UNLIMITED_ACCEPTS, UNLIMITED_CARDS, UNLIMITED_MOVES from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.stack import \ from pysollib.stack import \
AC_FoundationStack, \ AC_FoundationStack, \
AC_RowStack, \ AC_RowStack, \
@ -48,6 +41,7 @@ from pysollib.stack import \
OpenStack, \ OpenStack, \
RK_RowStack, \ RK_RowStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \
Spider_AC_Foundation, \ Spider_AC_Foundation, \
Spider_SS_Foundation, \ Spider_SS_Foundation, \
Spider_SS_RowStack, \ Spider_SS_RowStack, \
@ -62,8 +56,9 @@ from pysollib.stack import \
isAlternateColorSequence, \ isAlternateColorSequence, \
isRankSequence, \ isRankSequence, \
isSameColorSequence, \ isSameColorSequence, \
isSameSuitSequence, \ isSameSuitSequence
SS_FoundationStack from pysollib.util import ACE, ANY_RANK, ANY_SUIT, KING, \
UNLIMITED_ACCEPTS, UNLIMITED_CARDS, UNLIMITED_MOVES
# ************************************************************************ # ************************************************************************

19
pysollib/games/sthelena.py
View file

@ -21,31 +21,22 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.util import ACE, JACK, KING, NO_RANK
from pysollib.stack import \ from pysollib.stack import \
DealRowTalonStack, \ DealRowTalonStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
RedealTalonStack, \ RedealTalonStack, \
SS_FoundationStack, \
StackWrapper, \ StackWrapper, \
TalonStack, \ TalonStack, \
UD_RK_RowStack, \ UD_RK_RowStack, \
UD_SS_RowStack, \ UD_SS_RowStack
SS_FoundationStack from pysollib.util import ACE, JACK, KING, NO_RANK
# ************************************************************************
# *
# ************************************************************************
class StHelena_Talon(TalonStack): class StHelena_Talon(TalonStack):
def canDealCards(self): def canDealCards(self):

17
pysollib/games/sultan.py
View file

@ -21,17 +21,10 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.util import ACE, ANY_SUIT, JACK, KING, NO_RANK, QUEEN, \
UNLIMITED_REDEALS
from pysollib.stack import \ from pysollib.stack import \
AC_FoundationStack, \ AC_FoundationStack, \
AbstractFoundationStack, \ AbstractFoundationStack, \
@ -44,6 +37,7 @@ from pysollib.stack import \
RK_FoundationStack, \ RK_FoundationStack, \
RK_RowStack, \ RK_RowStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
Stack, \ Stack, \
StackWrapper, \ StackWrapper, \
@ -51,8 +45,9 @@ from pysollib.stack import \
UD_AC_RowStack, \ UD_AC_RowStack, \
UD_SS_RowStack, \ UD_SS_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
SS_FoundationStack from pysollib.util import ACE, ANY_SUIT, JACK, KING, NO_RANK, QUEEN, \
UNLIMITED_REDEALS
# ************************************************************************ # ************************************************************************

17
pysollib/games/takeaway.py
View file

@ -21,16 +21,10 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.mygettext import _
from pysollib.util import ANY_RANK, ANY_SUIT, JACK, KING, QUEEN
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
AbstractFoundationStack, \ AbstractFoundationStack, \
@ -38,15 +32,16 @@ from pysollib.stack import \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \ OpenStack, \
Stack, \ Stack, \
StackWrapper, \
UD_RK_RowStack, \ UD_RK_RowStack, \
isAlternateColorSequence, \ isAlternateColorSequence
StackWrapper from pysollib.util import ANY_RANK, ANY_SUIT, JACK, KING, QUEEN
# ************************************************************************ # ************************************************************************
# * Take Away # * Take Away
# ************************************************************************ # ************************************************************************
class TakeAway_Foundation(AbstractFoundationStack): class TakeAway_Foundation(AbstractFoundationStack):
def acceptsCards(self, from_stack, cards): def acceptsCards(self, from_stack, cards):

17
pysollib/games/terrace.py
View file

@ -21,16 +21,12 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.util import KING, NO_RANK from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.stack import \ from pysollib.stack import \
AC_FoundationStack, \ AC_FoundationStack, \
AC_RowStack, \ AC_RowStack, \
@ -40,10 +36,7 @@ from pysollib.stack import \
StackWrapper, \ StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
from pysollib.util import KING, NO_RANK
# ************************************************************************
# *
# ************************************************************************
class Terrace_Talon(WasteTalonStack): class Terrace_Talon(WasteTalonStack):

19
pysollib/games/threepeaks.py
View file

@ -21,25 +21,16 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# Imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.golf import Golf_Hint, Golf_Waste
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import OpenStack, StackWrapper, WasteTalonStack
from pysollib.games.golf import Golf_Waste, Golf_Hint
from pysollib.util import ANY_RANK from pysollib.util import ANY_RANK
from pysollib.stack import \
OpenStack, \
StackWrapper, \
WasteTalonStack
# ************************************************************************ # ************************************************************************
# * Three Peaks Row Stack # * Three Peaks Row Stack
# ************************************************************************ # ************************************************************************

17
pysollib/games/tournament.py
View file

@ -21,17 +21,11 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.util import ACE, JACK, KING, QUEEN from pysollib.mygettext import _
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
BasicRowStack, \ BasicRowStack, \
@ -39,9 +33,10 @@ from pysollib.stack import \
DealRowTalonStack, \ DealRowTalonStack, \
OpenStack, \ OpenStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \
SS_RowStack, \ SS_RowStack, \
Stack, \ Stack
SS_FoundationStack from pysollib.util import ACE, JACK, KING, QUEEN
# ************************************************************************ # ************************************************************************
# * Tournament # * Tournament

25
pysollib/games/ultra/dashavatara.py
View file

@ -21,25 +21,16 @@
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Imports
import math import math
import time import time
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint, CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, \
UNLIMITED_ACCEPTS, \
UNLIMITED_CARDS, \
UNLIMITED_MOVES
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
AbstractFoundationStack, \ AbstractFoundationStack, \
@ -53,8 +44,12 @@ from pysollib.stack import \
SS_RowStack, \ SS_RowStack, \
StackWrapper, \ StackWrapper, \
WasteStack, \ WasteStack, \
isSameSuitSequence, \ WasteTalonStack, \
WasteTalonStack isSameSuitSequence
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, \
UNLIMITED_ACCEPTS, \
UNLIMITED_CARDS, \
UNLIMITED_MOVES
# ************************************************************************ # ************************************************************************
# * Dashavatara Foundation Stacks # * Dashavatara Foundation Stacks

28
pysollib/games/ultra/hanafuda.py
View file

@ -21,17 +21,9 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# Imports from pysollib.gamedb import GI, GameInfo, registerGame
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.layout import Layout
from pysollib.hint import FreeCellType_Hint
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.ultra.hanafuda_common import \ from pysollib.games.ultra.hanafuda_common import \
AbstractFlowerGame, \
FlowerClock_Foundation, \ FlowerClock_Foundation, \
FlowerClock_RowStack, \ FlowerClock_RowStack, \
FourWinds_Foundation, \ FourWinds_Foundation, \
@ -45,18 +37,20 @@ from pysollib.games.ultra.hanafuda_common import \
MatsuKiri_Foundation, \ MatsuKiri_Foundation, \
Matsukiri_RowStack, \ Matsukiri_RowStack, \
Oonsoo_SequenceStack, \ Oonsoo_SequenceStack, \
Pagoda_Foundation, \ Pagoda_Foundation
AbstractFlowerGame from pysollib.hint import FreeCellType_Hint
from pysollib.layout import Layout
from pysollib.util import ANY_RANK, ANY_SUIT from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
DealRowTalonStack, \ DealRowTalonStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
ReserveStack, \ ReserveStack, \
WasteStack, \ WasteStack, \
cardsFaceUp, \ WasteTalonStack, \
WasteTalonStack cardsFaceUp
from pysollib.util import ANY_RANK, ANY_SUIT
# ************************************************************************ # ************************************************************************
# * Flower Clock # * Flower Clock

24
pysollib/games/ultra/hanafuda1.py
View file

@ -21,18 +21,12 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint, CautiousDefaultHint
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.ultra.hanafuda_common import \ from pysollib.games.ultra.hanafuda_common import \
Flower_OpenStack, \ AbstractFlowerGame, \
FlowerClock_RowStack, \ FlowerClock_RowStack, \
Flower_OpenStack, \
HanafudaRK_RowStack, \ HanafudaRK_RowStack, \
Hanafuda_SS_FoundationStack, \ Hanafuda_SS_FoundationStack, \
Hanafuda_SequenceStack, \ Hanafuda_SequenceStack, \
@ -42,11 +36,12 @@ from pysollib.games.ultra.hanafuda_common import \
Queue_Hint, \ Queue_Hint, \
Queue_ReserveStack, \ Queue_ReserveStack, \
Queue_RowStack, \ Queue_RowStack, \
Samuri_RowStack, \ Samuri_RowStack
AbstractFlowerGame from pysollib.hint import AbstractHint, CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
BasicRowStack, \ BasicRowStack, \
DealRowTalonStack, \ DealRowTalonStack, \
@ -56,6 +51,7 @@ from pysollib.stack import \
StackWrapper, \ StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK
# ************************************************************************ # ************************************************************************

16
pysollib/games/ultra/hanafuda_common.py
View file

@ -23,23 +23,17 @@
import math import math
from pysollib.mygettext import _
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.hint import DefaultHint from pysollib.hint import DefaultHint
from pysollib.mfxutil import kwdefault
from pysollib.util import ANY_RANK, ANY_SUIT from pysollib.mygettext import _
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
OpenStack, \ OpenStack, \
ReserveStack, \ ReserveStack, \
isRankSequence, \ cardsFaceUp, \
cardsFaceUp isRankSequence
from pysollib.util import ANY_RANK, ANY_SUIT
# ************************************************************************
# *
# ***********************************************************************/
class AbstractFlowerGame(Game): class AbstractFlowerGame(Game):

21
pysollib/games/ultra/hexadeck.py
View file

@ -24,34 +24,31 @@
# Imports # Imports
import math import math
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint, DefaultHint
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.hint import DefaultHint, CautiousDefaultHint from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
AbstractFoundationStack, \ AbstractFoundationStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
StackWrapper, \ StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
OpenStack from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, UNLIMITED_ACCEPTS, \
UNLIMITED_MOVES
# ************************************************************************ # ************************************************************************
# * Hex A Deck Foundation Stacks # * Hex A Deck Foundation Stacks
# ************************************************************************ # ************************************************************************
class HexADeck_FoundationStack(SS_FoundationStack): class HexADeck_FoundationStack(SS_FoundationStack):
def __init__(self, x, y, game, suit, **cap): def __init__(self, x, y, game, suit, **cap):
kwdefault(cap, max_move=0, max_cards=12) kwdefault(cap, max_move=0, max_cards=12)

17
pysollib/games/ultra/larasgame.py
View file

@ -21,19 +21,10 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.larasgame import LarasGame, LarasGame_Reserve
# PySol imports from pysollib.games.larasgame import LarasGame_Talon
from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.stack import OpenStack
from pysollib.games.larasgame import LarasGame_Talon, LarasGame, \
LarasGame_Reserve
from pysollib.stack import \
OpenStack
# ************************************************************************
# *
# ************************************************************************
class DojoujisGame_Talon(LarasGame_Talon): class DojoujisGame_Talon(LarasGame_Talon):

10
pysollib/games/ultra/matrix.py
View file

@ -21,21 +21,17 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# Imports
import math import math
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.pysoltk import bind from pysollib.pysoltk import bind
from pysollib.util import ANY_RANK
from pysollib.stack import \ from pysollib.stack import \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack OpenStack
from pysollib.util import ANY_RANK
# ************************************************************************ # ************************************************************************
# * Matrix Row Stack # * Matrix Row Stack

21
pysollib/games/ultra/mughal.py
View file

@ -21,27 +21,22 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# Imports
import math import math
# PySol imports
from pysollib.mygettext import _
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game from pysollib.game import Game
from pysollib.layout import Layout from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import AbstractHint, DefaultHint from pysollib.hint import AbstractHint, DefaultHint
from pysollib.layout import Layout
from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText from pysollib.pysoltk import MfxCanvasText
from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, UNLIMITED_ACCEPTS, \
UNLIMITED_CARDS, UNLIMITED_MOVES
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
AbstractFoundationStack, \ AbstractFoundationStack, \
BasicRowStack, \ BasicRowStack, \
DealRowTalonStack, \ DealRowTalonStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \
RK_RowStack, \ RK_RowStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
@ -49,8 +44,10 @@ from pysollib.stack import \
StackWrapper, \ StackWrapper, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack, \
isSameSuitSequence, \ isSameSuitSequence
OpenStack from pysollib.util import ANY_RANK, ANY_SUIT, NO_RANK, UNLIMITED_ACCEPTS, \
UNLIMITED_CARDS, UNLIMITED_MOVES
# ************************************************************************ # ************************************************************************
# * Mughal Foundation Stacks # * Mughal Foundation Stacks

22
pysollib/games/ultra/tarock.py
View file

@ -21,28 +21,18 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# Imports from pysollib.gamedb import GI, GameInfo, registerGame
# Ultrasol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.layout import Layout
from pysollib.games.special.tarock import AbstractTarockGame, Grasshopper from pysollib.games.special.tarock import AbstractTarockGame, Grasshopper
from pysollib.games.threepeaks import ThreePeaksNoScore from pysollib.games.threepeaks import ThreePeaksNoScore
from pysollib.layout import Layout
from pysollib.util import ANY_RANK, NO_RANK, UNLIMITED_ACCEPTS, UNLIMITED_MOVES from pysollib.mfxutil import kwdefault
from pysollib.stack import \ from pysollib.stack import \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
StackWrapper, \ StackWrapper
OpenStack from pysollib.util import ANY_RANK, NO_RANK, UNLIMITED_ACCEPTS, UNLIMITED_MOVES
# ************************************************************************
# *
# ************************************************************************
class Tarock_OpenStack(OpenStack): class Tarock_OpenStack(OpenStack):

19
pysollib/games/unionsquare.py
View file

@ -21,26 +21,21 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.mfxutil import kwdefault
from pysollib.game import Game
import pysollib.game import pysollib.game
from pysollib.layout import Layout from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.hint import CautiousDefaultHint from pysollib.hint import CautiousDefaultHint
from pysollib.layout import Layout
from pysollib.util import ACE, ANY_RANK, NO_RANK from pysollib.mfxutil import kwdefault
from pysollib.stack import \ from pysollib.stack import \
AbstractFoundationStack, \ AbstractFoundationStack, \
OpenStack, \ OpenStack, \
Stack, \ Stack, \
StackWrapper, \
UD_SS_RowStack, \ UD_SS_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
StackWrapper from pysollib.util import ACE, ANY_RANK, NO_RANK
# ************************************************************************ # ************************************************************************

13
pysollib/games/wavemotion.py
View file

@ -21,22 +21,17 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.layout import Layout from pysollib.layout import Layout
from pysollib.util import ANY_RANK
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
OpenStack, \ OpenStack, \
SS_RowStack, \
isAlternateColorSequence, \ isAlternateColorSequence, \
isSameSuitSequence, \ isSameSuitSequence
SS_RowStack from pysollib.util import ANY_RANK
# ************************************************************************ # ************************************************************************
# * Wave Motion # * Wave Motion

20
pysollib/games/windmill.py
View file

@ -21,19 +21,12 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
# PySol imports
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.game import Game
import pysollib.game import pysollib.game
from pysollib.layout import Layout from pysollib.game import Game
from pysollib.hint import CautiousDefaultHint from pysollib.gamedb import GI, GameInfo, registerGame
from pysollib.games.golf import BlackHole_Foundation from pysollib.games.golf import BlackHole_Foundation
from pysollib.hint import CautiousDefaultHint
from pysollib.util import ACE, ANY_SUIT, KING, UNLIMITED_CARDS from pysollib.layout import Layout
from pysollib.stack import \ from pysollib.stack import \
AC_RowStack, \ AC_RowStack, \
RK_FoundationStack, \ RK_FoundationStack, \
@ -41,10 +34,11 @@ from pysollib.stack import \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
Stack, \ Stack, \
StackWrapper, \
UD_RK_RowStack, \ UD_RK_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack, \ WasteTalonStack
StackWrapper from pysollib.util import ACE, ANY_SUIT, KING, UNLIMITED_CARDS
# ************************************************************************ # ************************************************************************
# * # *

27
pysollib/games/yukon.py
View file

@ -21,13 +21,14 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
# PySol imports from pysollib.games.spider import Spider_SS_Foundation
from pysollib.mygettext import _ from pysollib.hint import Yukon_Hint
from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.layout import Layout
from pysollib.util import ANY_SUIT, KING
from pysollib.mfxutil import kwdefault from pysollib.mfxutil import kwdefault
from pysollib.mygettext import _
from pysollib.pysoltk import MfxCanvasText
from pysollib.stack import \ from pysollib.stack import \
DealRowTalonStack, \ DealRowTalonStack, \
InitialDealTalonStack, \ InitialDealTalonStack, \
@ -36,17 +37,11 @@ from pysollib.stack import \
ReserveStack, \ ReserveStack, \
SS_FoundationStack, \ SS_FoundationStack, \
StackWrapper, \ StackWrapper, \
Yukon_AC_RowStack, \
Yukon_SS_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack, \
Yukon_AC_RowStack, \
from pysollib.game import Game Yukon_SS_RowStack
from pysollib.layout import Layout from pysollib.util import ANY_SUIT, KING
from pysollib.hint import Yukon_Hint
from pysollib.pysoltk import MfxCanvasText
from pysollib.games.spider import Spider_SS_Foundation
# ************************************************************************ # ************************************************************************

11
pysollib/games/zodiac.py
View file

@ -21,11 +21,9 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports from pysollib.game import Game
from pysollib.gamedb import GI, GameInfo, registerGame
# PySol imports from pysollib.layout import Layout
from pysollib.gamedb import registerGame, GameInfo, GI
from pysollib.util import KING, NO_RANK, UNLIMITED_REDEALS
from pysollib.stack import \ from pysollib.stack import \
OpenStack, \ OpenStack, \
ReserveStack, \ ReserveStack, \
@ -34,8 +32,7 @@ from pysollib.stack import \
UD_SS_RowStack, \ UD_SS_RowStack, \
WasteStack, \ WasteStack, \
WasteTalonStack WasteTalonStack
from pysollib.game import Game from pysollib.util import KING, NO_RANK, UNLIMITED_REDEALS
from pysollib.layout import Layout
# ************************************************************************ # ************************************************************************

6
pysollib/help.py
View file

@ -26,11 +26,11 @@
# PySol imports # PySol imports
from pysollib.mygettext import _ from pysollib.mygettext import _
from pysollib.settings import TITLE, PACKAGE_URL, TOOLKIT, VERSION from pysollib.pysoltk import HTMLViewer
from pysollib.pysoltk import make_help_toplevel
from pysollib.pysoltk import MfxMessageDialog from pysollib.pysoltk import MfxMessageDialog
from pysollib.pysoltk import PysolAboutDialog from pysollib.pysoltk import PysolAboutDialog
from pysollib.pysoltk import HTMLViewer from pysollib.pysoltk import make_help_toplevel
from pysollib.settings import PACKAGE_URL, TITLE, TOOLKIT, VERSION
# ************************************************************************ # ************************************************************************

11
pysollib/hint.py
View file

@ -24,18 +24,19 @@
# imports # imports
import os import os
import time
import subprocess
import re import re
import six import subprocess
import time
from io import BytesIO from io import BytesIO
# PySol imports # PySol imports
from pysollib.settings import DEBUG, FCS_COMMAND
from pysollib.pysolrandom import constructRandom
from pysollib.mfxutil import destruct from pysollib.mfxutil import destruct
from pysollib.pysolrandom import constructRandom
from pysollib.settings import DEBUG, FCS_COMMAND
from pysollib.util import KING from pysollib.util import KING
import six
FCS_VERSION = None FCS_VERSION = None
# ************************************************************************ # ************************************************************************

3
pysollib/htmllib2.py
View file

@ -4,9 +4,10 @@ See the HTML 2.0 specification:
http://www.w3.org/hypertext/WWW/MarkUp/html-spec/html-spec_toc.html http://www.w3.org/hypertext/WWW/MarkUp/html-spec/html-spec_toc.html
""" """
from six.moves import html_parser
from formatter import AS_IS from formatter import AS_IS
from six.moves import html_parser
class HTMLParseError(RuntimeError): class HTMLParseError(RuntimeError):
"""Error raised when an HTML document can't be parsed.""" """Error raised when an HTML document can't be parsed."""

14
pysollib/images.py
View file

@ -22,19 +22,13 @@
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
# imports
import os import os
# settings
from pysollib.settings import TOOLKIT
# PySol imports
from pysollib.resource import CSI
from pysollib.mfxutil import Image, ImageTk, USE_PIL from pysollib.mfxutil import Image, ImageTk, USE_PIL
from pysollib.pysoltk import copyImage, createBottom, createImage, loadImage
# Toolkit imports from pysollib.pysoltk import shadowImage
from pysollib.pysoltk import loadImage, copyImage, createImage, \ from pysollib.resource import CSI
shadowImage, createBottom from pysollib.settings import TOOLKIT
# ************************************************************************ # ************************************************************************
# * Images # * Images

10
pysollib/init.py
View file

@ -21,12 +21,12 @@
# #
# ---------------------------------------------------------------------------## # ---------------------------------------------------------------------------##
import sys
import os
import locale
import subprocess
import gettext import gettext
import locale
import os
import subprocess
import sys
import pysollib.settings import pysollib.settings
# ************************************************************************ # ************************************************************************

42
pysollib/kivy/LApp.py
View file

@ -25,38 +25,32 @@ import logging
import math import math
import traceback import traceback
from kivy.graphics import Color from kivy.animation import Animation
from kivy.graphics import Rectangle from kivy.app import App
from kivy.graphics import Line
from kivy.graphics import Triangle
from kivy.utils import platform
from kivy.properties import StringProperty
from kivy.base import EventLoop from kivy.base import EventLoop
from kivy.base import stopTouchApp from kivy.base import stopTouchApp
from kivy.app import App from kivy.cache import Cache
from kivy.animation import Animation
from kivy.core.audio import SoundLoader
from kivy.clock import Clock from kivy.clock import Clock
from kivy.core.audio import SoundLoader
from kivy.uix.image import Image as KivyImage from kivy.core.window import Window
from kivy.uix.boxlayout import BoxLayout from kivy.graphics import Color
from kivy.uix.widget import Widget from kivy.graphics import Line
from kivy.uix.button import Button from kivy.graphics import Rectangle
from kivy.graphics import Triangle
from kivy.properties import StringProperty
from kivy.uix.actionbar import ActionButton
from kivy.uix.actionbar import ActionPrevious
from kivy.uix.actionbar import ActionView
from kivy.uix.behaviors import ButtonBehavior from kivy.uix.behaviors import ButtonBehavior
from kivy.uix.boxlayout import BoxLayout
from kivy.uix.button import Button
from kivy.uix.image import Image as KivyImage
from kivy.uix.label import Label from kivy.uix.label import Label
from kivy.uix.scrollview import ScrollView from kivy.uix.scrollview import ScrollView
from kivy.uix.actionbar import ActionView
from kivy.uix.actionbar import ActionPrevious
from kivy.uix.actionbar import ActionButton
from kivy.uix.treeview import TreeView from kivy.uix.treeview import TreeView
from kivy.uix.treeview import TreeViewLabel from kivy.uix.treeview import TreeViewLabel
from kivy.uix.widget import Widget
from kivy.core.window import Window from kivy.utils import platform
from kivy.cache import Cache
# ============================================================================= # =============================================================================

13
pysollib/kivy/card.py
View file

@ -21,19 +21,10 @@
# #
# ---------------------------------------------------------------------------# # ---------------------------------------------------------------------------#
# PySol imports
from pysollib.acard import AbstractCard from pysollib.acard import AbstractCard
# Toolkit imports
from pysollib.kivy.tkcanvas import MfxCanvasGroup, MfxCanvasImage
# from tkutil import Image
from pysollib.kivy.LApp import LImageItem
from pysollib.kivy.LApp import LImage from pysollib.kivy.LApp import LImage
from pysollib.kivy.LApp import LImageItem
# ************************************************************************ from pysollib.kivy.tkcanvas import MfxCanvasGroup, MfxCanvasImage
# *
# ************************************************************************
class _HideableCard(AbstractCard): class _HideableCard(AbstractCard):

Some files were not shown because too many files have changed in this diff Show more