From 9d772a419bd8bb651e35040c1c15b986c04a3c86 Mon Sep 17 00:00:00 2001 From: Elouan Date: Sat, 25 Jan 2025 04:34:25 +0100 Subject: [PATCH 1/8] ajout de l animation d attaque de l enemi --- ressources/sons/melodie-bobo-1.mp3.import | 19 +++++++++++++++++++ ressources/sons/melodie-bobo-2.mp3.import | 19 +++++++++++++++++++ ressources/sons/melodie-bobo-3.mp3.import | 19 +++++++++++++++++++ ressources/sons/melodie-bobo-4.mp3.import | 19 +++++++++++++++++++ ressources/sons/melodie-bobo-5.mp3.import | 19 +++++++++++++++++++ scenes/ecran_mort.tscn | 1 + scenes/enemies/poulpe.gd | 1 + scenes/enemies/poulpe.tscn | 13 +++++++++++-- scenes/enemies/robot.tscn | 21 +++++++++++++++++++-- 9 files changed, 127 insertions(+), 4 deletions(-) create mode 100644 ressources/sons/melodie-bobo-1.mp3.import create mode 100644 ressources/sons/melodie-bobo-2.mp3.import create mode 100644 ressources/sons/melodie-bobo-3.mp3.import create mode 100644 ressources/sons/melodie-bobo-4.mp3.import create mode 100644 ressources/sons/melodie-bobo-5.mp3.import diff --git a/ressources/sons/melodie-bobo-1.mp3.import b/ressources/sons/melodie-bobo-1.mp3.import new file mode 100644 index 0000000..a34d701 --- /dev/null +++ b/ressources/sons/melodie-bobo-1.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://17l5y4daoi6f" +path="res://.godot/imported/melodie-bobo-1.mp3-7aa3030b2c790daa8c4313aa01ae98f9.mp3str" + +[deps] + +source_file="res://ressources/sons/melodie-bobo-1.mp3" +dest_files=["res://.godot/imported/melodie-bobo-1.mp3-7aa3030b2c790daa8c4313aa01ae98f9.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/melodie-bobo-2.mp3.import b/ressources/sons/melodie-bobo-2.mp3.import new file mode 100644 index 0000000..11c58c1 --- /dev/null +++ b/ressources/sons/melodie-bobo-2.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://dvx77b2ja5e1t" +path="res://.godot/imported/melodie-bobo-2.mp3-bb198435e05ddb0da77a07ac4cfc56ba.mp3str" + +[deps] + +source_file="res://ressources/sons/melodie-bobo-2.mp3" +dest_files=["res://.godot/imported/melodie-bobo-2.mp3-bb198435e05ddb0da77a07ac4cfc56ba.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/melodie-bobo-3.mp3.import b/ressources/sons/melodie-bobo-3.mp3.import new file mode 100644 index 0000000..530e95a --- /dev/null +++ b/ressources/sons/melodie-bobo-3.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://noeysgss5wsi" +path="res://.godot/imported/melodie-bobo-3.mp3-12ce345635646780a00ff0064dda381b.mp3str" + +[deps] + +source_file="res://ressources/sons/melodie-bobo-3.mp3" +dest_files=["res://.godot/imported/melodie-bobo-3.mp3-12ce345635646780a00ff0064dda381b.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/melodie-bobo-4.mp3.import b/ressources/sons/melodie-bobo-4.mp3.import new file mode 100644 index 0000000..1e057e5 --- /dev/null +++ b/ressources/sons/melodie-bobo-4.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://b0y2n4slo8k3f" +path="res://.godot/imported/melodie-bobo-4.mp3-85d81fc35615c5448418bb695518b42e.mp3str" + +[deps] + +source_file="res://ressources/sons/melodie-bobo-4.mp3" +dest_files=["res://.godot/imported/melodie-bobo-4.mp3-85d81fc35615c5448418bb695518b42e.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/melodie-bobo-5.mp3.import b/ressources/sons/melodie-bobo-5.mp3.import new file mode 100644 index 0000000..d40abfa --- /dev/null +++ b/ressources/sons/melodie-bobo-5.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bpdelql7a1hfb" +path="res://.godot/imported/melodie-bobo-5.mp3-3f367a2a630c34a5f2323ebc8535769d.mp3str" + +[deps] + +source_file="res://ressources/sons/melodie-bobo-5.mp3" +dest_files=["res://.godot/imported/melodie-bobo-5.mp3-3f367a2a630c34a5f2323ebc8535769d.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/scenes/ecran_mort.tscn b/scenes/ecran_mort.tscn index eedf053..5b67c3e 100644 --- a/scenes/ecran_mort.tscn +++ b/scenes/ecran_mort.tscn @@ -37,6 +37,7 @@ expand_mode = 1 [node name="Mort" type="Label" parent="HBoxContainer/VBoxContainer/TextureRect"] modulate = Color(0.917647, 0.941176, 0.847059, 1) self_modulate = Color(0.917647, 0.941176, 0.847059, 1) +layout_mode = 0 offset_left = 89.0 offset_top = 187.0 offset_right = 414.0 diff --git a/scenes/enemies/poulpe.gd b/scenes/enemies/poulpe.gd index c560819..894e5b4 100644 --- a/scenes/enemies/poulpe.gd +++ b/scenes/enemies/poulpe.gd @@ -42,6 +42,7 @@ func _process(delta: float) -> void: func attaquer_joueur() -> void: + $AnimatedSprite2D.play("Attack") balle = Balle.instantiate() balle.set_direction(target_position) balle.position = position diff --git a/scenes/enemies/poulpe.tscn b/scenes/enemies/poulpe.tscn index 4c746c7..4a9adf6 100644 --- a/scenes/enemies/poulpe.tscn +++ b/scenes/enemies/poulpe.tscn @@ -1,13 +1,22 @@ -[gd_scene load_steps=6 format=3 uid="uid://voiqrkjd02om"] +[gd_scene load_steps=7 format=3 uid="uid://voiqrkjd02om"] [ext_resource type="Script" path="res://scenes/enemies/poulpe.gd" id="1_hu6wh"] [ext_resource type="Texture2D" uid="uid://2spn60rmdyy5" path="res://ressources/images/poulpe-1.png" id="1_lgwa7"] [ext_resource type="Texture2D" uid="uid://b4ukmsspx16f" path="res://ressources/images/poulpe-2.png" id="2_5x4i5"] +[ext_resource type="Texture2D" uid="uid://dinxaox0ug7kx" path="res://ressources/images/poulpe-atk.png" id="2_ketov"] [sub_resource type="SpriteFrames" id="SpriteFrames_2hq77"] animations = [{ "frames": [{ "duration": 1.0, +"texture": ExtResource("2_ketov") +}], +"loop": true, +"name": &"Attack", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, "texture": ExtResource("1_lgwa7") }, { "duration": 1.0, @@ -27,7 +36,7 @@ script = ExtResource("1_hu6wh") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] scale = Vector2(0.4, 0.4) sprite_frames = SubResource("SpriteFrames_2hq77") -animation = &"Generic" +animation = &"Attack" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("CircleShape2D_s7foh") diff --git a/scenes/enemies/robot.tscn b/scenes/enemies/robot.tscn index 4eeb8de..6137bef 100644 --- a/scenes/enemies/robot.tscn +++ b/scenes/enemies/robot.tscn @@ -1,14 +1,27 @@ -[gd_scene load_steps=7 format=3 uid="uid://cm5spgl8o4fam"] +[gd_scene load_steps=11 format=3 uid="uid://cm5spgl8o4fam"] [ext_resource type="Texture2D" uid="uid://dwwe0eanmrcra" path="res://ressources/images/roby-idle-0.png" id="1_mo3hb"] [ext_resource type="Script" path="res://scenes/enemies/robot.gd" id="1_tikkk"] [ext_resource type="Texture2D" uid="uid://8m84oe4oes3u" path="res://ressources/images/roby-idle-1.png" id="2_4n77m"] [ext_resource type="Texture2D" uid="uid://dcyf6teijpttj" path="res://ressources/images/roby-idle-2.png" id="3_8bmqk"] +[ext_resource type="Texture2D" uid="uid://duto5skmjixh6" path="res://ressources/images/roby-atk-0.png" id="5_muiti"] +[ext_resource type="Texture2D" uid="uid://8xhcmbkyxlwb" path="res://ressources/images/roby-atk-1.png" id="6_otdac"] +[ext_resource type="Texture2D" uid="uid://br8d144g0u2le" path="res://ressources/images/roby-atk-2.png" id="7_nsi5m"] +[ext_resource type="Texture2D" uid="uid://cxvxfwv2nii64" path="res://ressources/images/roby-atk-3.png" id="8_tsp5e"] [sub_resource type="SpriteFrames" id="SpriteFrames_vaeha"] animations = [{ "frames": [{ "duration": 1.0, +"texture": ExtResource("6_otdac") +}, { +"duration": 1.0, +"texture": ExtResource("7_nsi5m") +}, { +"duration": 1.0, +"texture": ExtResource("8_tsp5e") +}, { +"duration": 1.0, "texture": ExtResource("1_mo3hb") }, { "duration": 1.0, @@ -16,10 +29,13 @@ animations = [{ }, { "duration": 1.0, "texture": ExtResource("3_8bmqk") +}, { +"duration": 1.0, +"texture": ExtResource("5_muiti") }], "loop": true, "name": &"Generic", -"speed": 5.0 +"speed": 7.0 }] [sub_resource type="RectangleShape2D" id="RectangleShape2D_utjf8"] @@ -31,6 +47,7 @@ script = ExtResource("1_tikkk") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] sprite_frames = SubResource("SpriteFrames_vaeha") animation = &"Generic" +frame_progress = 0.0803078 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2(-2, 6.5) From 142500fdd8c97ff7904436b8db6cb340a2b146c6 Mon Sep 17 00:00:00 2001 From: Renarde-dev Date: Sat, 25 Jan 2025 05:54:27 +0100 Subject: [PATCH 2/8] Pickup flute --- ressources/sons/melodie-bobo-1.mp3.import | 19 ++++++ ressources/sons/melodie-bobo-2.mp3.import | 19 ++++++ ressources/sons/melodie-bobo-3.mp3.import | 19 ++++++ ressources/sons/melodie-bobo-4.mp3.import | 19 ++++++ ressources/sons/melodie-bobo-5.mp3.import | 19 ++++++ scenes/Room.tscn | 14 ++--- scenes/pickups/flute_pickup.tscn | 21 +++++++ scripts/Instrument/flute_pickup.gd | 18 ++++++ scripts/player_control.gd | 72 +++++++++++++---------- 9 files changed, 181 insertions(+), 39 deletions(-) create mode 100644 ressources/sons/melodie-bobo-1.mp3.import create mode 100644 ressources/sons/melodie-bobo-2.mp3.import create mode 100644 ressources/sons/melodie-bobo-3.mp3.import create mode 100644 ressources/sons/melodie-bobo-4.mp3.import create mode 100644 ressources/sons/melodie-bobo-5.mp3.import create mode 100644 scenes/pickups/flute_pickup.tscn create mode 100644 scripts/Instrument/flute_pickup.gd diff --git a/ressources/sons/melodie-bobo-1.mp3.import b/ressources/sons/melodie-bobo-1.mp3.import new file mode 100644 index 0000000..e39f0d6 --- /dev/null +++ b/ressources/sons/melodie-bobo-1.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://kqdamgqyyxw2" +path="res://.godot/imported/melodie-bobo-1.mp3-7aa3030b2c790daa8c4313aa01ae98f9.mp3str" + +[deps] + +source_file="res://ressources/sons/melodie-bobo-1.mp3" +dest_files=["res://.godot/imported/melodie-bobo-1.mp3-7aa3030b2c790daa8c4313aa01ae98f9.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/melodie-bobo-2.mp3.import b/ressources/sons/melodie-bobo-2.mp3.import new file mode 100644 index 0000000..03b830b --- /dev/null +++ b/ressources/sons/melodie-bobo-2.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://08ck1o5bu3ik" +path="res://.godot/imported/melodie-bobo-2.mp3-bb198435e05ddb0da77a07ac4cfc56ba.mp3str" + +[deps] + +source_file="res://ressources/sons/melodie-bobo-2.mp3" +dest_files=["res://.godot/imported/melodie-bobo-2.mp3-bb198435e05ddb0da77a07ac4cfc56ba.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/melodie-bobo-3.mp3.import b/ressources/sons/melodie-bobo-3.mp3.import new file mode 100644 index 0000000..b583952 --- /dev/null +++ b/ressources/sons/melodie-bobo-3.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://br06mx63u85ws" +path="res://.godot/imported/melodie-bobo-3.mp3-12ce345635646780a00ff0064dda381b.mp3str" + +[deps] + +source_file="res://ressources/sons/melodie-bobo-3.mp3" +dest_files=["res://.godot/imported/melodie-bobo-3.mp3-12ce345635646780a00ff0064dda381b.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/melodie-bobo-4.mp3.import b/ressources/sons/melodie-bobo-4.mp3.import new file mode 100644 index 0000000..c212809 --- /dev/null +++ b/ressources/sons/melodie-bobo-4.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://dj7u75k6nesm8" +path="res://.godot/imported/melodie-bobo-4.mp3-85d81fc35615c5448418bb695518b42e.mp3str" + +[deps] + +source_file="res://ressources/sons/melodie-bobo-4.mp3" +dest_files=["res://.godot/imported/melodie-bobo-4.mp3-85d81fc35615c5448418bb695518b42e.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/melodie-bobo-5.mp3.import b/ressources/sons/melodie-bobo-5.mp3.import new file mode 100644 index 0000000..9bc9a7c --- /dev/null +++ b/ressources/sons/melodie-bobo-5.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://62041of2bg8o" +path="res://.godot/imported/melodie-bobo-5.mp3-3f367a2a630c34a5f2323ebc8535769d.mp3str" + +[deps] + +source_file="res://ressources/sons/melodie-bobo-5.mp3" +dest_files=["res://.godot/imported/melodie-bobo-5.mp3-3f367a2a630c34a5f2323ebc8535769d.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/scenes/Room.tscn b/scenes/Room.tscn index 03cb3e8..9192c01 100644 --- a/scenes/Room.tscn +++ b/scenes/Room.tscn @@ -1,16 +1,15 @@ -[gd_scene load_steps=16 format=3 uid="uid://durhes43gex7a"] +[gd_scene load_steps=15 format=3 uid="uid://durhes43gex7a"] [ext_resource type="PackedScene" uid="uid://c7bfiw54rvaq2" path="res://scenes/player_melodie.tscn" id="1_cl1wt"] [ext_resource type="Script" path="res://scenes/room.gd" id="1_jh83c"] [ext_resource type="AudioStream" uid="uid://qyacm71epyhi" path="res://ressources/sons/idle_theme.wav" id="2_8nbnd"] [ext_resource type="Texture2D" uid="uid://ky4e7158gqf6" path="res://ressources/images/cgj_default_tile.svg" id="2_torsx"] -[ext_resource type="PackedScene" uid="uid://cyvqa6g64cw37" path="res://scenes/enemies/slime.tscn" id="3_04ip2"] [ext_resource type="Texture2D" uid="uid://bge3nllk1bq5r" path="res://ressources/images/mur.svg" id="3_oi2tl"] [ext_resource type="Texture2D" uid="uid://dhva3tivsvknl" path="res://ressources/images/mur_coin.svg" id="4_6a3f6"] [ext_resource type="PackedScene" uid="uid://di4chlep1t1or" path="res://parametres/menu_parametres.tscn" id="6_6ubhx"] [ext_resource type="PackedScene" uid="uid://bndtclt51nsih" path="res://scenes/interface.tscn" id="8_5s7tf"] +[ext_resource type="PackedScene" uid="uid://bdpm5s1tpslhc" path="res://scenes/pickups/flute_pickup.tscn" id="10_0do8n"] [ext_resource type="PackedScene" uid="uid://ctgxrbcg2vu1p" path="res://scenes/ecran_mort.tscn" id="10_3ou8w"] -[ext_resource type="PackedScene" uid="uid://cm5spgl8o4fam" path="res://scenes/enemies/robot.tscn" id="10_5qrsc"] [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_1c4te"] normal = Vector2(0, 1) @@ -45,6 +44,7 @@ texture = ExtResource("2_torsx") stretch_mode = 1 [node name="Player_Melodie" parent="." node_paths=PackedStringArray("interface") groups=["Player"] instance=ExtResource("1_cl1wt")] +position = Vector2(0, 200) scale = Vector2(3, 3) interface = NodePath("../Interface") @@ -134,9 +134,6 @@ texture = ExtResource("4_6a3f6") [node name="Camera2D" type="Camera2D" parent="CanvasLayer"] -[node name="Slime" parent="." groups=["Enemies"] instance=ExtResource("3_04ip2")] -position = Vector2(-448, 205) - [node name="Interface" parent="." instance=ExtResource("8_5s7tf")] offset_left = -640.0 offset_top = -360.0 @@ -159,8 +156,9 @@ offset_top = -383.0 offset_right = -258.0 offset_bottom = -383.0 -[node name="Robot" parent="." groups=["Enemies"] instance=ExtResource("10_5qrsc")] -position = Vector2(-428, 11) +[node name="InstrumentPickup" parent="." instance=ExtResource("10_0do8n")] +position = Vector2(2, -64) +scale = Vector2(0.15, 0.15) [connection signal="finished" from="Musique" to="." method="_on_audio_stream_player_finished"] [connection signal="retour_menu" from="Ecran mort" to="." method="_on_ecran_mort_retour_menu"] diff --git a/scenes/pickups/flute_pickup.tscn b/scenes/pickups/flute_pickup.tscn new file mode 100644 index 0000000..b620e69 --- /dev/null +++ b/scenes/pickups/flute_pickup.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=4 format=3 uid="uid://bdpm5s1tpslhc"] + +[ext_resource type="Texture2D" uid="uid://bncbi6cd1m5y7" path="res://ressources/images/flute.svg" id="1_7m80x"] +[ext_resource type="Script" path="res://scripts/Instrument/flute_pickup.gd" id="1_42t6n"] + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_rt2x3"] +radius = 50.0 +height = 613.39 + +[node name="FlutePickup" type="Area2D"] +collision_layer = 0 +script = ExtResource("1_42t6n") + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("1_7m80x") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +rotation = -0.785398 +shape = SubResource("CapsuleShape2D_rt2x3") + +[connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/scripts/Instrument/flute_pickup.gd b/scripts/Instrument/flute_pickup.gd new file mode 100644 index 0000000..7ecd795 --- /dev/null +++ b/scripts/Instrument/flute_pickup.gd @@ -0,0 +1,18 @@ +extends Area2D + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass + + + +func _on_body_entered(body: Node2D) -> void: + if body.is_in_group("Player") : + body.pick_up("flute") + queue_free() diff --git a/scripts/player_control.gd b/scripts/player_control.gd index 354fafe..ea4eb7e 100644 --- a/scripts/player_control.gd +++ b/scripts/player_control.gd @@ -21,11 +21,15 @@ var flute_cooldown = 0.5 var tambour_cooldown = 3.0 var lyre_cooldown = 1 -var slot = [] -var slotstr = [] +var instrument_list = [ + "", + "" +] var vie = 10 +signal instrument_switch + func _ready() -> void: flute = load("res://scripts/Instrument/Flute.gd").new() flute.set_scene_parent(get_tree().get_root()) @@ -36,31 +40,10 @@ func _ready() -> void: lyre = load("res://scripts/Instrument/Lyre.gd").new() lyre.set_scene_parent(get_tree().get_root()) - - - func _physics_process(delta: float) -> void: move_and_slide() -func _process(delta: float) -> void: - var direction : Vector2 = Vector2.ZERO - direction.x = Input.get_action_raw_strength("BOUGER_DROITE") - Input.get_action_raw_strength("BOUGER_GAUCHE") - direction.y = Input.get_action_raw_strength("BOUGER_BAS") - Input.get_action_raw_strength("BOUGER_HAUT") - - if direction != Vector2.ZERO: - if direction == previous_direction: - if direction.x != 0 and direction.y != 0: - boost_speed = min(boost_speed + acceleration / 16, (max_boost_speed - move_speed) / 8) - else: - boost_speed = min(boost_speed + acceleration, max_boost_speed - move_speed) - else: - boost_speed = 0 - - previous_direction = direction - velocity = direction * (move_speed + boost_speed) - else: - velocity = Vector2.ZERO - +func play_music(delta : float): var direction_balle = Vector2.ZERO var angle = 0 var angle_lyre = 0 @@ -81,7 +64,7 @@ func _process(delta: float) -> void: direction_balle = Vector2(-1, 0) angle = 90 angle_lyre = 180 - + if flute_timer > 0: flute_timer -= delta @@ -90,19 +73,46 @@ func _process(delta: float) -> void: if lyre_timer > 0: lyre_timer -= delta - - if flute and flute_timer <= 0.0 and direction_balle != Vector2.ZERO: + + if instrument_list.has("flute") and flute_timer <= 0.0 and direction_balle != Vector2.ZERO: flute.jouer_melodie(position, direction_balle, angle) flute_timer = flute_cooldown - - if tambour and tambour_timer <= 0.0 and direction_balle != Vector2.ZERO: + if instrument_list.has("tambour") and tambour_timer <= 0.0 and direction_balle != Vector2.ZERO: tambour.jouer_melodie(position) tambour_timer = tambour_cooldown - - if lyre and lyre_timer <= 0.0 and direction_balle != Vector2.ZERO: + if instrument_list.has("lyre") and lyre_timer <= 0.0 and direction_balle != Vector2.ZERO : lyre.jouer_melodie(position, direction_balle, angle_lyre) lyre_timer = lyre_cooldown + + +func _process(delta: float) -> void: + var direction : Vector2 = Vector2.ZERO + direction.x = Input.get_action_raw_strength("BOUGER_DROITE") - Input.get_action_raw_strength("BOUGER_GAUCHE") + direction.y = Input.get_action_raw_strength("BOUGER_BAS") - Input.get_action_raw_strength("BOUGER_HAUT") + + if direction != Vector2.ZERO: + if direction == previous_direction: + if direction.x != 0 and direction.y != 0: + boost_speed = min(boost_speed + acceleration / 16, (max_boost_speed - move_speed) / 8) + else: + boost_speed = min(boost_speed + acceleration, max_boost_speed - move_speed) + else: + boost_speed = 0 + previous_direction = direction + velocity = direction * (move_speed + boost_speed) + else: + velocity = Vector2.ZERO + + play_music(delta) + +func pick_up(instrument : String) : + if len(instrument_list) < 2 : + instrument_list.append(instrument) + else : + instrument_list[0] = instrument_list[1] + instrument_list[1] = instrument + instrument_switch.emit() func take_damage(dmg : int) : vie -= dmg From bc0b79ac87f30e4c33980babcf23ac968f8a5e10 Mon Sep 17 00:00:00 2001 From: achipo Date: Sat, 25 Jan 2025 05:10:31 +0000 Subject: [PATCH 3/8] laissez les mobs avoir mal --- ressources/sons/blob-bobo.mp3 | Bin 0 -> 3249 bytes ressources/sons/poulpe-bobo.mp3 | Bin 0 -> 4737 bytes ressources/sons/roby-bobo.mp3 | Bin 0 -> 2949 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 ressources/sons/blob-bobo.mp3 create mode 100644 ressources/sons/poulpe-bobo.mp3 create mode 100644 ressources/sons/roby-bobo.mp3 diff --git a/ressources/sons/blob-bobo.mp3 b/ressources/sons/blob-bobo.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..663748c8c9d4837f62c51547f6ba47b07db5869d GIT binary patch literal 3249 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 literal 0 HcmV?d00001 diff --git a/ressources/sons/roby-bobo.mp3 b/ressources/sons/roby-bobo.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..78f920973283d78f8cade46085aa36bab3487e85 GIT binary patch literal 2949 zcmds3X;72r7Jjp`B@&PTB83o^3W6p96-5O?!lEDnVnGL6Ho0xsB~d?9S2Sdc}^ zR#4EAAVskiP;1yyL9EE4px9DSK?F-#l-1mz^v>|-&h*Y5f86JrGw=E4J>Q)3J?G3b z$AxBz0E=*9x-cp7Q$ubJL6JweTn-_U%ij-F+hS_auN$a67V z?cL~>>&PS$vgYslHV}+ZR&D^+w^)a2x85f*{=WTxJY{p0pBfaK0DvL@SV9qiVM>~8 zXIcORfR#}G)8(KIgS!X<(Qrr-hy#fCUq#6bNEBq_{q?FHFsr0n4Vfh;ai!Dd|Jq|x)twa zAF@OMXk(N|hylUj1Vw;Qp!kt%lZpg5a@qP|B$P-h_{x$iQ6#T7T{++Jh)mpYNju~m z=>@)OMcOMe5t)In91M~=At$Z0zl@pYB}=@8VaAqtW`%WQhtU@*nZ~$B^}<|5X9n&_ zNhb<(;~cOMoE8YrT<$4KM&HW7lYnMzF6w#q4F@DF-NVZ&!PYdXe`xHw|Ng%DHC7re zclEqSdpCUdz|*?(2_bxQ`SrnA`8*B#mUh+pWy}3J`6I`|0si|$>t0lVEZ;P!f7>ho zMUo$WhcFgMj3FXNNl;fKunQH`?Kzib&2S>+7?6zAHPL6WFpL_&TBJB)9XC`$j1c&te?wlK10KI&nObi85v$(|VM8QI%jc@M<4WrQl2 zqKVgc5Xy9%8N z9ZWi$Ue|0$b&TH5GiFOoeBpt_U?7y(*y261y0!x~+~U#a8vc=!&!ru0Om+>{utww+_z70eJbWdkRi;|GK0B z+uCi1aUMv6gbeIRfqqU)Q~8^mMwdK+xQ=im1_|Y`Doxm|h)LCiW6>0MG>}3ZTF@_t z&h!1;1rO<58?XD` zm7%l_ zK=v${Xtr$QN7J?}Hb^e(YSn}Gqpx|34T1nbw$SX)&yG7yQmHpbj*qMNX}jO*P{$3l zPWEH`#+ebD5}Ic-PMj@OvEfy3<(MLxKHwn!@36QhFLxOX)cZ{-yj(z~W^~LmqzWp) z<5(CPrHwE&h)eQeB+s0#z3-Y^RGH-8luWQ{(XlkQm_0;GGIt$u0Y=D(V7D>aZdvs9 zer)Qf2kX?lhfnGdZu4m2Xjz0#wYSZTRHxu*=Sq_agl7Qjpx4((&5fmS!`nNJIgRea zZWT6DDkf7n_QOu5%{{G~0o5NR53r&S>%-z9Mn3hK^HUR3NGODQ_}0ovIojhblGD2W z9D&X_ox^fFe>$O$TdgPV85?_Jdm2`Z9Hc(O)xT=pry^9=yA&U}Dk3AL-+tg zoz~MOCn1V$8NiFk8>|38TsZt#QQD`KH~AyXn3<-VSEk`#!nIKDcK`m&@HKCD+RxR7<^R%LTLS7k|Z>8>^XQB`75(HnL70uk!P9t^d`Gqnpd1MMvr-JC1p@ zi$aMv7*#2G$a0N#@p-ej`p0IKF1I#_+Vfl=ihN@_K}wma>;L$}uxP14pSz~do=-N1 cV?Y0941id<0)AYTKCZj45&!_ Date: Sat, 25 Jan 2025 05:11:54 +0000 Subject: [PATCH 4/8] LAISSEZ MELODIE MARCHER !! --- ressources/images/melodie-2.png.png | Bin 0 -> 1308 bytes ressources/images/melodie-4.png.png | Bin 0 -> 1308 bytes ressources/images/melodie_cote-2.png.png | Bin 0 -> 1227 bytes ressources/images/melodie_cote-4.png.png | Bin 0 -> 1275 bytes ressources/images/melodie_dos-2.png.png | Bin 0 -> 1245 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 ressources/images/melodie-2.png.png create mode 100644 ressources/images/melodie-4.png.png create mode 100644 ressources/images/melodie_cote-2.png.png create mode 100644 ressources/images/melodie_cote-4.png.png create mode 100644 ressources/images/melodie_dos-2.png.png diff --git a/ressources/images/melodie-2.png.png b/ressources/images/melodie-2.png.png new file mode 100644 index 0000000000000000000000000000000000000000..015cbfde2d01bb186d19ad9f65015fe4a4795926 GIT binary patch literal 1308 zcmb7^YdDk%6vxjyuW4k~C_5rMrb(WXjj?!`HR5I6lccf}ttQt}Z5U)j-lotp8`-Jo zqN&U(w@va$g~@nWT9@3CE@pQatTdTet##RVKkmo<@H_u6|8vfV^MB6w0sdaPI>tHx zpzGu99!MzuFWM`JDtA8cln_J^=;a2Los03zj_#2WSvC2}fokrXkd$a=V>9*J*Bvgy zOV!TY2A@`!=Q@7-qIYOafRjb6lhu(rds~tJuURB@XG7P|QI6b2yMm814NX#Z_B)Ds+9qp8SG$QToZWJDP^AY6{-X&4jkDDnk>$yy1JSF8E@SW04VQgqN%Q;0yQG6Ap; z5kdEJ_0nIO3oov3db(WVVl`m#YCe>>8sC=sV&H96d3w@ub^Pe?LUQ3y?df8ANTM)` zXv}{=KMk1J+!83>y?1zhJes5)gKmqGtA?oJ_k~H#*%XSN*o#@T(Zmq4+b!390uet1 zn*KV46koV(+8!WE*vG)i%Hx?d3BA%mm*U;Gn&M3_4KktycpefE<>GR#5EV(wH4kdk zDB$-3!ndQiO?wYXKd~9n&nPv>M8!Le|J%o4?erqJ9ejX;t(C^%?j{5`Vlw)ZU^ClU zS4_8XqCuqA(OUA=G@}J+?%uh(BAfHK{2sASZ}?GOvOVU-hzHxknu423uAr>j`X{G8 zccLcms%iQ_32(H?M30olsul`Rz>4xX*v(LafSRUQ+{V{o64o!i>frO*7VBN#&c+rM zp!bLV{wfsS?^p@uO7jpG-;ZsBgYWhezAB}BQDxZCZ(8UZb>0X@DqO+)2*SabypWt0 zL{scA2EVPm`Ni5mhm@+VS}C}btkes|ibkRs*x|)G|J95$(JMwz*`Kh3akCag>-Buf z3I;|Q8n5={V#{k{2k9i)xU}yYK*Gakq=U%6sk=DyCp)RWO8v1S7#rbc2EC&c!~t|$ z`q)Bq&!q;AY1_d3*kahpKx~r8af6V9V;oxd1F`}*vY}}5wsfC}$l7&sSsE4a7R%6w zsdvbL7xR@$P^9XyUb8O0c~lj2qpjlQPcMrnM%G*)1A{;H2pE!SCi@#_n&K6rYD}+4 zgvqU;!7SAr@r_Ug95#|6qQ(xvFv$#goO|UssL2;K6!2M3jO9O;1)c!b=7>}VhzxnY zdSI3z%0=;M(zXc%FV35e1M5)!=B0{Lz&t%xl7lyqi^WFORU-Oh@0 RkjOFkc=)?ly77eo{{ZplE~Eee literal 0 HcmV?d00001 diff --git a/ressources/images/melodie-4.png.png b/ressources/images/melodie-4.png.png new file mode 100644 index 0000000000000000000000000000000000000000..114c00449df827ced270355e02790decdc0bdcee GIT binary patch literal 1308 zcmb7DYc!Mz7=FL`@P!OVwH(c4B)4f8t-YbW^8)2$7}4v zjl<1p#RZv-E6!f+t$a!cHWAVOPSh>GP>BA2Hr5@j%&3a)NlJdx>^?g=pwK*PKep)f zo5Jt($!r26v${-|v4h?4S(-AhtO>I%?wm}4ero^roorkgSye_P^2DkVHNpso#306u zyxk=-kpTT}om2yG(OpR=VIAAF7!)gzFY<%th5O^me{$b?d0nsIIy41m%-=&9C8yLF z%BY-(E5Vh+RU_}3(;ig-d^tYYGsWDIW*xW2jrybIyS*SF{}fq#FH z>%piyWL=2jF1IJpQdaCdRB(dh50C}G zi`?5@&@?j3qCLW$p8-&;4kj62nv}OoA~}S0M1a(aw(B#FE3eS2?>XIcvr8C7V3#yb z2jAXyBfe{MT;?jr&sCp1EJLo&Nwp=B9r;SqFiG*lry+1obzWOZv3c5(R*Zgw0Q zAY^C0H&6m=3}r|XE%f9tALU0;fKLtgaMG2%8#<#obrf4Lh<|Bm+hYi!ni4w{BCI#% zT-%5%>nygu-&2#y!CA3}?N17JsM#6Zjpg0QlpJ zpUo2?C;FYiD~JmJ{q?B#EhnlDP=^h=OItnu6Wsf@pnrHE_-$lqRe!ngEohagHn4 zFTmHxi>&p-&y}W>AK%odt+LdL^lh7BsHJ{ITF>KdFo`lRI+|(OW%FHDYc0TPZM4rj z*_M_Jb-ZhR`aT^`&;p z=+aw`BrM^kqPD9YDW}UmEHrszXVVwyBA&o5qi)U2m>xk!8P^(_;)Id*2txTQWKEh4 z!`A)h(&T`_`vG^ONf`VZm=^;wHpi_F!N0fJ(@h=EFy3`V(s>6M4*ZACa49k(HVTBx zJNKKz_J(?wZ(xf-tlLtk4+|?b1N&Twg&u^h6?Yo~-zUNd1+gG>LKgzh)oXY8u#@`s ZJx0?1qiVLrfvRmX1o#E}Hu~(!{ujDTFMa?3 literal 0 HcmV?d00001 diff --git a/ressources/images/melodie_cote-2.png.png b/ressources/images/melodie_cote-2.png.png new file mode 100644 index 0000000000000000000000000000000000000000..4111292200f21a52e4e151fbb7f5e8d87bae0637 GIT binary patch literal 1227 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 literal 0 HcmV?d00001 diff --git a/ressources/images/melodie_dos-2.png.png b/ressources/images/melodie_dos-2.png.png new file mode 100644 index 0000000000000000000000000000000000000000..e895ef4de6f13bd903e62007e67b157b43a71595 GIT binary patch literal 1245 zcmaJ>TTl~c82vXJ%m$OVQHzSfE)*59LBy&lR9F)3q5-tDgo4qkXu-%(NDxt0K`J;% z>~OPyK%oSS5|9*7ZXt3NOKEkaOi&U6mWTlnQ$-Cned&xZefYjJXXZSdIp3KtBWSlT z-O}0;06_Qm^9nH|@$Vpu%=@zp^ZCY_a|xYiB_NNFtT+;`b9MyROE*SIqXV7Wdh z@f8P<9ExzQR`-8`RAph;%ZYiv?2Dtv>B%YLlO|)TK9boL>?N&Evm*@Wrb9s;HQU(! z7k|yIgA*=QIhnqoj_k9oMoctBmRK_w(tsGvEP^>f(*i;~R=BeDQ;2kaV@`cAf-wt> zu`Dc$!;p4YtDvQ4!j^a>8GXV7hb|xoL>8W?;Mv zaBq_qa7C&7@HW%n{5@6Q!*Efi-6C;tM-71yyTY1Q;11d{$JuEF!Ab!cb-Z-9ZM1QW zr%haz=0?GRE!C|Re(E~A>sn-yGRqvP;*Q)mI}$v|c=?!&;GvwT`tC=TC?HMx3pIKL zahkgFI!r50+$4d>gL1+rWrg`3cm^@+q5w9UX_jWZe`xFF{vo*@b&Xi7nEvuZ3KOpg zL~(nE>ix&qSdN2!o;x)LLT;!|AUIO9Im-&|V^YqO4{fDU25k)kP<(BLTxEk5hsjqZ zGX@urzT-P5sk+T? zr9H?UX<4l})%r;GE7YCzMy}%mnLSEeET^>vnA}p;qIV&bD%h=HI;-u-!1}(=ovW27 zE}+{Hy;cNVL5;5cor7B^Nf<%xo(eiFA$GYSgq8I0s+$+{1Swmt{MqBV={QqjE;%0h z15(;Sr%0(spM`OVk1aTWf$iBXs*eR>J|i4_a(-XB>{MQU2^9lnE+~N(85M&btaUm168Dv$xPP;{qZb-KIl+fPb#pkYJZLprqlGzFn*?#y_vFDtBnQ=_h!(u7|2 z2It(A&wrB-$cXv3A2EdL++z|R;NUVi(CMrA(M8Sn8uwRH7z5$Hha2xAO%md6Vw8kM zmPQ1`EJ*_~C!!ixlX{)jHc+^rp`~6;hYsd1Rl~L*{L!!>9o*QNVK{>l?3t%x9vJ?q v^KTqc=1IiOw#3tr11B-Eu-~ou;Q} Date: Sat, 25 Jan 2025 05:12:15 +0000 Subject: [PATCH 5/8] ELLE MARCHE !!! --- ressources/images/melodie_dos-4.png.png | Bin 0 -> 1215 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ressources/images/melodie_dos-4.png.png diff --git a/ressources/images/melodie_dos-4.png.png b/ressources/images/melodie_dos-4.png.png new file mode 100644 index 0000000000000000000000000000000000000000..afebe8097f1e8b31a199a06b701df673a8de612f GIT binary patch literal 1215 zcmb7AYc$k(7=C~AH%23ubI6*O8d_VZSauufVu;3!a+xSQmd0AML@t>k#Ge|ZO5UR6kkTr9#thAfxwEy_o>Z<2J8U@6p{BANOX!h-0r5x_2Wg2Kf6R98s zRjI$qlNIU!9$H@PgqYR*1F2JRHjRkb!x8wQjug$rwYljBhSH%0EvVYCWAA2oz3xOc zd3k)b;hHMY!#fK0XcVBb@Yx=eXC7GV4`oL-QU;ZR-)+7~4$1LVVzIU_=IBNrl zO_~Cv3zEqrN^h*Q7y~BNzakEABOVz^( zHe4tG+`YEE^97Gt=l){Wr9T}D%J<5`peiEMzZuH2Z2qMqa4Swx6mHe@`bp;|`th5t zTkdELvfC1)E&C2xuWbkSgHb#t&2Vco?%=?w=|Gj7?kPfJI|(A8uG@L+VpW>zBm@fY zBdT)SHC2kXiwMiRZ1(Hby5(1of{{oe*Y|dIR({Kd>u;*g^;Hj==F1gDJird$keQP|iR~<${}|Hx0&`IGP!BSJ-!2AiPtBW zO0IgPTQ|f`emnuswC=q^@RJ{Y4tZ+3=%q zsX4pplpR3c4}f#;l&7AHTQ!aidH3k$w8CWM{a72fq~C_=(+S!v1Q8(q_9-ou7&3>9 z*AJ3{&}rVi<+{@SiH4_f%A2TSQswuf`V<)W8%!bW@r;M)m){nHU53^+0Tl0PujwvQ zY?7~vXqxT;;XnIXgB(041y8~sxS<(~!m!-xTpzDp(*X3h+=|FPJ86aHSKTP%XhMk| zJZrRgZlY@`rQk4AL%0F@i))dVBRz-@6dc_yRprL=fVhZ{>jCDoLGD@>Wl3}uo6Glp Ykk(J}OXXMW8b0aRPOgrP4*X>J2Nm%Kwg3PC literal 0 HcmV?d00001 From 78917d152b3533d2af06ffd35438b2f07951057d Mon Sep 17 00:00:00 2001 From: Elouan Date: Sat, 25 Jan 2025 07:29:29 +0100 Subject: [PATCH 6/8] vague de monstre --- scenes/Room.tscn | 39 +++++++++++----- scenes/enemies/poulpe.tscn | 2 +- scenes/enemies/robot.tscn | 4 +- scenes/enemies/slime.tscn | 2 +- scenes/player_melodie.tscn | 2 +- scenes/vague.gd | 91 ++++++++++++++++++++++++++++++++++++++ scenes/vague/vague.yaml | 22 +++++++++ scenes/vague/yaml.gd | 30 +++++++++++++ 8 files changed, 175 insertions(+), 17 deletions(-) create mode 100644 scenes/vague.gd create mode 100644 scenes/vague/vague.yaml create mode 100644 scenes/vague/yaml.gd diff --git a/scenes/Room.tscn b/scenes/Room.tscn index 03cb3e8..122d2b0 100644 --- a/scenes/Room.tscn +++ b/scenes/Room.tscn @@ -1,16 +1,15 @@ -[gd_scene load_steps=16 format=3 uid="uid://durhes43gex7a"] +[gd_scene load_steps=15 format=3 uid="uid://durhes43gex7a"] [ext_resource type="PackedScene" uid="uid://c7bfiw54rvaq2" path="res://scenes/player_melodie.tscn" id="1_cl1wt"] [ext_resource type="Script" path="res://scenes/room.gd" id="1_jh83c"] [ext_resource type="AudioStream" uid="uid://qyacm71epyhi" path="res://ressources/sons/idle_theme.wav" id="2_8nbnd"] [ext_resource type="Texture2D" uid="uid://ky4e7158gqf6" path="res://ressources/images/cgj_default_tile.svg" id="2_torsx"] -[ext_resource type="PackedScene" uid="uid://cyvqa6g64cw37" path="res://scenes/enemies/slime.tscn" id="3_04ip2"] [ext_resource type="Texture2D" uid="uid://bge3nllk1bq5r" path="res://ressources/images/mur.svg" id="3_oi2tl"] [ext_resource type="Texture2D" uid="uid://dhva3tivsvknl" path="res://ressources/images/mur_coin.svg" id="4_6a3f6"] [ext_resource type="PackedScene" uid="uid://di4chlep1t1or" path="res://parametres/menu_parametres.tscn" id="6_6ubhx"] [ext_resource type="PackedScene" uid="uid://bndtclt51nsih" path="res://scenes/interface.tscn" id="8_5s7tf"] [ext_resource type="PackedScene" uid="uid://ctgxrbcg2vu1p" path="res://scenes/ecran_mort.tscn" id="10_3ou8w"] -[ext_resource type="PackedScene" uid="uid://cm5spgl8o4fam" path="res://scenes/enemies/robot.tscn" id="10_5qrsc"] +[ext_resource type="Script" path="res://scenes/vague.gd" id="12_n6lb5"] [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_1c4te"] normal = Vector2(0, 1) @@ -44,10 +43,6 @@ offset_bottom = 360.0 texture = ExtResource("2_torsx") stretch_mode = 1 -[node name="Player_Melodie" parent="." node_paths=PackedStringArray("interface") groups=["Player"] instance=ExtResource("1_cl1wt")] -scale = Vector2(3, 3) -interface = NodePath("../Interface") - [node name="StaticBody2D" type="StaticBody2D" parent="." groups=["World_Border"]] collision_layer = 3 collision_mask = 3 @@ -134,9 +129,6 @@ texture = ExtResource("4_6a3f6") [node name="Camera2D" type="Camera2D" parent="CanvasLayer"] -[node name="Slime" parent="." groups=["Enemies"] instance=ExtResource("3_04ip2")] -position = Vector2(-448, 205) - [node name="Interface" parent="." instance=ExtResource("8_5s7tf")] offset_left = -640.0 offset_top = -360.0 @@ -159,8 +151,31 @@ offset_top = -383.0 offset_right = -258.0 offset_bottom = -383.0 -[node name="Robot" parent="." groups=["Enemies"] instance=ExtResource("10_5qrsc")] -position = Vector2(-428, 11) +[node name="vague" type="Node2D" parent="." node_paths=PackedStringArray("spawner1", "spawner2", "spawner3", "spawner4")] +script = ExtResource("12_n6lb5") +spawner1 = NodePath("Spawner1") +spawner2 = NodePath("Spawner2") +spawner3 = NodePath("Spawner3") +spawner4 = NodePath("Spawner4") + +[node name="Spawner1" type="Node2D" parent="vague"] +position = Vector2(482, -232) + +[node name="Spawner2" type="Node2D" parent="vague"] +position = Vector2(-538, 238) + +[node name="Spawner3" type="Node2D" parent="vague"] +position = Vector2(-502, -240) + +[node name="Spawner4" type="Node2D" parent="vague"] +position = Vector2(484, 220) + +[node name="Timer" type="Timer" parent="vague"] + +[node name="Player_Melodie" parent="vague" node_paths=PackedStringArray("interface") instance=ExtResource("1_cl1wt")] +scale = Vector2(3, 3) +interface = NodePath("../../Interface") [connection signal="finished" from="Musique" to="." method="_on_audio_stream_player_finished"] [connection signal="retour_menu" from="Ecran mort" to="." method="_on_ecran_mort_retour_menu"] +[connection signal="timeout" from="vague/Timer" to="vague" method="_on_timer_timeout"] diff --git a/scenes/enemies/poulpe.tscn b/scenes/enemies/poulpe.tscn index 4a9adf6..8e99855 100644 --- a/scenes/enemies/poulpe.tscn +++ b/scenes/enemies/poulpe.tscn @@ -30,7 +30,7 @@ animations = [{ [sub_resource type="CircleShape2D" id="CircleShape2D_s7foh"] radius = 38.2753 -[node name="Poulpe" type="CharacterBody2D"] +[node name="Poulpe" type="CharacterBody2D" groups=["Enemies"]] script = ExtResource("1_hu6wh") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] diff --git a/scenes/enemies/robot.tscn b/scenes/enemies/robot.tscn index 6137bef..a35675d 100644 --- a/scenes/enemies/robot.tscn +++ b/scenes/enemies/robot.tscn @@ -41,13 +41,13 @@ animations = [{ [sub_resource type="RectangleShape2D" id="RectangleShape2D_utjf8"] size = Vector2(126, 185) -[node name="Robot" type="CharacterBody2D"] +[node name="Robot" type="CharacterBody2D" groups=["Enemies"]] script = ExtResource("1_tikkk") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] sprite_frames = SubResource("SpriteFrames_vaeha") animation = &"Generic" -frame_progress = 0.0803078 +frame_progress = 0.260687 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2(-2, 6.5) diff --git a/scenes/enemies/slime.tscn b/scenes/enemies/slime.tscn index d690b49..f293b71 100644 --- a/scenes/enemies/slime.tscn +++ b/scenes/enemies/slime.tscn @@ -21,7 +21,7 @@ animations = [{ [sub_resource type="CircleShape2D" id="CircleShape2D_bokrm"] radius = 20.0 -[node name="Slime" type="CharacterBody2D"] +[node name="Slime" type="CharacterBody2D" groups=["Enemies"]] collision_layer = 6 collision_mask = 6 script = ExtResource("1_hnufy") diff --git a/scenes/player_melodie.tscn b/scenes/player_melodie.tscn index 39b5e2a..f6cc97d 100644 --- a/scenes/player_melodie.tscn +++ b/scenes/player_melodie.tscn @@ -7,7 +7,7 @@ radius = 6.0 height = 32.0 -[node name="Player_Melodie" type="CharacterBody2D"] +[node name="Player_Melodie" type="CharacterBody2D" groups=["Player"]] collision_layer = 5 script = ExtResource("1_7sg4g") diff --git a/scenes/vague.gd b/scenes/vague.gd new file mode 100644 index 0000000..34d35b0 --- /dev/null +++ b/scenes/vague.gd @@ -0,0 +1,91 @@ +extends Node2D + +@export var spawner1: Node2D +@export var spawner2: Node2D +@export var spawner3: Node2D +@export var spawner4: Node2D + +class Vague: + var poulpes: int + var slimes: int + var robots: int + + func _init(poulpes: int, slimes: int, robots: int): + self.poulpes = poulpes + self.slimes = slimes + self.robots = robots + +# Waves and spawners +var vagues = [ +Vague.new(0, 1, 0), +Vague.new(1, 1, 0), +Vague.new(1, 2, 0), +Vague.new(2, 2, 1), +Vague.new(2, 3, 1), +Vague.new(3, 3, 2), +Vague.new(3, 4, 2), +Vague.new(4, 4, 3), +Vague.new(4, 5, 3), +Vague.new(5, 5, 4), +Vague.new(2, 3, 2), +Vague.new(3, 2, 1), +Vague.new(1, 4, 3), +Vague.new(4, 1, 2), +Vague.new(2, 2, 3), +Vague.new(1, 5, 1), +Vague.new(3, 1, 4), +Vague.new(4, 3, 1), +Vague.new(3, 4, 2), +Vague.new(1, 2, 4), +Vague.new(3, 5, 2) +] + +var spawners = [] + +var vague_actuelle = 0 +var poulpe_scene: PackedScene +var slime_scene: PackedScene +var robot_scene: PackedScene + +func _ready(): + poulpe_scene = load("res://scenes/enemies/poulpe.tscn") + slime_scene = load("res://scenes/enemies/slime.tscn") + robot_scene = load("res://scenes/enemies/robot.tscn") + + spawners = [spawner1, spawner2, spawner3, spawner4] + + # Ensure spawners are set + for spawner in spawners: + if spawner == null: + push_error("Spawner is not assigned.") + + $Timer.start(2) + +func instancier_ennemis(vague: Vague): + for i in range(vague.poulpes): + var spawner = spawners[randi() % len(spawners)] + var poulpe_instance = poulpe_scene.instantiate() + poulpe_instance.position = spawner.global_position + add_child(poulpe_instance) + + for i in range(vague.slimes): + var spawner = spawners[randi() % len(spawners)] + var slime_instance = slime_scene.instantiate() + slime_instance.position = spawner.global_position + add_child(slime_instance) + + for i in range(vague.robots): + var spawner = spawners[randi() % len(spawners)] + var robot_instance = robot_scene.instantiate() + robot_instance.position = spawner.global_position + add_child(robot_instance) + +func _on_timer_timeout(): + if vague_actuelle < len(vagues): + print("t") + instancier_ennemis(vagues[vague_actuelle]) + vague_actuelle = (vague_actuelle + 1) % len(vagues) + $Timer.set_wait_time(10) + $Timer.start() + else: + print("All waves cleared!") diff --git a/scenes/vague/vague.yaml b/scenes/vague/vague.yaml new file mode 100644 index 0000000..0876826 --- /dev/null +++ b/scenes/vague/vague.yaml @@ -0,0 +1,22 @@ +vagues: + - {slime: 1, poulpe: 0, robot: 0} + - {slime: 1, poulpe: 1, robot: 0} + - {slime: 2, poulpe: 1, robot: 0} + - {slime: 2, poulpe: 2, robot: 1} + - {slime: 3, poulpe: 2, robot: 1} + - {slime: 3, poulpe: 3, robot: 2} + - {slime: 4, poulpe: 3, robot: 2} + - {slime: 4, poulpe: 4, robot: 3} + - {slime: 5, poulpe: 4, robot: 3} + - {slime: 5, poulpe: 5, robot: 4} + - {slime: 3, poulpe: 2, robot: 2} + - {slime: 2, poulpe: 3, robot: 1} + - {slime: 4, poulpe: 1, robot: 3} + - {slime: 1, poulpe: 4, robot: 2} + - {slime: 2, poulpe: 2, robot: 3} + - {slime: 5, poulpe: 1, robot: 1} + - {slime: 1, poulpe: 3, robot: 4} + - {slime: 3, poulpe: 4, robot: 1} + - {slime: 4, poulpe: 3, robot: 2} + - {slime: 2, poulpe: 1, robot: 4} + - {slime: 5, poulpe: 3, robot: 2} diff --git a/scenes/vague/yaml.gd b/scenes/vague/yaml.gd new file mode 100644 index 0000000..0753bde --- /dev/null +++ b/scenes/vague/yaml.gd @@ -0,0 +1,30 @@ +extends Node + +func lire_yaml(): + var fichier = FileAccess.open("res://scenes/vague/vague.yaml", FileAccess.READ) + if fichier != null: + var contenu = fichier.get_as_text() + fichier = null + var yaml_contenu = parse_yaml(contenu) + return yaml_contenu + else: + print("Erreur lors de la lecture du fichier YAML") + return null + +func parse_yaml(yaml_text): + # Godot ne prend pas en charge nativement les fichiers YAML. + # Vous devrez utiliser une bibliothèque externe pour parser les fichiers YAML. + print("Erreur : Godot ne prend pas en charge nativement les fichiers YAML") + return null + +func _ready(): + var contenu = lire_yaml() + if contenu: + print(contenu) + var vagues = contenu["vagues"] + for i in range(len(vagues)): + var vague = vagues[i] + print("Vague ", i+1) + print(" Slime : ", vague["slime"]) + print(" Poulpe : ", vague["poulpe"]) + print(" Robot : ", vague["robot"]) From b256c4ee8dd7f71b921c5d2afa3631d6073513a4 Mon Sep 17 00:00:00 2001 From: Elouan Date: Sat, 25 Jan 2025 08:17:05 +0100 Subject: [PATCH 7/8] dernier push --- scenes/vague.gd | 10 +++++----- scripts/player_control.gd | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scenes/vague.gd b/scenes/vague.gd index 34d35b0..c7778d6 100644 --- a/scenes/vague.gd +++ b/scenes/vague.gd @@ -23,10 +23,10 @@ Vague.new(1, 2, 0), Vague.new(2, 2, 1), Vague.new(2, 3, 1), Vague.new(3, 3, 2), -Vague.new(3, 4, 2), -Vague.new(4, 4, 3), -Vague.new(4, 5, 3), -Vague.new(5, 5, 4), +Vague.new(3, 1, 2), +Vague.new(1, 4, 3), +Vague.new(2, 2, 3), +Vague.new(1, 5, 2), Vague.new(2, 3, 2), Vague.new(3, 2, 1), Vague.new(1, 4, 3), @@ -85,7 +85,7 @@ func _on_timer_timeout(): print("t") instancier_ennemis(vagues[vague_actuelle]) vague_actuelle = (vague_actuelle + 1) % len(vagues) - $Timer.set_wait_time(10) + $Timer.set_wait_time(30) $Timer.start() else: print("All waves cleared!") diff --git a/scripts/player_control.gd b/scripts/player_control.gd index 354fafe..3018236 100644 --- a/scripts/player_control.gd +++ b/scripts/player_control.gd @@ -21,8 +21,10 @@ var flute_cooldown = 0.5 var tambour_cooldown = 3.0 var lyre_cooldown = 1 -var slot = [] -var slotstr = [] +var instrument_list = [ + "", + "" +] var vie = 10 @@ -103,7 +105,7 @@ func _process(delta: float) -> void: lyre.jouer_melodie(position, direction_balle, angle_lyre) lyre_timer = lyre_cooldown - + func take_damage(dmg : int) : vie -= dmg interface.set_life(vie) From d5d7d3e6301bca593b9b8b4100f7eee334c6024a Mon Sep 17 00:00:00 2001 From: Elouan Date: Sat, 25 Jan 2025 08:20:06 +0100 Subject: [PATCH 8/8] merge main to initTambour --- ressources/images/melodie-2.png.png.import | 34 +++++++++++++++++++ ressources/images/melodie-4.png.png.import | 34 +++++++++++++++++++ .../images/melodie_cote-2.png.png.import | 34 +++++++++++++++++++ .../images/melodie_cote-4.png.png.import | 34 +++++++++++++++++++ .../images/melodie_dos-2.png.png.import | 34 +++++++++++++++++++ .../images/melodie_dos-4.png.png.import | 34 +++++++++++++++++++ ressources/sons/blob-bobo.mp3.import | 19 +++++++++++ ressources/sons/poulpe-bobo.mp3.import | 19 +++++++++++ ressources/sons/roby-bobo.mp3.import | 19 +++++++++++ scenes/ecran_mort.tscn | 2 +- 10 files changed, 262 insertions(+), 1 deletion(-) create mode 100644 ressources/images/melodie-2.png.png.import create mode 100644 ressources/images/melodie-4.png.png.import create mode 100644 ressources/images/melodie_cote-2.png.png.import create mode 100644 ressources/images/melodie_cote-4.png.png.import create mode 100644 ressources/images/melodie_dos-2.png.png.import create mode 100644 ressources/images/melodie_dos-4.png.png.import create mode 100644 ressources/sons/blob-bobo.mp3.import create mode 100644 ressources/sons/poulpe-bobo.mp3.import create mode 100644 ressources/sons/roby-bobo.mp3.import diff --git a/ressources/images/melodie-2.png.png.import b/ressources/images/melodie-2.png.png.import new file mode 100644 index 0000000..a950577 --- /dev/null +++ b/ressources/images/melodie-2.png.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dnpbiuxu41tqr" +path="res://.godot/imported/melodie-2.png.png-1e7ec568d7b7e533e118b9283b70a243.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/melodie-2.png.png" +dest_files=["res://.godot/imported/melodie-2.png.png-1e7ec568d7b7e533e118b9283b70a243.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/melodie-4.png.png.import b/ressources/images/melodie-4.png.png.import new file mode 100644 index 0000000..efdc52e --- /dev/null +++ b/ressources/images/melodie-4.png.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bnh6qj2mr7ni2" +path="res://.godot/imported/melodie-4.png.png-42d7f34a3096af80d7b3a7d3a7b73e30.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/melodie-4.png.png" +dest_files=["res://.godot/imported/melodie-4.png.png-42d7f34a3096af80d7b3a7d3a7b73e30.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/melodie_cote-2.png.png.import b/ressources/images/melodie_cote-2.png.png.import new file mode 100644 index 0000000..9876145 --- /dev/null +++ b/ressources/images/melodie_cote-2.png.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cm886u7l583eg" +path="res://.godot/imported/melodie_cote-2.png.png-1fbf7de2f61b6cf29d5b1e195dc9a1b3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/melodie_cote-2.png.png" +dest_files=["res://.godot/imported/melodie_cote-2.png.png-1fbf7de2f61b6cf29d5b1e195dc9a1b3.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/melodie_cote-4.png.png.import b/ressources/images/melodie_cote-4.png.png.import new file mode 100644 index 0000000..0268265 --- /dev/null +++ b/ressources/images/melodie_cote-4.png.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b4udql8psej1n" +path="res://.godot/imported/melodie_cote-4.png.png-a7a6a259fd83bc3cb82e28583df75ead.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/melodie_cote-4.png.png" +dest_files=["res://.godot/imported/melodie_cote-4.png.png-a7a6a259fd83bc3cb82e28583df75ead.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/melodie_dos-2.png.png.import b/ressources/images/melodie_dos-2.png.png.import new file mode 100644 index 0000000..a05a80b --- /dev/null +++ b/ressources/images/melodie_dos-2.png.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dio8ciloxv6f" +path="res://.godot/imported/melodie_dos-2.png.png-1a6d2dc47c396e3de82fda25bb80b34f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/melodie_dos-2.png.png" +dest_files=["res://.godot/imported/melodie_dos-2.png.png-1a6d2dc47c396e3de82fda25bb80b34f.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/melodie_dos-4.png.png.import b/ressources/images/melodie_dos-4.png.png.import new file mode 100644 index 0000000..136b640 --- /dev/null +++ b/ressources/images/melodie_dos-4.png.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b3848xxx4bumg" +path="res://.godot/imported/melodie_dos-4.png.png-ca174ff4b410f929cf68409e5ffa0048.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/melodie_dos-4.png.png" +dest_files=["res://.godot/imported/melodie_dos-4.png.png-ca174ff4b410f929cf68409e5ffa0048.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/sons/blob-bobo.mp3.import b/ressources/sons/blob-bobo.mp3.import new file mode 100644 index 0000000..1f3d3ae --- /dev/null +++ b/ressources/sons/blob-bobo.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://5a1syiwvowk2" +path="res://.godot/imported/blob-bobo.mp3-a17d23314def42dfb98b7e09aeeda943.mp3str" + +[deps] + +source_file="res://ressources/sons/blob-bobo.mp3" +dest_files=["res://.godot/imported/blob-bobo.mp3-a17d23314def42dfb98b7e09aeeda943.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/poulpe-bobo.mp3.import b/ressources/sons/poulpe-bobo.mp3.import new file mode 100644 index 0000000..1a4f1c8 --- /dev/null +++ b/ressources/sons/poulpe-bobo.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://dp6xr1dkaab2u" +path="res://.godot/imported/poulpe-bobo.mp3-ddbc62e50412213c95688398f4c2d8a6.mp3str" + +[deps] + +source_file="res://ressources/sons/poulpe-bobo.mp3" +dest_files=["res://.godot/imported/poulpe-bobo.mp3-ddbc62e50412213c95688398f4c2d8a6.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/roby-bobo.mp3.import b/ressources/sons/roby-bobo.mp3.import new file mode 100644 index 0000000..2713b1f --- /dev/null +++ b/ressources/sons/roby-bobo.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bduu3c4c05k6i" +path="res://.godot/imported/roby-bobo.mp3-4c91f97263eb900e643d718eb309f330.mp3str" + +[deps] + +source_file="res://ressources/sons/roby-bobo.mp3" +dest_files=["res://.godot/imported/roby-bobo.mp3-4c91f97263eb900e643d718eb309f330.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/scenes/ecran_mort.tscn b/scenes/ecran_mort.tscn index 5b67c3e..8f3f87c 100644 --- a/scenes/ecran_mort.tscn +++ b/scenes/ecran_mort.tscn @@ -6,7 +6,7 @@ [ext_resource type="Texture2D" uid="uid://dqfrqntx73do5" path="res://ressources/images/menu_jeu_button.svg" id="3_ecfx2"] [ext_resource type="Texture2D" uid="uid://kpss4kt07w8l" path="res://ressources/images/menu_jeu_button_survole.svg" id="4_jv24w"] -[node name="Control" type="Control"] +[node name="Control2" type="Control"] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0