diff --git a/menu_principal/menu_principal_affichage.gd b/menu_principal/menu_principal_affichage.gd index a53b924..f923b8e 100644 --- a/menu_principal/menu_principal_affichage.gd +++ b/menu_principal/menu_principal_affichage.gd @@ -42,7 +42,3 @@ func _on_play_button_pressed(): func _on_load_button_pressed(): print("Charger une sauvegarde") - - -func _on_musique_fond_finished() -> void: - musique_fond.play() diff --git a/menu_principal/menu_principal_affichage.tscn b/menu_principal/menu_principal_affichage.tscn index 950a7e4..5f96e20 100644 --- a/menu_principal/menu_principal_affichage.tscn +++ b/menu_principal/menu_principal_affichage.tscn @@ -207,4 +207,3 @@ autoplay = true [connection signal="pressed" from="Menu_principal/HBoxContainer/VBoxMainButton/load_button" to="." method="_on_load_button_pressed"] [connection signal="pressed" from="Menu_principal/HBoxContainer/VBoxMainButton/quit_button" to="." method="_on_quit_button_pressed"] [connection signal="pressed" from="Menu_principal/HBoxContainer/VBoxSideButton/param_button" to="." method="_on_param_button_pressed"] -[connection signal="finished" from="MusiqueFond" to="." method="_on_musique_fond_finished"] diff --git a/ressources/images/blob-1.png b/ressources/images/blob-1.png deleted file mode 100644 index a866178..0000000 Binary files a/ressources/images/blob-1.png and /dev/null differ diff --git a/ressources/images/blob-1.png.import b/ressources/images/blob-1.png.import deleted file mode 100644 index 8c0fd05..0000000 --- a/ressources/images/blob-1.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c85d5krtd4nks" -path="res://.godot/imported/blob-1.png-9e192db16d0e130b0ede2bba3d102c60.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/blob-1.png" -dest_files=["res://.godot/imported/blob-1.png-9e192db16d0e130b0ede2bba3d102c60.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/blob-1.png.png b/ressources/images/blob-1.png.png new file mode 100644 index 0000000..eac1d9f Binary files /dev/null and b/ressources/images/blob-1.png.png differ diff --git a/ressources/images/blob-1.png.png.import b/ressources/images/blob-1.png.png.import index d002184..f1475ed 100644 --- a/ressources/images/blob-1.png.png.import +++ b/ressources/images/blob-1.png.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://ba14nw87lxef4" +uid="uid://dchan5vdmu4n0" path="res://.godot/imported/blob-1.png.png-d6117acd2391c64f472af8433c684912.ctex" metadata={ "vram_texture": false diff --git a/ressources/images/blob-2-4.png b/ressources/images/blob-2-4.png deleted file mode 100644 index a27e95b..0000000 Binary files a/ressources/images/blob-2-4.png and /dev/null differ diff --git a/ressources/images/blob-2-4.png.import b/ressources/images/blob-2-4.png.import deleted file mode 100644 index 01f397e..0000000 --- a/ressources/images/blob-2-4.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c0b6d7551nbcm" -path="res://.godot/imported/blob-2-4.png-8f8a62d20dd82590103b51de72f717b4.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/blob-2-4.png" -dest_files=["res://.godot/imported/blob-2-4.png-8f8a62d20dd82590103b51de72f717b4.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/blob-2-4.png.png b/ressources/images/blob-2-4.png.png new file mode 100644 index 0000000..fa19bf8 Binary files /dev/null and b/ressources/images/blob-2-4.png.png differ diff --git a/ressources/images/blob-2-4.png.png.import b/ressources/images/blob-2-4.png.png.import index 09edb48..47ff61c 100644 --- a/ressources/images/blob-2-4.png.png.import +++ b/ressources/images/blob-2-4.png.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cpge55gmdllmi" +uid="uid://bllbd2jxgi270" path="res://.godot/imported/blob-2-4.png.png-808d98b15f20529346c9c4c50162a975.ctex" metadata={ "vram_texture": false diff --git a/ressources/images/blob-3-side.png b/ressources/images/blob-3-side.png deleted file mode 100644 index cbaf6b8..0000000 Binary files a/ressources/images/blob-3-side.png and /dev/null differ diff --git a/ressources/images/blob-3-side.png.import b/ressources/images/blob-3-side.png.import deleted file mode 100644 index 0e3cf2d..0000000 --- a/ressources/images/blob-3-side.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c1rqfml1fi47x" -path="res://.godot/imported/blob-3-side.png-8e7a728592313317d153fcb83a7f39d1.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/blob-3-side.png" -dest_files=["res://.godot/imported/blob-3-side.png-8e7a728592313317d153fcb83a7f39d1.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/blob-3.png b/ressources/images/blob-3.png deleted file mode 100644 index 46bec33..0000000 Binary files a/ressources/images/blob-3.png and /dev/null differ diff --git a/ressources/images/blob-3.png.import b/ressources/images/blob-3.png.import deleted file mode 100644 index 56825fe..0000000 --- a/ressources/images/blob-3.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://2gqy3xv26df1" -path="res://.godot/imported/blob-3.png-21e1188ac3f7d6d1fc150fb86934dec2.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/blob-3.png" -dest_files=["res://.godot/imported/blob-3.png-21e1188ac3f7d6d1fc150fb86934dec2.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/blob-3.png.png b/ressources/images/blob-3.png.png new file mode 100644 index 0000000..ff0fa33 Binary files /dev/null and b/ressources/images/blob-3.png.png differ diff --git a/ressources/images/blob-3.png.png.import b/ressources/images/blob-3.png.png.import index ce511d2..a85f072 100644 --- a/ressources/images/blob-3.png.png.import +++ b/ressources/images/blob-3.png.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bst1iwqgqmcvl" +uid="uid://32dcs4rylimt" path="res://.godot/imported/blob-3.png.png-902563b57bcfa6ab9c15d19bab7245bc.ctex" metadata={ "vram_texture": false diff --git a/ressources/images/flute.svg b/ressources/images/flute.svg deleted file mode 100644 index 67260d0..0000000 --- a/ressources/images/flute.svg +++ /dev/null @@ -1,807 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ressources/images/flute.svg.import b/ressources/images/flute.svg.import deleted file mode 100644 index 95ba210..0000000 --- a/ressources/images/flute.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bncbi6cd1m5y7" -path="res://.godot/imported/flute.svg-bf28f6d38b772e3242eff5d2354ec4d2.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/flute.svg" -dest_files=["res://.godot/imported/flute.svg-bf28f6d38b772e3242eff5d2354ec4d2.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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/ressources/images/griffes.svg b/ressources/images/griffes.svg deleted file mode 100644 index 11dbf4e..0000000 --- a/ressources/images/griffes.svg +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ressources/images/griffes.svg.import b/ressources/images/griffes.svg.import deleted file mode 100644 index a2044df..0000000 --- a/ressources/images/griffes.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bv3bmi78swof6" -path="res://.godot/imported/griffes.svg-079f52f6afcee5e6131bbd74232b9d62.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/griffes.svg" -dest_files=["res://.godot/imported/griffes.svg-079f52f6afcee5e6131bbd74232b9d62.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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/ressources/images/lyre.svg b/ressources/images/lyre.svg deleted file mode 100644 index 2c5736d..0000000 --- a/ressources/images/lyre.svg +++ /dev/null @@ -1,1463 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ressources/images/lyre.svg.import b/ressources/images/lyre.svg.import deleted file mode 100644 index 519e63f..0000000 --- a/ressources/images/lyre.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dt40xf4l5fkbj" -path="res://.godot/imported/lyre.svg-5af44a7ae782071492f81d66e88d9879.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/lyre.svg" -dest_files=["res://.godot/imported/lyre.svg-5af44a7ae782071492f81d66e88d9879.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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/ressources/images/note corde.png b/ressources/images/note corde.png deleted file mode 100644 index 6d728a1..0000000 Binary files a/ressources/images/note corde.png and /dev/null differ diff --git a/ressources/images/note corde.png.import b/ressources/images/note corde.png.import deleted file mode 100644 index a5fac91..0000000 --- a/ressources/images/note corde.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b06px0ltf8bt4" -path="res://.godot/imported/note corde.png-829cc70a78b1408c05dcc7f0c273195c.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/note corde.png" -dest_files=["res://.godot/imported/note corde.png-829cc70a78b1408c05dcc7f0c273195c.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/ronde tambour.png.png.import b/ressources/images/ronde tambour.png.png.import index 7557ba7..59e2a39 100644 --- a/ressources/images/ronde tambour.png.png.import +++ b/ressources/images/ronde tambour.png.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cb5xpbtagu6jv" +uid="uid://bq2gg8sxvwth2" path="res://.godot/imported/ronde tambour.png.png-8204fac6218763c8b21d53d07c48f5f9.ctex" metadata={ "vram_texture": false diff --git a/ressources/images/tambour.svg b/ressources/images/tambour.svg deleted file mode 100644 index da49aa7..0000000 --- a/ressources/images/tambour.svg +++ /dev/null @@ -1,2595 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ressources/images/tambour.svg.import b/ressources/images/tambour.svg.import deleted file mode 100644 index 7544cd1..0000000 --- a/ressources/images/tambour.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dewdebuafjygw" -path="res://.godot/imported/tambour.svg-3f7dcf47f7d6e432a9a3a9f002a1befc.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/tambour.svg" -dest_files=["res://.godot/imported/tambour.svg-3f7dcf47f7d6e432a9a3a9f002a1befc.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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/ressources/images/zone.svg b/ressources/images/zone.svg deleted file mode 100644 index 40aa433..0000000 --- a/ressources/images/zone.svg +++ /dev/null @@ -1,1049 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ressources/images/zone.svg.import b/ressources/images/zone.svg.import deleted file mode 100644 index 8fd4dff..0000000 --- a/ressources/images/zone.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ctanh12vqwoyv" -path="res://.godot/imported/zone.svg-27a2eac56a392d908f7743275f5dfa5f.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/zone.svg" -dest_files=["res://.godot/imported/zone.svg-27a2eac56a392d908f7743275f5dfa5f.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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/ressources/sons/fight_theme.wav b/ressources/sons/fight_theme.wav deleted file mode 100644 index c0e8a7c..0000000 Binary files a/ressources/sons/fight_theme.wav and /dev/null differ diff --git a/ressources/sons/fight_theme.wav.import b/ressources/sons/fight_theme.wav.import deleted file mode 100644 index da195e7..0000000 --- a/ressources/sons/fight_theme.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://lcbpro5khlpt" -path="res://.godot/imported/fight_theme.wav-652d35e829bd5458eac762c6c24bae9c.sample" - -[deps] - -source_file="res://ressources/sons/fight_theme.wav" -dest_files=["res://.godot/imported/fight_theme.wav-652d35e829bd5458eac762c6c24bae9c.sample"] - -[params] - -force/8_bit=false -force/mono=false -force/max_rate=false -force/max_rate_hz=44100 -edit/trim=false -edit/normalize=false -edit/loop_mode=0 -edit/loop_begin=0 -edit/loop_end=-1 -compress/mode=0 diff --git a/scenes/Room.tscn b/scenes/Room.tscn index f4e6aa0..5f29738 100644 --- a/scenes/Room.tscn +++ b/scenes/Room.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=8 format=3 uid="uid://durhes43gex7a"] +[gd_scene load_steps=7 format=3 uid="uid://durhes43gex7a"] [ext_resource type="PackedScene" uid="uid://c7bfiw54rvaq2" path="res://scenes/player_melodie.tscn" id="1_cl1wt"] [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"] [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_1c4te"] normal = Vector2(0, 1) @@ -49,6 +48,3 @@ shape = SubResource("WorldBoundaryShape2D_ia1hi") [node name="CanvasLayer" type="CanvasLayer" parent="."] [node name="Camera2D" type="Camera2D" parent="CanvasLayer"] - -[node name="Slime" parent="." instance=ExtResource("3_04ip2")] -position = Vector2(-448, 205) diff --git a/scenes/enemies/slime.gd b/scenes/enemies/slime.gd deleted file mode 100644 index 6f42d06..0000000 --- a/scenes/enemies/slime.gd +++ /dev/null @@ -1,34 +0,0 @@ -extends CharacterBody2D - - -const SPEED = 100.0 -var old_pos = Vector2.ZERO -@onready var player = get_parent().get_node("Player_Melodie") -var player_position = Vector2.ZERO -var target_position = Vector2.ZERO - -var move_timer = 2 - - -func _physics_process(delta: float) -> void: - player_position = player.position - target_position = (player_position - position).normalized() - move_and_slide() - for i in get_slide_collision_count(): - var collision = get_slide_collision(i) - print("Collided with: ", collision.get_collider().name) - -func _process(delta: float) -> void: - var direction : Vector2 - if move_timer > 0 : - move_timer -= delta - direction = Vector2.ZERO - else : - direction = target_position - - if old_pos == position : - $AnimatedSprite2D.play("idle") - else : - $AnimatedSprite2D.play("walk_down") - - velocity = direction * SPEED diff --git a/scenes/enemies/slime.tscn b/scenes/enemies/slime.tscn deleted file mode 100644 index 7f074c1..0000000 --- a/scenes/enemies/slime.tscn +++ /dev/null @@ -1,54 +0,0 @@ -[gd_scene load_steps=7 format=3 uid="uid://cyvqa6g64cw37"] - -[ext_resource type="Script" path="res://scenes/enemies/slime.gd" id="1_hnufy"] -[ext_resource type="Texture2D" uid="uid://devrwnq1oj3qv" path="res://ressources/images/blob-1.png.png" id="1_n4mgf"] -[ext_resource type="Texture2D" uid="uid://b0cua5ecp7bfw" path="res://ressources/images/blob-2-4.png.png" id="2_w8gqg"] -[ext_resource type="Texture2D" uid="uid://cc1kqgdbwm1dh" path="res://ressources/images/blob-3.png.png" id="3_pwpfc"] - -[sub_resource type="SpriteFrames" id="SpriteFrames_qfla8"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("1_n4mgf") -}, { -"duration": 1.0, -"texture": ExtResource("2_w8gqg") -}], -"loop": false, -"name": &"idle", -"speed": 3.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("1_n4mgf") -}, { -"duration": 1.0, -"texture": ExtResource("2_w8gqg") -}, { -"duration": 1.0, -"texture": ExtResource("3_pwpfc") -}, { -"duration": 1.0, -"texture": ExtResource("2_w8gqg") -}], -"loop": true, -"name": &"walk_down", -"speed": 3.0 -}] - -[sub_resource type="CircleShape2D" id="CircleShape2D_bokrm"] -radius = 20.0 - -[node name="Slime" type="CharacterBody2D"] -script = ExtResource("1_hnufy") - -[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -position = Vector2(-3, 12) -sprite_frames = SubResource("SpriteFrames_qfla8") -animation = &"idle" -frame = 1 -frame_progress = 1.0 - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource("CircleShape2D_bokrm") -disabled = true