diff --git a/assets/textures/button_yes.png b/assets/textures/button_continue.png similarity index 100% rename from assets/textures/button_yes.png rename to assets/textures/button_continue.png diff --git a/assets/textures/button_yes_hover.png b/assets/textures/button_continue_hover.png similarity index 100% rename from assets/textures/button_yes_hover.png rename to assets/textures/button_continue_hover.png diff --git a/assets/textures/button_no.png b/assets/textures/button_no.png deleted file mode 100644 index 5cfdda0..0000000 Binary files a/assets/textures/button_no.png and /dev/null differ diff --git a/assets/textures/button_no.png~ b/assets/textures/button_no.png~ deleted file mode 100644 index ff01e8e..0000000 Binary files a/assets/textures/button_no.png~ and /dev/null differ diff --git a/assets/textures/button_one_player_hover.png~ b/assets/textures/button_one_player_hover.png~ deleted file mode 100644 index 7bddfd5..0000000 Binary files a/assets/textures/button_one_player_hover.png~ and /dev/null differ diff --git a/assets/textures/button_two_player.png~ b/assets/textures/button_two_player.png~ deleted file mode 100644 index 08c7a63..0000000 Binary files a/assets/textures/button_two_player.png~ and /dev/null differ diff --git a/assets/textures/button_two_player_hover.png~ b/assets/textures/button_two_player_hover.png~ deleted file mode 100644 index f9700ec..0000000 Binary files a/assets/textures/button_two_player_hover.png~ and /dev/null differ diff --git a/src/scenes/game_over.py b/src/scenes/game_over.py index 38cfa4e..1021949 100644 --- a/src/scenes/game_over.py +++ b/src/scenes/game_over.py @@ -4,12 +4,13 @@ from engine.math import Vec2 from plugins import render from plugins.click import Clickable from plugins.hover import HoveredTexture +from plugins.inputs import Pressed from plugins.render import ( SpriteBundle, TextBundle, ) from plugins.sound import Sound -from scenes import game, send_to_server, try_again +from scenes import game, send_to_server def __spawn_elements(world: World): @@ -36,21 +37,17 @@ def __spawn_elements(world: World): origin=Vec2(0.5), ) ) - button_name = ["yes", "no"] - for i, name in enumerate(button_name): - __create_button(world, i, name) + __create_button(world, "continue") -def __create_button(world: World, i: int, name: str): +def __create_button(world: World, name: str): """ Ajoute un bouton au monde. """ - if i == 0: - i = -1 world.new_entity().set( SpriteBundle( f"button_{name}.png", - position=Vec2(render.WIDTH / 2 + 300 * i, 800), + position=Vec2(render.WIDTH / 2, 800), order=1, origin=Vec2(0.5), ), @@ -66,18 +63,21 @@ def __on_click_butons(world: World, _entity: Entity, name: str): """ Fonction qui s'execute quand on clique sur un bouton. """ - match name: - case "yes": - world[CurrentScene] = send_to_server.SEND - case "no": - world[CurrentScene] = try_again.TRY_AGAIN - case _: - pass + world[CurrentScene] = send_to_server.SEND world.new_entity().set(KeepAlive(), Sound("click.wav")) +def __enter_to_submit(world: World): + """ + Envoit le score losre que l'utilisateur appuie sur entrée. + """ + if "return" in world[Pressed]: + world[CurrentScene] = send_to_server.SEND + world.new_entity().set(KeepAlive(), Sound("click.wav")) + + GAME_OVER = Scene( [__spawn_elements], - [], + [__enter_to_submit], [], ) diff --git a/src/scenes/try_again.py b/src/scenes/try_again.py deleted file mode 100644 index 8ea150b..0000000 --- a/src/scenes/try_again.py +++ /dev/null @@ -1,75 +0,0 @@ -""" -La scène du menu principal du jeu. - -Dans cette scène nous pouvons choisir le mode de jeu. -""" -from plugins.sound import Sound -from engine import CurrentScene, KeepAlive, Scene -from engine.ecs import Entity, World -from engine.math import Vec2 -from plugins import render -from plugins.click import Clickable -from plugins.hover import HoveredTexture -from plugins.render import SpriteBundle, TextBundle -from scenes import game, menu - - -def __create_button(world: World, i: int, name: str): - """ - Ajoute un bouton au monde. - """ - if i == 0: - i = -1 - world.new_entity().set( - SpriteBundle( - f"button_{name}.png", - position=Vec2(render.WIDTH / 2 + 300 * i, 800), - order=1, - origin=Vec2(0.5), - ), - HoveredTexture( - f"button_{name}.png", - f"button_{name}_hover.png", - ), - Clickable(lambda world, entity: __on_click_butons(world, entity, name)), - ) - - -def __on_click_butons(world: World, _entity: Entity, name: str): - """ - Fonction qui s'execute quand on clique sur un bouton. - """ - match name: - case "yes": - world[CurrentScene] = menu.MENU - case "no": - world[CurrentScene] = game.ONE_PLAYER - case _: - pass - world.new_entity().set(KeepAlive(), Sound("click.wav")) - - -def __spawn_elements(world: World): - """ - Ajoute les éléments du menu dans le monde. - """ - - world.new_entity().set(SpriteBundle("background.png", -5)) - world.new_entity().set( - TextBundle( - "Voulez vous changer de mode de jeu ?", - 0, - position=Vec2(render.WIDTH / 2, 350), - origin=Vec2(0.5), - ), - ) - scenes_name = ["yes", "no"] - for i, name in enumerate(scenes_name): - __create_button(world, i, name) - - -TRY_AGAIN = Scene( - [__spawn_elements], - [], - [], -)