Consolidated special games.

shlomif · Jan 27, 2024 · fa63e28 · fa63e28
1 parent 20533ac
commit fa63e28
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 34 deletions.
diff --git 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 → pysollib/games/special/dashavatara.py b/pysollib/games/ultra/dashavatara.py → pysollib/games/special/dashavatara.py
diff --git a/pysollib/games/ultra/hanafuda.py → pysollib/games/special/hanafuda.py b/pysollib/games/ultra/hanafuda.py → 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 → pysollib/games/special/hanafuda1.py b/pysollib/games/ultra/hanafuda1.py → 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 → pysollib/games/special/hanafuda_common.py b/pysollib/games/ultra/hanafuda_common.py → pysollib/games/special/hanafuda_common.py
diff --git a/pysollib/games/ultra/hexadeck.py → pysollib/games/special/hexadeck.py b/pysollib/games/ultra/hexadeck.py → pysollib/games/special/hexadeck.py
diff --git a/pysollib/games/ultra/larasgame.py → pysollib/games/special/larasgame.py b/pysollib/games/ultra/larasgame.py → pysollib/games/special/larasgame.py
diff --git a/pysollib/games/ultra/matrix.py → pysollib/games/special/matrix.py b/pysollib/games/ultra/matrix.py → pysollib/games/special/matrix.py
diff --git a/pysollib/games/ultra/mughal.py → pysollib/games/special/mughal.py b/pysollib/games/ultra/mughal.py → pysollib/games/special/mughal.py
diff --git a/pysollib/games/ultra/tarock.py → pysollib/games/special/tarock1.py b/pysollib/games/ultra/tarock.py → pysollib/games/special/tarock1.py
diff --git a/pysollib/games/ultra/tilepuzzle.py → pysollib/games/special/tilepuzzle.py b/pysollib/games/ultra/tilepuzzle.py → pysollib/games/special/tilepuzzle.py
diff --git a/pysollib/games/ultra/__init__.py b/pysollib/games/ultra/__init__.py
diff --git 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()