diff --git a/Instrument/Corde.gd b/Instrument/Corde.gd deleted file mode 100644 index ebda478..0000000 --- a/Instrument/Corde.gd +++ /dev/null @@ -1,8 +0,0 @@ -extends Instrument -class_name Corde - -func _init(nom : String) -> void: - super(nom) - -func pincer() -> void: - print("On pince l'instrument %s." % nom) diff --git a/Instrument/Flute.gd b/Instrument/Flute.gd deleted file mode 100644 index c211405..0000000 --- a/Instrument/Flute.gd +++ /dev/null @@ -1,19 +0,0 @@ -extends Vent - -var Balle = preload("res://scenes/Attaque/Balle.tscn").instantiate() # Charger le nœud Balle - -func _init() -> void: - super("Flûte") - -func jouer_melodie(player_position) -> void: - print("La flûte joue une mélodie.") - jouer() - spawn_balle(player_position) - - -func spawn_balle(player_position) -> void: - # Assurez-vous que vous ajoutez la balle comme enfant dans une scène appropriée - if Balle: - Balle.position = player_position # Place la balle à la position actuelle du joueur - else: - print("Erreur : la création de la balle a échoué.") diff --git a/Instrument/Instrument.gd b/Instrument/Instrument.gd deleted file mode 100644 index 484c935..0000000 --- a/Instrument/Instrument.gd +++ /dev/null @@ -1,9 +0,0 @@ -class_name Instrument - -var nom : String - -func _init(nom : String) -> void: - self.nom = nom - -func jouer() -> void: - print("L'instrument %s est joué." % nom) diff --git a/Instrument/Percusson.gd b/Instrument/Percusson.gd deleted file mode 100644 index 168ef6b..0000000 --- a/Instrument/Percusson.gd +++ /dev/null @@ -1,9 +0,0 @@ -extends Instrument -class_name Percussion - - -func _init(nom : String) -> void: - super(nom) - -func frapper() -> void: - print("On frappe l'instrument %s." % nom) diff --git a/Instrument/Tambour.gd b/Instrument/Tambour.gd deleted file mode 100644 index c17e019..0000000 --- a/Instrument/Tambour.gd +++ /dev/null @@ -1,8 +0,0 @@ -extends Percussion - -func _init() -> void: - super("Tambour") - -func faire_roulement() -> void: - print("Le tambour fait un roulement.") - jouer() diff --git a/Instrument/Vent.gd b/Instrument/Vent.gd deleted file mode 100644 index d557412..0000000 --- a/Instrument/Vent.gd +++ /dev/null @@ -1,8 +0,0 @@ -extends Instrument -class_name Vent - -func _init(nom : String) -> void: - super(nom) - -func souffler() -> void: - print("On souffle dans l'instrument %s." % nom) diff --git a/project.godot b/project.godot index db07fcc..9da3292 100644 --- a/project.godot +++ b/project.godot @@ -52,11 +52,6 @@ PAUSE={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } -JOUER_MUSIQUE={ -"deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) -] -} [rendering] diff --git a/ressources/images/note1.png b/ressources/images/note1.png deleted file mode 100644 index e529fb1..0000000 Binary files a/ressources/images/note1.png and /dev/null differ diff --git a/ressources/images/note1.png.import b/ressources/images/note1.png.import deleted file mode 100644 index 6d56d4b..0000000 --- a/ressources/images/note1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ge7xtkpw6hgb" -path="res://.godot/imported/note1.png-96f27d997f75f6c14a701aa9df88a950.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/note1.png" -dest_files=["res://.godot/imported/note1.png-96f27d997f75f6c14a701aa9df88a950.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/ressources/images/note2.png b/ressources/images/note2.png deleted file mode 100644 index 08d8cd4..0000000 Binary files a/ressources/images/note2.png and /dev/null differ diff --git a/ressources/images/note2.png.import b/ressources/images/note2.png.import deleted file mode 100644 index fbb7ba0..0000000 --- a/ressources/images/note2.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://nb4g0mje6w08" -path="res://.godot/imported/note2.png-7ddebed95ea93b6f57090ac58466a01e.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/note2.png" -dest_files=["res://.godot/imported/note2.png-7ddebed95ea93b6f57090ac58466a01e.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/ressources/images/note3.png b/ressources/images/note3.png deleted file mode 100644 index 35cfa23..0000000 Binary files a/ressources/images/note3.png and /dev/null differ diff --git a/ressources/images/note3.png.import b/ressources/images/note3.png.import deleted file mode 100644 index 2b16d6e..0000000 --- a/ressources/images/note3.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ejn64hq1j8cb" -path="res://.godot/imported/note3.png-3a2fd90f8e888d278f8e7c03cb67db73.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/note3.png" -dest_files=["res://.godot/imported/note3.png-3a2fd90f8e888d278f8e7c03cb67db73.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/scenes/Attaque/Balle.tscn b/scenes/Attaque/Balle.tscn deleted file mode 100644 index c6599bb..0000000 --- a/scenes/Attaque/Balle.tscn +++ /dev/null @@ -1,13 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://btpp8l4efhrmj"] - -[ext_resource type="Texture2D" uid="uid://ge7xtkpw6hgb" path="res://ressources/images/note1.png" id="1_qx664"] - -[node name="Balle1" type="CharacterBody2D"] - -[node name="Sprite2D" type="Sprite2D" parent="."] -rotation = 3.14159 -texture = ExtResource("1_qx664") - -[node name="RayCast2D" type="RayCast2D" parent="."] -position = Vector2(0, -7) -target_position = Vector2(0, 15) diff --git a/scenes/Room.tscn b/scenes/Room.tscn index 39c2dff..5f29738 100644 --- a/scenes/Room.tscn +++ b/scenes/Room.tscn @@ -33,18 +33,18 @@ scale = Vector2(4, 4) [node name="StaticBody2D" type="StaticBody2D" parent="."] -[node name="Bottom Wall" type="CollisionShape2D" parent="StaticBody2D"] -position = Vector2(3, 721) -shape = SubResource("RectangleShape2D_18mp2") +[node name="World Border Up" type="CollisionShape2D" parent="StaticBody2D"] +shape = SubResource("WorldBoundaryShape2D_1c4te") -[node name="Top Wall" type="CollisionShape2D" parent="StaticBody2D"] -position = Vector2(0, -719) -shape = SubResource("RectangleShape2D_18mp2") +[node name="World Border Down" type="CollisionShape2D" parent="StaticBody2D"] +shape = SubResource("WorldBoundaryShape2D_qq3vn") -[node name="Left Wall" type="CollisionShape2D" parent="StaticBody2D"] -position = Vector2(-1278, -2) -shape = SubResource("RectangleShape2D_18mp2") +[node name="World Border Right" type="CollisionShape2D" parent="StaticBody2D"] +shape = SubResource("WorldBoundaryShape2D_e1nqi") -[node name="Right Wall" type="CollisionShape2D" parent="StaticBody2D"] -position = Vector2(1280, -4) -shape = SubResource("RectangleShape2D_18mp2") +[node name="World Border Left" type="CollisionShape2D" parent="StaticBody2D"] +shape = SubResource("WorldBoundaryShape2D_ia1hi") + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="Camera2D" type="Camera2D" parent="CanvasLayer"] diff --git a/scripts/player_control.gd b/scripts/player_control.gd index 8a7a012..84c70a5 100644 --- a/scripts/player_control.gd +++ b/scripts/player_control.gd @@ -6,11 +6,6 @@ const max_boost_speed = 800 var previous_direction = Vector2.ZERO var boost_speed = 0 -var flute = null - -func _ready() -> void: - flute = load("res://Instrument/Flute.gd").new() - flute._init() func _physics_process(delta: float) -> void: @@ -33,6 +28,5 @@ func _process(delta: float) -> void: previous_direction = direction velocity = direction * (move_speed + boost_speed) - - if Input.is_action_just_pressed("JOUER_MUSIQUE"): - flute.jouer_melodie(position) + print(velocity) + pass