diff --git a/assets/textures/button_menu.png b/assets/textures/button_menu.png new file mode 100644 index 0000000..e84924d Binary files /dev/null and b/assets/textures/button_menu.png differ diff --git a/assets/textures/button_menu_hover.png b/assets/textures/button_menu_hover.png new file mode 100644 index 0000000..f630046 Binary files /dev/null and b/assets/textures/button_menu_hover.png differ diff --git a/assets/textures/button_no.png b/assets/textures/button_no.png new file mode 100644 index 0000000..5cfdda0 Binary files /dev/null and b/assets/textures/button_no.png differ diff --git a/assets/textures/button_no.png~ b/assets/textures/button_no.png~ new file mode 100644 index 0000000..ff01e8e Binary files /dev/null and b/assets/textures/button_no.png~ differ diff --git a/assets/textures/button_no_hover.png b/assets/textures/button_no_hover.png new file mode 100644 index 0000000..793de37 Binary files /dev/null and b/assets/textures/button_no_hover.png differ diff --git a/assets/textures/button_one_player.png b/assets/textures/button_one_player.png index 1251414..8b0c2f3 100644 Binary files a/assets/textures/button_one_player.png and b/assets/textures/button_one_player.png differ diff --git a/assets/textures/button_one_player_hover.png b/assets/textures/button_one_player_hover.png index 7bddfd5..18ca372 100644 Binary files a/assets/textures/button_one_player_hover.png and b/assets/textures/button_one_player_hover.png differ diff --git a/assets/textures/button_one_player_hover.png~ b/assets/textures/button_one_player_hover.png~ new file mode 100644 index 0000000..7bddfd5 Binary files /dev/null and b/assets/textures/button_one_player_hover.png~ differ diff --git a/assets/textures/button_submit.png b/assets/textures/button_submit.png new file mode 100644 index 0000000..20296f6 Binary files /dev/null and b/assets/textures/button_submit.png differ diff --git a/assets/textures/button_submit_hover.png b/assets/textures/button_submit_hover.png new file mode 100644 index 0000000..b0d7a23 Binary files /dev/null and b/assets/textures/button_submit_hover.png differ diff --git a/assets/textures/button_two_player.png b/assets/textures/button_two_player.png index 08c7a63..1f7ba88 100644 Binary files a/assets/textures/button_two_player.png and b/assets/textures/button_two_player.png differ diff --git a/assets/textures/button_two_player.png~ b/assets/textures/button_two_player.png~ new file mode 100644 index 0000000..08c7a63 Binary files /dev/null and b/assets/textures/button_two_player.png~ differ diff --git a/assets/textures/button_two_player_hover.png b/assets/textures/button_two_player_hover.png index f9700ec..f116c4f 100644 Binary files a/assets/textures/button_two_player_hover.png and b/assets/textures/button_two_player_hover.png differ diff --git a/assets/textures/button_two_player_hover.png~ b/assets/textures/button_two_player_hover.png~ new file mode 100644 index 0000000..f9700ec Binary files /dev/null and b/assets/textures/button_two_player_hover.png~ differ diff --git a/assets/textures/button_yes.png b/assets/textures/button_yes.png new file mode 100644 index 0000000..5227472 Binary files /dev/null and b/assets/textures/button_yes.png differ diff --git a/assets/textures/button_yes_hover.png b/assets/textures/button_yes_hover.png new file mode 100644 index 0000000..ea102a0 Binary files /dev/null and b/assets/textures/button_yes_hover.png differ diff --git a/src/scenes/game.py b/src/scenes/game.py index 786dcb9..4e44b84 100644 --- a/src/scenes/game.py +++ b/src/scenes/game.py @@ -202,6 +202,7 @@ def __spawn_elements(world: World): # Initialisation des scores world.set(Player1Score(0), Player2Score(0)) + # Creation du texte d'affichage en fonction du mode de jeu if world[GameMode] == GameMode.TWO: world.new_entity().set( TextBundle( @@ -257,6 +258,7 @@ def __bounce_on_player(a: Entity, b: Entity): """ Fonction qui decrit se qui se passe lorque la ball entre en collision avec un joueur """ + # Si l'objet rencontré est un joueur if Player1 in b or Player2 in b: speed = a[physics.Velocity].length a[physics.Velocity] = a[physics.Velocity].normalized @@ -264,16 +266,23 @@ def __bounce_on_player(a: Entity, b: Entity): a[physics.Velocity] = a[physics.Velocity].normalized * min( (speed * 1.1), 1000.0 ) + # Si il s'agit du joueur 1 et que l'on est dans le mode 1 joueur if Player1 in b and Ball in a: if b.world[GameMode] == GameMode.ONE: + # Modification du score a.world[Player1Score] += 100 __update_scores(a.world, b) return True def __bounce_on_top_or_bot_wall(a: Entity, b: Entity): + # Si une balle touceh un mur du haut ou du bas et que l'on est dans le mode 1 joueur + # Il est important de verifier qu'il s'agit de la balle, + # Car des simulation de balle sont faites et ont le meme + # Comportment qu'une balle mais n'ont pas le composant Ball if Ball in b and Wall in a: if b.world[GameMode] == GameMode.ONE: + # Modification du score a.world[Player1Score] += 20 __update_scores(a.world, a) return True @@ -312,7 +321,7 @@ def __bounce_on_right_wall(a: Entity, b: Entity): def __move_up(world: World): """ - La fonction permet de faire bouger les entitees vers le haut. + La fonction permet de faire bouger les entitees qui possedent UpKey vers le haut. """ held = world[Held] for entity in world.query(UpKey): @@ -325,7 +334,7 @@ def __move_up(world: World): def __move_down(world: World): """ - La fonction permet de faire bouger les entitees vers le bas. + La fonction permet de faire bouger les entitees qui possedent DownKey vers le bas. """ held = world[Held] for entity in world.query(DownKey): diff --git a/src/scenes/game_over.py b/src/scenes/game_over.py index 57dfc12..9f82074 100644 --- a/src/scenes/game_over.py +++ b/src/scenes/game_over.py @@ -36,7 +36,7 @@ def __spawn_elements(world: World): origin=Vec2(0.5), ) ) - button_name = ["one_player", "two_player"] + button_name = ["yes", "no"] for i, name in enumerate(button_name): __create_button(world, i, name) @@ -65,9 +65,9 @@ def __on_click_butons(world: World, _entity: Entity, name: str): Fonction qui s'execute quand on clique sur un bouton. """ match name: - case "one_player": + case "yes": world[CurrentScene] = send_to_server.SEND - case "two_player": + case "no": world[CurrentScene] = try_again.TRY_AGAIN case _: pass diff --git a/src/scenes/send_to_server.py b/src/scenes/send_to_server.py index 1929537..9fb555c 100644 --- a/src/scenes/send_to_server.py +++ b/src/scenes/send_to_server.py @@ -76,8 +76,8 @@ def __spawn_elements(world: World): origin=Vec2(0.5), ), HoveredTexture( - f"button_one_player.png", - f"button_one_player_hover.png", + f"button_submit.png", + f"button_submit_hover.png", ), Clickable(new_score), ) diff --git a/src/scenes/try_again.py b/src/scenes/try_again.py index 929643e..f1f4220 100644 --- a/src/scenes/try_again.py +++ b/src/scenes/try_again.py @@ -38,9 +38,9 @@ def __on_click_butons(world: World, _entity: Entity, name: str): Fonction qui s'execute quand on clique sur un bouton. """ match name: - case "one_player": + case "yes": world[CurrentScene] = menu.MENU - case "two_player": + case "no": world[CurrentScene] = game.ONE_PLAYER case _: pass @@ -61,7 +61,7 @@ def __spawn_elements(world: World): origin=Vec2(0.5), ), ) - scenes_name = ["one_player", "two_player"] + scenes_name = ["yes", "no"] for i, name in enumerate(scenes_name): __create_button(world, i, name)