diff --git a/NOTE.md b/NOTE.md index df95bdf..9218da2 100644 --- a/NOTE.md +++ b/NOTE.md @@ -6,12 +6,11 @@ A faire : - Documenter (Docstring, README, ...) 2. Visuel : - - Système en gras ou en un peu différent - Empêcher de spam "se connecter" dans le client (écran d'attente ?) - Paramètres (contenu : fps, volume dans le jeu, plein écran, ...) (bouton dans le jeu) - - Rendre le texte de status plus visible (?) - Police d'écriture - - Changer les images, rajouter les fonds, mettre la musique, ... + - Rendre le texte de status plus visible (fond un peu plus sombre ?) + - Changer les images, animations, rajouter les fonds, mettre la musique, ... - Voir les TODOs 3. Autre : diff --git a/source/__init__.py b/source/__init__.py index 72642f1..beae894 100644 --- a/source/__init__.py +++ b/source/__init__.py @@ -1,7 +1,12 @@ from pathlib import Path -path_save: Path = Path(".save") +path_save: Path = Path("./.save") path_save.mkdir(exist_ok=True) -path_history: Path = Path(".history") +path_history: Path = Path("./.history") path_history.mkdir(exist_ok=True) + +path_assets: Path = Path("./assets") +path_sound: Path = path_assets / "sound" +path_image: Path = path_assets / "image" +path_font: Path = path_assets / "font" diff --git a/source/gui/sound/Game.py b/source/gui/sound/Game.py index 4d0cb26..12a8d80 100644 --- a/source/gui/sound/Game.py +++ b/source/gui/sound/Game.py @@ -1,8 +1,8 @@ -from . import path from .type import Sound from .abc import SoundGroup +from source import path_sound -path = path / "game" +path = path_sound / "game" class Game(SoundGroup): diff --git a/source/gui/sound/__init__.py b/source/gui/sound/__init__.py index 7d38370..340ae36 100644 --- a/source/gui/sound/__init__.py +++ b/source/gui/sound/__init__.py @@ -1,5 +1 @@ -from pathlib import Path - -path: Path = Path("./assets/sound") - from .Game import Game diff --git a/source/gui/texture/Background.py b/source/gui/texture/Background.py index d115f4c..86afa6f 100644 --- a/source/gui/texture/Background.py +++ b/source/gui/texture/Background.py @@ -1,8 +1,8 @@ -from . import path from .abc import Style from source.gui.texture.type import Texture +from source import path_image -path = path / "background" +path = path_image / "background" class Background(Style): diff --git a/source/gui/texture/Button.py b/source/gui/texture/Button.py index 8be2c00..466b067 100644 --- a/source/gui/texture/Button.py +++ b/source/gui/texture/Button.py @@ -1,8 +1,8 @@ -from . import path from .abc import Style from source.gui.texture.type import Texture +from source import path_image -path = path / "button" +path = path_image / "button" class Button: diff --git a/source/gui/texture/Checkbox.py b/source/gui/texture/Checkbox.py index 04592cb..8d3aa7d 100644 --- a/source/gui/texture/Checkbox.py +++ b/source/gui/texture/Checkbox.py @@ -1,8 +1,8 @@ -from . import path from .abc import Style from .type import Texture +from source import path_image -path = path / "checkbox" +path = path_image / "checkbox" class Checkbox: diff --git a/source/gui/texture/Grid.py b/source/gui/texture/Grid.py index 02035ca..9aa52c8 100644 --- a/source/gui/texture/Grid.py +++ b/source/gui/texture/Grid.py @@ -1,8 +1,8 @@ -from . import path from .abc import Style from .type import Texture, Animation +from source import path_image -path = path / "grid" +path = path_image / "grid" path_boat = path / "boat" diff --git a/source/gui/texture/Input.py b/source/gui/texture/Input.py index 99920f2..6a9c590 100644 --- a/source/gui/texture/Input.py +++ b/source/gui/texture/Input.py @@ -1,8 +1,8 @@ -from . import path from .abc import Style from .type import Texture +from source import path_image -path = path / "input" +path = path_image / "input" class Input: diff --git a/source/gui/texture/Popup.py b/source/gui/texture/Popup.py index d7e3d88..b45a488 100644 --- a/source/gui/texture/Popup.py +++ b/source/gui/texture/Popup.py @@ -1,8 +1,8 @@ -from . import path from .abc import Style from .type import Texture +from source import path_image -path = path / "popup" +path = path_image / "popup" class Popup: diff --git a/source/gui/texture/Replay.py b/source/gui/texture/Replay.py index 82563c8..b9bd5e2 100644 --- a/source/gui/texture/Replay.py +++ b/source/gui/texture/Replay.py @@ -1,8 +1,8 @@ -from . import path from .abc import Style from .type import Texture +from source import path_image -path = path / "replay" +path = path_image / "replay" class Replay: diff --git a/source/gui/texture/Result.py b/source/gui/texture/Result.py index 71d80ac..75341fd 100644 --- a/source/gui/texture/Result.py +++ b/source/gui/texture/Result.py @@ -1,8 +1,8 @@ -from . import path from .abc import Style from .type import Animation +from source import path_image -path = path / "result" +path = path_image / "result" class Result: diff --git a/source/gui/texture/Scroller.py b/source/gui/texture/Scroller.py index 517eb1c..0f12906 100644 --- a/source/gui/texture/Scroller.py +++ b/source/gui/texture/Scroller.py @@ -1,8 +1,8 @@ -from . import path from .abc import Style from .type import Texture +from source import path_image -path = path / "scroller" +path = path_image / "scroller" class Scroller: diff --git a/source/gui/texture/__init__.py b/source/gui/texture/__init__.py index 7456e48..eae89d9 100644 --- a/source/gui/texture/__init__.py +++ b/source/gui/texture/__init__.py @@ -1,7 +1,3 @@ -from pathlib import Path - -path: Path = Path("./assets/image") - from .Popup import Popup from .Background import Background from .Button import Button diff --git a/source/utils/__init__.py b/source/utils/__init__.py index 27204c3..5b1effa 100644 --- a/source/utils/__init__.py +++ b/source/utils/__init__.py @@ -1,5 +1,5 @@ -from .copy_array_offset import copy_array_offset -from .in_bbox import in_bbox +from .matrice import copy_array_offset +from .bbox import in_bbox from .dict import dict_filter, dict_filter_prefix from .thread import StoppableThread from .path import path_ctime_str diff --git a/source/utils/in_bbox.py b/source/utils/bbox.py similarity index 100% rename from source/utils/in_bbox.py rename to source/utils/bbox.py diff --git a/source/utils/copy_array_offset.py b/source/utils/matrice.py similarity index 100% rename from source/utils/copy_array_offset.py rename to source/utils/matrice.py