diff --git a/assets/image/background/.pdn/game.pdn b/assets/image/background/.pdn/game.pdn index ff8cd8b..a4dbfb0 100644 Binary files a/assets/image/background/.pdn/game.pdn and b/assets/image/background/.pdn/game.pdn differ diff --git a/assets/image/background/game.png b/assets/image/background/game.png index 503d1fe..8a27442 100644 Binary files a/assets/image/background/game.png and b/assets/image/background/game.png differ diff --git a/assets/image/grid/boat/anim_body/1.png b/assets/image/grid/boat/anim_body/1.png new file mode 100644 index 0000000..966ce43 Binary files /dev/null and b/assets/image/grid/boat/anim_body/1.png differ diff --git a/assets/image/grid/boat/anim_body/10.png b/assets/image/grid/boat/anim_body/10.png new file mode 100644 index 0000000..a966293 Binary files /dev/null and b/assets/image/grid/boat/anim_body/10.png differ diff --git a/assets/image/grid/boat/anim_body/11.png b/assets/image/grid/boat/anim_body/11.png new file mode 100644 index 0000000..5dcc5df Binary files /dev/null and b/assets/image/grid/boat/anim_body/11.png differ diff --git a/assets/image/grid/boat/anim_body/12.png b/assets/image/grid/boat/anim_body/12.png new file mode 100644 index 0000000..0029488 Binary files /dev/null and b/assets/image/grid/boat/anim_body/12.png differ diff --git a/assets/image/grid/boat/anim_body/13.png b/assets/image/grid/boat/anim_body/13.png new file mode 100644 index 0000000..5df28a1 Binary files /dev/null and b/assets/image/grid/boat/anim_body/13.png differ diff --git a/assets/image/grid/boat/anim_body/14.png b/assets/image/grid/boat/anim_body/14.png new file mode 100644 index 0000000..53301c0 Binary files /dev/null and b/assets/image/grid/boat/anim_body/14.png differ diff --git a/assets/image/grid/boat/anim_body/2.png b/assets/image/grid/boat/anim_body/2.png new file mode 100644 index 0000000..a6f0bd6 Binary files /dev/null and b/assets/image/grid/boat/anim_body/2.png differ diff --git a/assets/image/grid/boat/anim_body/3.png b/assets/image/grid/boat/anim_body/3.png new file mode 100644 index 0000000..1ec7132 Binary files /dev/null and b/assets/image/grid/boat/anim_body/3.png differ diff --git a/assets/image/grid/boat/anim_body/4.png b/assets/image/grid/boat/anim_body/4.png new file mode 100644 index 0000000..6018c17 Binary files /dev/null and b/assets/image/grid/boat/anim_body/4.png differ diff --git a/assets/image/grid/boat/anim_body/5.png b/assets/image/grid/boat/anim_body/5.png new file mode 100644 index 0000000..283f8d8 Binary files /dev/null and b/assets/image/grid/boat/anim_body/5.png differ diff --git a/assets/image/grid/boat/anim_body/6.png b/assets/image/grid/boat/anim_body/6.png new file mode 100644 index 0000000..78df8ac Binary files /dev/null and b/assets/image/grid/boat/anim_body/6.png differ diff --git a/assets/image/grid/boat/anim_body/7.png b/assets/image/grid/boat/anim_body/7.png new file mode 100644 index 0000000..71ea92d Binary files /dev/null and b/assets/image/grid/boat/anim_body/7.png differ diff --git a/assets/image/grid/boat/anim_body/8.png b/assets/image/grid/boat/anim_body/8.png new file mode 100644 index 0000000..974d589 Binary files /dev/null and b/assets/image/grid/boat/anim_body/8.png differ diff --git a/assets/image/grid/boat/anim_body/9.png b/assets/image/grid/boat/anim_body/9.png new file mode 100644 index 0000000..6932994 Binary files /dev/null and b/assets/image/grid/boat/anim_body/9.png differ diff --git a/assets/image/grid/boat/animation/1.png b/assets/image/grid/boat/anim_bomb/1.png similarity index 100% rename from assets/image/grid/boat/animation/1.png rename to assets/image/grid/boat/anim_bomb/1.png diff --git a/assets/image/grid/boat/animation/10.png b/assets/image/grid/boat/anim_bomb/10.png similarity index 100% rename from assets/image/grid/boat/animation/10.png rename to assets/image/grid/boat/anim_bomb/10.png diff --git a/assets/image/grid/boat/animation/11.png b/assets/image/grid/boat/anim_bomb/11.png similarity index 100% rename from assets/image/grid/boat/animation/11.png rename to assets/image/grid/boat/anim_bomb/11.png diff --git a/assets/image/grid/boat/animation/12.png b/assets/image/grid/boat/anim_bomb/12.png similarity index 100% rename from assets/image/grid/boat/animation/12.png rename to assets/image/grid/boat/anim_bomb/12.png diff --git a/assets/image/grid/boat/animation/13.png b/assets/image/grid/boat/anim_bomb/13.png similarity index 100% rename from assets/image/grid/boat/animation/13.png rename to assets/image/grid/boat/anim_bomb/13.png diff --git a/assets/image/grid/boat/animation/14.png b/assets/image/grid/boat/anim_bomb/14.png similarity index 100% rename from assets/image/grid/boat/animation/14.png rename to assets/image/grid/boat/anim_bomb/14.png diff --git a/assets/image/grid/boat/animation/15.png b/assets/image/grid/boat/anim_bomb/15.png similarity index 100% rename from assets/image/grid/boat/animation/15.png rename to assets/image/grid/boat/anim_bomb/15.png diff --git a/assets/image/grid/boat/animation/16.png b/assets/image/grid/boat/anim_bomb/16.png similarity index 100% rename from assets/image/grid/boat/animation/16.png rename to assets/image/grid/boat/anim_bomb/16.png diff --git a/assets/image/grid/boat/animation/17.png b/assets/image/grid/boat/anim_bomb/17.png similarity index 100% rename from assets/image/grid/boat/animation/17.png rename to assets/image/grid/boat/anim_bomb/17.png diff --git a/assets/image/grid/boat/animation/18.png b/assets/image/grid/boat/anim_bomb/18.png similarity index 100% rename from assets/image/grid/boat/animation/18.png rename to assets/image/grid/boat/anim_bomb/18.png diff --git a/assets/image/grid/boat/animation/19.png b/assets/image/grid/boat/anim_bomb/19.png similarity index 100% rename from assets/image/grid/boat/animation/19.png rename to assets/image/grid/boat/anim_bomb/19.png diff --git a/assets/image/grid/boat/animation/2.png b/assets/image/grid/boat/anim_bomb/2.png similarity index 100% rename from assets/image/grid/boat/animation/2.png rename to assets/image/grid/boat/anim_bomb/2.png diff --git a/assets/image/grid/boat/animation/20.png b/assets/image/grid/boat/anim_bomb/20.png similarity index 100% rename from assets/image/grid/boat/animation/20.png rename to assets/image/grid/boat/anim_bomb/20.png diff --git a/assets/image/grid/boat/animation/21.png b/assets/image/grid/boat/anim_bomb/21.png similarity index 100% rename from assets/image/grid/boat/animation/21.png rename to assets/image/grid/boat/anim_bomb/21.png diff --git a/assets/image/grid/boat/animation/22.png b/assets/image/grid/boat/anim_bomb/22.png similarity index 100% rename from assets/image/grid/boat/animation/22.png rename to assets/image/grid/boat/anim_bomb/22.png diff --git a/assets/image/grid/boat/animation/23.png b/assets/image/grid/boat/anim_bomb/23.png similarity index 100% rename from assets/image/grid/boat/animation/23.png rename to assets/image/grid/boat/anim_bomb/23.png diff --git a/assets/image/grid/boat/animation/3.png b/assets/image/grid/boat/anim_bomb/3.png similarity index 100% rename from assets/image/grid/boat/animation/3.png rename to assets/image/grid/boat/anim_bomb/3.png diff --git a/assets/image/grid/boat/animation/4.png b/assets/image/grid/boat/anim_bomb/4.png similarity index 100% rename from assets/image/grid/boat/animation/4.png rename to assets/image/grid/boat/anim_bomb/4.png diff --git a/assets/image/grid/boat/animation/5.png b/assets/image/grid/boat/anim_bomb/5.png similarity index 100% rename from assets/image/grid/boat/animation/5.png rename to assets/image/grid/boat/anim_bomb/5.png diff --git a/assets/image/grid/boat/animation/6.png b/assets/image/grid/boat/anim_bomb/6.png similarity index 100% rename from assets/image/grid/boat/animation/6.png rename to assets/image/grid/boat/anim_bomb/6.png diff --git a/assets/image/grid/boat/animation/7.png b/assets/image/grid/boat/anim_bomb/7.png similarity index 100% rename from assets/image/grid/boat/animation/7.png rename to assets/image/grid/boat/anim_bomb/7.png diff --git a/assets/image/grid/boat/animation/8.png b/assets/image/grid/boat/anim_bomb/8.png similarity index 100% rename from assets/image/grid/boat/animation/8.png rename to assets/image/grid/boat/anim_bomb/8.png diff --git a/assets/image/grid/boat/animation/9.png b/assets/image/grid/boat/anim_bomb/9.png similarity index 100% rename from assets/image/grid/boat/animation/9.png rename to assets/image/grid/boat/anim_bomb/9.png diff --git a/assets/image/grid/boat/anim_edge/1.png b/assets/image/grid/boat/anim_edge/1.png new file mode 100644 index 0000000..24b82a6 Binary files /dev/null and b/assets/image/grid/boat/anim_edge/1.png differ diff --git a/assets/image/grid/boat/anim_edge/10.png b/assets/image/grid/boat/anim_edge/10.png new file mode 100644 index 0000000..55e8eb5 Binary files /dev/null and b/assets/image/grid/boat/anim_edge/10.png differ diff --git a/assets/image/grid/boat/anim_edge/11.png b/assets/image/grid/boat/anim_edge/11.png new file mode 100644 index 0000000..d7c8eba Binary files /dev/null and b/assets/image/grid/boat/anim_edge/11.png differ diff --git a/assets/image/grid/boat/anim_edge/12.png b/assets/image/grid/boat/anim_edge/12.png new file mode 100644 index 0000000..6368bfa Binary files /dev/null and b/assets/image/grid/boat/anim_edge/12.png differ diff --git a/assets/image/grid/boat/anim_edge/13.png b/assets/image/grid/boat/anim_edge/13.png new file mode 100644 index 0000000..57e97ee Binary files /dev/null and b/assets/image/grid/boat/anim_edge/13.png differ diff --git a/assets/image/grid/boat/anim_edge/14.png b/assets/image/grid/boat/anim_edge/14.png new file mode 100644 index 0000000..715c0a3 Binary files /dev/null and b/assets/image/grid/boat/anim_edge/14.png differ diff --git a/assets/image/grid/boat/anim_edge/2.png b/assets/image/grid/boat/anim_edge/2.png new file mode 100644 index 0000000..fd5407b Binary files /dev/null and b/assets/image/grid/boat/anim_edge/2.png differ diff --git a/assets/image/grid/boat/anim_edge/3.png b/assets/image/grid/boat/anim_edge/3.png new file mode 100644 index 0000000..3be5090 Binary files /dev/null and b/assets/image/grid/boat/anim_edge/3.png differ diff --git a/assets/image/grid/boat/anim_edge/4.png b/assets/image/grid/boat/anim_edge/4.png new file mode 100644 index 0000000..b9e72b4 Binary files /dev/null and b/assets/image/grid/boat/anim_edge/4.png differ diff --git a/assets/image/grid/boat/anim_edge/5.png b/assets/image/grid/boat/anim_edge/5.png new file mode 100644 index 0000000..4e6478b Binary files /dev/null and b/assets/image/grid/boat/anim_edge/5.png differ diff --git a/assets/image/grid/boat/anim_edge/6.png b/assets/image/grid/boat/anim_edge/6.png new file mode 100644 index 0000000..d2b37c5 Binary files /dev/null and b/assets/image/grid/boat/anim_edge/6.png differ diff --git a/assets/image/grid/boat/anim_edge/7.png b/assets/image/grid/boat/anim_edge/7.png new file mode 100644 index 0000000..f6cb803 Binary files /dev/null and b/assets/image/grid/boat/anim_edge/7.png differ diff --git a/assets/image/grid/boat/anim_edge/8.png b/assets/image/grid/boat/anim_edge/8.png new file mode 100644 index 0000000..b1f1f58 Binary files /dev/null and b/assets/image/grid/boat/anim_edge/8.png differ diff --git a/assets/image/grid/boat/anim_edge/9.png b/assets/image/grid/boat/anim_edge/9.png new file mode 100644 index 0000000..c735359 Binary files /dev/null and b/assets/image/grid/boat/anim_edge/9.png differ diff --git a/assets/image/grid/boat/anim_solo/1.png b/assets/image/grid/boat/anim_solo/1.png new file mode 100644 index 0000000..4de7e88 Binary files /dev/null and b/assets/image/grid/boat/anim_solo/1.png differ diff --git a/assets/image/grid/boat/anim_solo/10.png b/assets/image/grid/boat/anim_solo/10.png new file mode 100644 index 0000000..5ab1e0d Binary files /dev/null and b/assets/image/grid/boat/anim_solo/10.png differ diff --git a/assets/image/grid/boat/anim_solo/11.png b/assets/image/grid/boat/anim_solo/11.png new file mode 100644 index 0000000..abb5f50 Binary files /dev/null and b/assets/image/grid/boat/anim_solo/11.png differ diff --git a/assets/image/grid/boat/anim_solo/12.png b/assets/image/grid/boat/anim_solo/12.png new file mode 100644 index 0000000..1e2eced Binary files /dev/null and b/assets/image/grid/boat/anim_solo/12.png differ diff --git a/assets/image/grid/boat/anim_solo/13.png b/assets/image/grid/boat/anim_solo/13.png new file mode 100644 index 0000000..ab9dfc2 Binary files /dev/null and b/assets/image/grid/boat/anim_solo/13.png differ diff --git a/assets/image/grid/boat/anim_solo/14.png b/assets/image/grid/boat/anim_solo/14.png new file mode 100644 index 0000000..3ffd939 Binary files /dev/null and b/assets/image/grid/boat/anim_solo/14.png differ diff --git a/assets/image/grid/boat/anim_solo/2.png b/assets/image/grid/boat/anim_solo/2.png new file mode 100644 index 0000000..533ed0b Binary files /dev/null and b/assets/image/grid/boat/anim_solo/2.png differ diff --git a/assets/image/grid/boat/anim_solo/3.png b/assets/image/grid/boat/anim_solo/3.png new file mode 100644 index 0000000..76d080a Binary files /dev/null and b/assets/image/grid/boat/anim_solo/3.png differ diff --git a/assets/image/grid/boat/anim_solo/4.png b/assets/image/grid/boat/anim_solo/4.png new file mode 100644 index 0000000..8b0abd6 Binary files /dev/null and b/assets/image/grid/boat/anim_solo/4.png differ diff --git a/assets/image/grid/boat/anim_solo/5.png b/assets/image/grid/boat/anim_solo/5.png new file mode 100644 index 0000000..d71a3ff Binary files /dev/null and b/assets/image/grid/boat/anim_solo/5.png differ diff --git a/assets/image/grid/boat/anim_solo/6.png b/assets/image/grid/boat/anim_solo/6.png new file mode 100644 index 0000000..2bab372 Binary files /dev/null and b/assets/image/grid/boat/anim_solo/6.png differ diff --git a/assets/image/grid/boat/anim_solo/7.png b/assets/image/grid/boat/anim_solo/7.png new file mode 100644 index 0000000..ccdb787 Binary files /dev/null and b/assets/image/grid/boat/anim_solo/7.png differ diff --git a/assets/image/grid/boat/anim_solo/8.png b/assets/image/grid/boat/anim_solo/8.png new file mode 100644 index 0000000..70349a4 Binary files /dev/null and b/assets/image/grid/boat/anim_solo/8.png differ diff --git a/assets/image/grid/boat/anim_solo/9.png b/assets/image/grid/boat/anim_solo/9.png new file mode 100644 index 0000000..11fbd9d Binary files /dev/null and b/assets/image/grid/boat/anim_solo/9.png differ diff --git a/assets/image/grid/boat/edge.png b/assets/image/grid/boat/edge.png index ab9e4ed..c8a519b 100644 Binary files a/assets/image/grid/boat/edge.png and b/assets/image/grid/boat/edge.png differ diff --git a/assets/image/grid/boat/preview_body.png b/assets/image/grid/boat/preview_body.png new file mode 100644 index 0000000..d0ef9f4 Binary files /dev/null and b/assets/image/grid/boat/preview_body.png differ diff --git a/assets/image/grid/boat/preview_edge.png b/assets/image/grid/boat/preview_edge.png new file mode 100644 index 0000000..658b1cb Binary files /dev/null and b/assets/image/grid/boat/preview_edge.png differ diff --git a/assets/image/grid/boat/preview_solo.png b/assets/image/grid/boat/preview_solo.png new file mode 100644 index 0000000..dd323f0 Binary files /dev/null and b/assets/image/grid/boat/preview_solo.png differ diff --git a/assets/image/replay/next.png b/assets/image/replay/next.png deleted file mode 100644 index 6334b62..0000000 Binary files a/assets/image/replay/next.png and /dev/null differ diff --git a/assets/image/replay/previous.png b/assets/image/replay/previous.png deleted file mode 100644 index 5d65683..0000000 Binary files a/assets/image/replay/previous.png and /dev/null differ diff --git a/source/gui/texture/Grid.py b/source/gui/texture/Grid.py index 22d313e..b2aa258 100644 --- a/source/gui/texture/Grid.py +++ b/source/gui/texture/Grid.py @@ -12,14 +12,18 @@ class Grid: class Boat: class Style1(Style): - _animation = sorted( - (path_boat / "animation").iterdir(), - key=lambda path: int(path.stem) - ) + _anim_bomb = sorted((path_boat / "anim_bomb").iterdir(), key=lambda path: int(path.stem)) + _anim_body = sorted((path_boat / "anim_body").iterdir(), key=lambda path: int(path.stem)) + _anim_edge = sorted((path_boat / "anim_edge").iterdir(), key=lambda path: int(path.stem)) + _anim_solo = sorted((path_boat / "anim_solo").iterdir(), key=lambda path: int(path.stem)) - body = Texture(path_boat / "body.png") - edge = Texture(path_boat / "edge.png") - solo = Texture(path_boat / "solo.png") + body = Animation([*_anim_body, path_boat / "body.png"], 0.03, False) + edge = Animation([*_anim_edge, path_boat / "edge.png"], 0.03, False) + solo = Animation([*_anim_solo, path_boat / "solo.png"], 0.03, False) - missed = Animation([*_animation, path_boat / "missed.png"], 0.03, False) - touched = Animation([*_animation, path_boat / "touched.png"], 0.03, False) + preview_body = Texture(path_boat / "preview_body.png") + preview_edge = Texture(path_boat / "preview_edge.png") + preview_solo = Texture(path_boat / "preview_solo.png") + + missed = Animation([*_anim_bomb, path_boat / "missed.png"], 0.03, False) + touched = Animation([*_anim_bomb, path_boat / "touched.png"], 0.03, False) diff --git a/source/gui/texture/Replay.py b/source/gui/texture/Replay.py deleted file mode 100644 index df48897..0000000 --- a/source/gui/texture/Replay.py +++ /dev/null @@ -1,11 +0,0 @@ -from .abc import Style -from .type import Texture -from source.path import path_image - -path = path_image / "replay" - - -class Replay: - class Style1(Style): - previous = Texture(path / "previous.png") - next = Texture(path / "next.png") diff --git a/source/gui/widget/GameGrid.py b/source/gui/widget/GameGrid.py index cd4e08e..71ac309 100644 --- a/source/gui/widget/GameGrid.py +++ b/source/gui/widget/GameGrid.py @@ -10,7 +10,7 @@ from source.core.error import InvalidBoatPosition from source.gui.better_pyglet import Sprite from source.gui.texture.abc import Style from source.gui.widget.abc import BoxWidget -from source.type import Distance, ColorRGB, Point2D +from source.type import Distance, Point2D from source.utils import dict_filter_prefix if TYPE_CHECKING: @@ -32,7 +32,6 @@ class GameGrid(BoxWidget): width: Distance = None, height: Distance = None, - preview_color: ColorRGB = (150, 255, 150), boats_length: list[int] = None, rows: int = None, @@ -52,7 +51,6 @@ class GameGrid(BoxWidget): # the list of the size of the boats to place self.boats_length = [] if boats_length is None else sorted(boats_length, reverse=True) - self.preview_color = preview_color # créer la planche du jeu self.board = Board(width=rows, height=columns) if board_data is None else Board.from_json(board_data) @@ -200,9 +198,10 @@ class GameGrid(BoxWidget): ) # si le bateau est le dernier placé et qu'on est en prévisualisation, change sa teinte. - color: ColorRGB = self.preview_color if preview and value == max_boat else (255, 255, 255) + if preview and value == max_boat: + form: str = f"preview_{form}" - hash_new = hash((form, rotation, color)) + hash_new = hash((form, rotation)) sprite_old, hash_old = self.cell_sprites.get((x, y), (None, None)) if hash_old == hash_new: @@ -215,7 +214,6 @@ class GameGrid(BoxWidget): **self._boat_kwargs ) sprite.rotation = rotation * 90 - sprite.color = color self.cell_sprites[x, y] = (sprite, hash_new)