diff --git a/menu_principal/menu_principal_affichage.gd b/menu_principal/menu_principal_affichage.gd index 627ed76..ea249a2 100644 --- a/menu_principal/menu_principal_affichage.gd +++ b/menu_principal/menu_principal_affichage.gd @@ -8,6 +8,7 @@ var first_room = preload("res://scenes/Room.tscn").instantiate() func _ready(): menu_parametres.exit_parametres.connect(on_exit_parametres) + first_room.daddy.connect(on_daddy) # Called every frame. 'delta' is the elapsed time since the previous frame. @@ -45,3 +46,9 @@ func _on_play_button_pressed(): func _on_musique_fond_finished() -> void: musique_fond.play() + +func on_daddy () -> void : + musique_fond.playing = true + menu_principal.visible = true + first_room = preload("res://scenes/Room.tscn").instantiate() + first_room.daddy.connect(on_daddy) diff --git a/ressources/images/icone_mort.svg b/ressources/images/icone_mort.svg new file mode 100644 index 0000000..af6571d --- /dev/null +++ b/ressources/images/icone_mort.svg @@ -0,0 +1,5835 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ressources/images/icone_mort.svg.import b/ressources/images/icone_mort.svg.import new file mode 100644 index 0000000..f66adef --- /dev/null +++ b/ressources/images/icone_mort.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://j8hopa3c7fr3" +path="res://.godot/imported/icone_mort.svg-9c4d18d674b077967d7e3abe6c469e2a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/icone_mort.svg" +dest_files=["res://.godot/imported/icone_mort.svg-9c4d18d674b077967d7e3abe6c469e2a.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/mob-death-1.png b/ressources/images/mob-death-1.png new file mode 100644 index 0000000..a7fe157 Binary files /dev/null and b/ressources/images/mob-death-1.png differ diff --git a/ressources/images/mob-death-1.png.import b/ressources/images/mob-death-1.png.import new file mode 100644 index 0000000..39001df --- /dev/null +++ b/ressources/images/mob-death-1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c5lk8ab1g5anw" +path="res://.godot/imported/mob-death-1.png-284462b68d775d41a0e5b3dea896c703.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/mob-death-1.png" +dest_files=["res://.godot/imported/mob-death-1.png-284462b68d775d41a0e5b3dea896c703.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/mob-death-2.png b/ressources/images/mob-death-2.png new file mode 100644 index 0000000..e8f8cbd Binary files /dev/null and b/ressources/images/mob-death-2.png differ diff --git a/ressources/images/mob-death-2.png.import b/ressources/images/mob-death-2.png.import new file mode 100644 index 0000000..5d54236 --- /dev/null +++ b/ressources/images/mob-death-2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c4fau2t7w8cll" +path="res://.godot/imported/mob-death-2.png-6132e0c0c8563bd70a68d9b7f7638167.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/mob-death-2.png" +dest_files=["res://.godot/imported/mob-death-2.png-6132e0c0c8563bd70a68d9b7f7638167.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/mob-death-3.png b/ressources/images/mob-death-3.png new file mode 100644 index 0000000..bb91e40 Binary files /dev/null and b/ressources/images/mob-death-3.png differ diff --git a/ressources/images/mob-death-3.png.import b/ressources/images/mob-death-3.png.import new file mode 100644 index 0000000..9e55e3d --- /dev/null +++ b/ressources/images/mob-death-3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c446xwqg0ngk" +path="res://.godot/imported/mob-death-3.png-94f44228dfb3bd0a9c4c288ef2c56b46.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/mob-death-3.png" +dest_files=["res://.godot/imported/mob-death-3.png-94f44228dfb3bd0a9c4c288ef2c56b46.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/lyre-1.mp3 b/ressources/sons/lyre-1.mp3 new file mode 100644 index 0000000..b03bbb3 Binary files /dev/null and b/ressources/sons/lyre-1.mp3 differ diff --git a/ressources/sons/lyre-1.mp3.import b/ressources/sons/lyre-1.mp3.import new file mode 100644 index 0000000..1388614 --- /dev/null +++ b/ressources/sons/lyre-1.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://gdw0h7n505ex" +path="res://.godot/imported/lyre-1.mp3-c80210f4ac9ae24119064f8e4f3da8e7.mp3str" + +[deps] + +source_file="res://ressources/sons/lyre-1.mp3" +dest_files=["res://.godot/imported/lyre-1.mp3-c80210f4ac9ae24119064f8e4f3da8e7.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/lyre-2.mp3 b/ressources/sons/lyre-2.mp3 new file mode 100644 index 0000000..35cdfd7 Binary files /dev/null and b/ressources/sons/lyre-2.mp3 differ diff --git a/ressources/sons/lyre-2.mp3.import b/ressources/sons/lyre-2.mp3.import new file mode 100644 index 0000000..1a62af9 --- /dev/null +++ b/ressources/sons/lyre-2.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://c5rq0u1p4omgj" +path="res://.godot/imported/lyre-2.mp3-40b20de3d10205e2c2a72d84980e5a95.mp3str" + +[deps] + +source_file="res://ressources/sons/lyre-2.mp3" +dest_files=["res://.godot/imported/lyre-2.mp3-40b20de3d10205e2c2a72d84980e5a95.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/lyre-3.mp3 b/ressources/sons/lyre-3.mp3 new file mode 100644 index 0000000..6b50aa9 Binary files /dev/null and b/ressources/sons/lyre-3.mp3 differ diff --git a/ressources/sons/lyre-3.mp3.import b/ressources/sons/lyre-3.mp3.import new file mode 100644 index 0000000..9202548 --- /dev/null +++ b/ressources/sons/lyre-3.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bukckn74h8qit" +path="res://.godot/imported/lyre-3.mp3-10e138915528f15a8c34a291d5358aac.mp3str" + +[deps] + +source_file="res://ressources/sons/lyre-3.mp3" +dest_files=["res://.godot/imported/lyre-3.mp3-10e138915528f15a8c34a291d5358aac.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/tambour-1.mp3 b/ressources/sons/tambour-1.mp3 new file mode 100644 index 0000000..3efc224 Binary files /dev/null and b/ressources/sons/tambour-1.mp3 differ diff --git a/ressources/sons/tambour-1.mp3.import b/ressources/sons/tambour-1.mp3.import new file mode 100644 index 0000000..55549a3 --- /dev/null +++ b/ressources/sons/tambour-1.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://dsgqlnwdavr31" +path="res://.godot/imported/tambour-1.mp3-83b692f46e82a050f4e0779bed39ab31.mp3str" + +[deps] + +source_file="res://ressources/sons/tambour-1.mp3" +dest_files=["res://.godot/imported/tambour-1.mp3-83b692f46e82a050f4e0779bed39ab31.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/tambour-2.mp3 b/ressources/sons/tambour-2.mp3 new file mode 100644 index 0000000..be34011 Binary files /dev/null and b/ressources/sons/tambour-2.mp3 differ diff --git a/ressources/sons/tambour-2.mp3.import b/ressources/sons/tambour-2.mp3.import new file mode 100644 index 0000000..af52c3a --- /dev/null +++ b/ressources/sons/tambour-2.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://70pje8gb7lkk" +path="res://.godot/imported/tambour-2.mp3-c4549ea18e4752cff8d8cbac5d8bc454.mp3str" + +[deps] + +source_file="res://ressources/sons/tambour-2.mp3" +dest_files=["res://.godot/imported/tambour-2.mp3-c4549ea18e4752cff8d8cbac5d8bc454.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/tambour-3.mp3 b/ressources/sons/tambour-3.mp3 new file mode 100644 index 0000000..87564af Binary files /dev/null and b/ressources/sons/tambour-3.mp3 differ diff --git a/ressources/sons/tambour-3.mp3.import b/ressources/sons/tambour-3.mp3.import new file mode 100644 index 0000000..3dae883 --- /dev/null +++ b/ressources/sons/tambour-3.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bg444hrwfybe2" +path="res://.godot/imported/tambour-3.mp3-0e249b17e43a29c0542095a34eae6a8b.mp3str" + +[deps] + +source_file="res://ressources/sons/tambour-3.mp3" +dest_files=["res://.godot/imported/tambour-3.mp3-0e249b17e43a29c0542095a34eae6a8b.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/ressources/sons/tambour.mp3 b/ressources/sons/tambour.mp3 deleted file mode 100644 index f6bbe90..0000000 Binary files a/ressources/sons/tambour.mp3 and /dev/null differ diff --git a/scenes/Room.tscn b/scenes/Room.tscn index 6ab8606..03cb3e8 100644 --- a/scenes/Room.tscn +++ b/scenes/Room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=3 uid="uid://durhes43gex7a"] +[gd_scene load_steps=16 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"] @@ -9,6 +9,7 @@ [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"] [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_1c4te"] @@ -136,6 +137,12 @@ texture = ExtResource("4_6a3f6") [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 +offset_right = -640.0 +offset_bottom = -360.0 + [node name="Menu_parametres" parent="." instance=ExtResource("6_6ubhx")] process_mode = 3 visible = false @@ -144,13 +151,16 @@ offset_top = -360.0 offset_right = 640.0 offset_bottom = 360.0 -[node name="Interface" parent="." instance=ExtResource("8_5s7tf")] -offset_left = -640.0 -offset_top = -360.0 -offset_right = -640.0 -offset_bottom = -360.0 +[node name="Ecran mort" parent="." instance=ExtResource("10_3ou8w")] +process_mode = 3 +visible = false +offset_left = -258.0 +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) [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/ecran_mort.gd b/scenes/ecran_mort.gd new file mode 100644 index 0000000..05d8e0f --- /dev/null +++ b/scenes/ecran_mort.gd @@ -0,0 +1,16 @@ +extends Control + +signal retour_menu () + +# 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_main_menu_button_pressed() -> void: + retour_menu.emit() diff --git a/scenes/ecran_mort.tscn b/scenes/ecran_mort.tscn new file mode 100644 index 0000000..eedf053 --- /dev/null +++ b/scenes/ecran_mort.tscn @@ -0,0 +1,81 @@ +[gd_scene load_steps=6 format=3 uid="uid://ctgxrbcg2vu1p"] + +[ext_resource type="Texture2D" uid="uid://j8hopa3c7fr3" path="res://ressources/images/icone_mort.svg" id="1_ekgu8"] +[ext_resource type="Script" path="res://scenes/ecran_mort.gd" id="1_k44wh"] +[ext_resource type="FontFile" uid="uid://dbe1teksyhymq" path="res://ressources/fonts/OpenDyslexic-Regular.otf" id="2_usedy"] +[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"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +script = ExtResource("1_k44wh") + +[node name="HBoxContainer" type="HBoxContainer" parent="."] +layout_mode = 0 +offset_right = 40.0 +offset_bottom = 40.0 + +[node name="VSeparator" type="VSeparator" parent="HBoxContainer"] +modulate = Color(1, 1, 1, 0) +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"] +layout_mode = 2 + +[node name="TextureRect" type="TextureRect" parent="HBoxContainer/VBoxContainer"] +custom_minimum_size = Vector2(500, 500) +layout_mode = 2 +texture = ExtResource("1_ekgu8") +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) +offset_left = 89.0 +offset_top = 187.0 +offset_right = 414.0 +offset_bottom = 315.0 +theme_override_fonts/font = ExtResource("2_usedy") +theme_override_font_sizes/font_size = 32 +text = "Vous êtes +mort" +horizontal_alignment = 1 +vertical_alignment = 1 +language = "fr_FR" + +[node name="main_menu_button" type="TextureButton" parent="HBoxContainer/VBoxContainer"] +custom_minimum_size = Vector2(250, 250) +layout_mode = 2 +texture_normal = ExtResource("3_ecfx2") +texture_pressed = ExtResource("4_jv24w") +texture_hover = ExtResource("4_jv24w") +texture_disabled = ExtResource("4_jv24w") +texture_focused = ExtResource("4_jv24w") +stretch_mode = 0 + +[node name="main_menu_label" type="Label" parent="HBoxContainer/VBoxContainer/main_menu_button"] +modulate = Color(0, 0, 0, 1) +layout_mode = 0 +offset_left = 89.0 +offset_top = 62.0 +offset_right = 414.0 +offset_bottom = 190.0 +theme_override_fonts/font = ExtResource("2_usedy") +theme_override_font_sizes/font_size = 32 +text = "Menu Principal" +horizontal_alignment = 1 +vertical_alignment = 1 +language = "fr_FR" + +[node name="VSeparator2" type="VSeparator" parent="HBoxContainer"] +modulate = Color(1, 1, 1, 0) +layout_mode = 2 +size_flags_horizontal = 3 + +[connection signal="pressed" from="HBoxContainer/VBoxContainer/main_menu_button" to="." method="_on_main_menu_button_pressed"] diff --git a/scenes/interface.gd b/scenes/interface.gd index 7f623f1..40ded95 100644 --- a/scenes/interface.gd +++ b/scenes/interface.gd @@ -12,6 +12,8 @@ extends Control @onready var life : int = 10 +signal mort () + # Called when the node enters the scene tree for the first time. func _ready() -> void: pass @@ -22,7 +24,10 @@ func _process(delta: float) -> void: pass func set_life(pv : int) -> void : - for i in range(life, pv): + var step = 1 + if pv > life : + step = -1 + for i in range(life, pv, step): update_life(i) update_life(pv) @@ -30,7 +35,7 @@ func update_life (pv : int) -> void : match pv : 0 : coeur1.hide() - #Rajouter ici la gestion de la mort + mort.emit() 1 : coeur1.texture = load("res://ressources/images/half_heart.svg") 2 : diff --git a/scenes/room.gd b/scenes/room.gd index 4b0719a..84dc284 100644 --- a/scenes/room.gd +++ b/scenes/room.gd @@ -2,11 +2,16 @@ extends Node2D @onready var menu_parametres = $Menu_parametres @onready var interface = $Interface +@onready var mort = $"Ecran mort" @onready var musique = $Musique +signal daddy () + # Called when the node enters the scene tree for the first time. func _ready() -> void: menu_parametres.exit_parametres.connect(on_exit_parametres) + mort.retour_menu.connect(on_ecran_mort_retour_menu) + interface.mort.connect(on_death) # Called every frame. 'delta' is the elapsed time since the previous frame. @@ -37,3 +42,11 @@ func set_musique(nom : String) -> void : musique.stream = load("res://ressources/sons/fight_theme.wav") _ : pass + + +func on_ecran_mort_retour_menu() -> void: + daddy.emit() + queue_free() + +func on_death() -> void : + mort.visible = true diff --git a/scripts/player_control.gd b/scripts/player_control.gd index a89ee09..354fafe 100644 --- a/scripts/player_control.gd +++ b/scripts/player_control.gd @@ -107,5 +107,3 @@ func _process(delta: float) -> void: func take_damage(dmg : int) : vie -= dmg interface.set_life(vie) - if vie <= 0: - queue_free()