diff --git a/pysollib/games/special/__init__.py b/pysollib/games/special/__init__.py index aa07c5dcec..69ab42284e 100644 --- a/pysollib/games/special/__init__.py +++ b/pysollib/games/special/__init__.py @@ -21,13 +21,22 @@ # # ---------------------------------------------------------------------------## from . import cribbage # noqa: F401 +from . import dashavatara # noqa: F401 from . import hanoi # noqa: F401 +from . import hanafuda # noqa: F401 +from . import hanafuda1 # noqa: F401 +from . import hexadeck # noqa: F401 from . import ishido # noqa: F401 +from . import larasgame # noqa: F401 from . import lightsout # noqa: F401 +from . import matrix # noqa: F401 from . import memory # noqa: F401 +from . import mughal # noqa: F401 from . import pegged # noqa: F401 from . import poker # noqa: F401 from . import tarock # noqa: F401 +from . import tarock1 # noqa: F401 +from . import tilepuzzle # noqa: F401 def no_use(): diff --git a/pysollib/games/ultra/dashavatara.py b/pysollib/games/special/dashavatara.py similarity index 100% rename from pysollib/games/ultra/dashavatara.py rename to pysollib/games/special/dashavatara.py diff --git a/pysollib/games/ultra/hanafuda.py b/pysollib/games/special/hanafuda.py similarity index 99% rename from pysollib/games/ultra/hanafuda.py rename to pysollib/games/special/hanafuda.py index bd07310000..2669415014 100644 --- a/pysollib/games/ultra/hanafuda.py +++ b/pysollib/games/special/hanafuda.py @@ -22,7 +22,7 @@ # ---------------------------------------------------------------------------## from pysollib.gamedb import GI, GameInfo, registerGame -from pysollib.games.ultra.hanafuda_common import \ +from pysollib.games.special.hanafuda_common import \ AbstractFlowerGame, \ FlowerClock_Foundation, \ FlowerClock_RowStack, \ diff --git a/pysollib/games/ultra/hanafuda1.py b/pysollib/games/special/hanafuda1.py similarity index 99% rename from pysollib/games/ultra/hanafuda1.py rename to pysollib/games/special/hanafuda1.py index 146d422235..f0a712413f 100644 --- a/pysollib/games/ultra/hanafuda1.py +++ b/pysollib/games/special/hanafuda1.py @@ -23,7 +23,7 @@ from pysollib.game import Game from pysollib.gamedb import GI, GameInfo, registerGame -from pysollib.games.ultra.hanafuda_common import \ +from pysollib.games.special.hanafuda_common import \ AbstractFlowerGame, \ FlowerClock_RowStack, \ Flower_OpenStack, \ diff --git a/pysollib/games/ultra/hanafuda_common.py b/pysollib/games/special/hanafuda_common.py similarity index 100% rename from pysollib/games/ultra/hanafuda_common.py rename to pysollib/games/special/hanafuda_common.py diff --git a/pysollib/games/ultra/hexadeck.py b/pysollib/games/special/hexadeck.py similarity index 100% rename from pysollib/games/ultra/hexadeck.py rename to pysollib/games/special/hexadeck.py diff --git a/pysollib/games/ultra/larasgame.py b/pysollib/games/special/larasgame.py similarity index 100% rename from pysollib/games/ultra/larasgame.py rename to pysollib/games/special/larasgame.py diff --git a/pysollib/games/ultra/matrix.py b/pysollib/games/special/matrix.py similarity index 100% rename from pysollib/games/ultra/matrix.py rename to pysollib/games/special/matrix.py diff --git a/pysollib/games/ultra/mughal.py b/pysollib/games/special/mughal.py similarity index 100% rename from pysollib/games/ultra/mughal.py rename to pysollib/games/special/mughal.py diff --git a/pysollib/games/ultra/tarock.py b/pysollib/games/special/tarock1.py similarity index 100% rename from pysollib/games/ultra/tarock.py rename to pysollib/games/special/tarock1.py diff --git a/pysollib/games/ultra/tilepuzzle.py b/pysollib/games/special/tilepuzzle.py similarity index 100% rename from pysollib/games/ultra/tilepuzzle.py rename to pysollib/games/special/tilepuzzle.py diff --git a/pysollib/games/ultra/__init__.py b/pysollib/games/ultra/__init__.py deleted file mode 100644 index 2aa7997c57..0000000000 --- a/pysollib/games/ultra/__init__.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python -# -*- mode: python; coding: utf-8; -*- -# ---------------------------------------------------------------------------## -# -# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer -# Copyright (C) 2003 Mt. Hood Playing Card Co. -# Copyright (C) 2005-2009 Skomoroh -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# ---------------------------------------------------------------------------## -from . import dashavatara # noqa: F401 -from . import hanafuda # noqa: F401 -from . import hanafuda1 # noqa: F401 -from . import hexadeck # noqa: F401 -from . import larasgame # noqa: F401 -from . import matrix # noqa: F401 -from . import mughal # noqa: F401 -from . import tarock # noqa: F401 -from . import tilepuzzle # noqa: F401 diff --git a/pysollib/main.py b/pysollib/main.py index 3898957097..f4b3f445e9 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -239,7 +239,6 @@ def progressCallback(*args): GAME_DB.setCallback(progressCallback) import pysollib.games if not opts['french-only']: - import pysollib.games.ultra import pysollib.games.mahjongg import pysollib.games.special pysollib.games.special.no_use()