diff --git a/ressources/images/full_heart.svg b/ressources/images/full_heart.svg deleted file mode 100644 index 4d34171..0000000 --- a/ressources/images/full_heart.svg +++ /dev/null @@ -1,593 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ressources/images/full_heart.svg.import b/ressources/images/full_heart.svg.import deleted file mode 100644 index e656293..0000000 --- a/ressources/images/full_heart.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://jyrl33rv1fnp" -path="res://.godot/imported/full_heart.svg-e5444af8ba77218c264db7c73bc41e09.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/full_heart.svg" -dest_files=["res://.godot/imported/full_heart.svg-e5444af8ba77218c264db7c73bc41e09.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/half_heart.svg b/ressources/images/half_heart.svg deleted file mode 100644 index f0b34aa..0000000 --- a/ressources/images/half_heart.svg +++ /dev/null @@ -1,298 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ressources/images/half_heart.svg.import b/ressources/images/half_heart.svg.import deleted file mode 100644 index e561b61..0000000 --- a/ressources/images/half_heart.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://blwxdgwmf60om" -path="res://.godot/imported/half_heart.svg-8874d5a3650dac8caf48118693ab0ab7.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ressources/images/half_heart.svg" -dest_files=["res://.godot/imported/half_heart.svg-8874d5a3650dac8caf48118693ab0ab7.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/scenes/Room.tscn b/scenes/Room.tscn index faf7e7b..b9011dc 100644 --- a/scenes/Room.tscn +++ b/scenes/Room.tscn @@ -1,14 +1,12 @@ -[gd_scene load_steps=14 format=3 uid="uid://durhes43gex7a"] +[gd_scene load_steps=12 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://cnd2a1x1smulq" path="res://scenes/interface.tscn" id="8_5s7tf"] [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_1c4te"] normal = Vector2(0, 1) @@ -28,12 +26,6 @@ distance = -596.0 [node name="Room" type="Node2D"] script = ExtResource("1_jh83c") -[node name="Musique" type="AudioStreamPlayer" parent="."] -process_mode = 3 -stream = ExtResource("2_8nbnd") -autoplay = true -bus = &"Music" - [node name="TextureRect" type="TextureRect" parent="."] offset_left = -638.0 offset_top = -360.0 @@ -134,12 +126,6 @@ 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 @@ -147,5 +133,3 @@ offset_left = -640.0 offset_top = -360.0 offset_right = 640.0 offset_bottom = 360.0 - -[connection signal="finished" from="Musique" to="." method="_on_audio_stream_player_finished"] diff --git a/scenes/interface.gd b/scenes/interface.gd deleted file mode 100644 index 400855a..0000000 --- a/scenes/interface.gd +++ /dev/null @@ -1,90 +0,0 @@ -extends Control - -@onready var coeur1 = $VBoxContainer/HBoxContainer/TextureRect1 -@onready var coeur2 = $VBoxContainer/HBoxContainer/TextureRect2 -@onready var coeur3 = $VBoxContainer/HBoxContainer/TextureRect3 -@onready var coeur4 = $VBoxContainer/HBoxContainer/TextureRect4 -@onready var coeur5 = $VBoxContainer/HBoxContainer/TextureRect5 -#Les coeurs, 1 étant le plus à gauche et 5 le plus à droite - -@onready var slot1 = $VBoxContainer/HBoxContainer2/TextureRect -@onready var slot2 = $VBoxContainer/HBoxContainer2/TextureRect2 - -@onready var life : int = 10 - -# Called when the node enters the scene tree for the first time. -func _ready() -> void: - pass - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta: float) -> void: - pass - -func healing(pv : int) -> void : - for i in range(life , life+pv+1): - update_life(i) - -func update_life (pv : int) -> void : - match pv : - 0 : - coeur1.hide() - #Rajouter ici la gestion de la mort - 1 : - coeur1.texture = load("res://ressources/images/half_heart.svg") - 2 : - coeur1.texture = load("res://ressources/images/full_heart.svg") - coeur2.hide() - 3 : - coeur2.texture = load("res://ressources/images/half_heart.svg") - coeur2.show() - 4 : - coeur2.texture = load("res://ressources/images/full_heart.svg") - coeur3.hide() - 5 : - coeur3.texture = load("res://ressources/images/half_heart.svg") - coeur3.show() - 6 : - coeur3.texture = load("res://ressources/images/full_heart.svg") - coeur4.hide() - 7 : - coeur4.texture = load("res://ressources/images/half_heart.svg") - coeur4.show() - 8 : - coeur4.texture = load("res://ressources/images/full_heart.svg") - coeur5.hide() - 9 : - coeur5.texture = load("res://ressources/images/half_heart.svg") - coeur5.show() - 10 : - coeur5.texture = load("res://ressources/images/full_heart.svg") - _ : - return - - life = pv - - -func update_instrument (listeInstrument : Array) -> void : - if len(listeInstrument) < 2 : - slot1.texture = load("res://ressources/images/empty_slot.svg") - slot2.texture = load("res://ressources/images/empty_slot.svg") - - match listeInstrument[0] : - "flute" : - slot1.texture = load("res://ressources/images/flute.svg") - "tambour" : - slot1.texture = load("res://ressources/images/tambour.svg") - "lyre" : - slot1.texture = load("res://ressources/images/lyre.svg") - _ : - slot1.texture = load("res://ressources/images/empty_slot.svg") - - match listeInstrument[1] : - "flute" : - slot2.texture = load("res://ressources/images/flute.svg") - "tambour" : - slot2.texture = load("res://ressources/images/tambour.svg") - "lyre" : - slot2.texture = load("res://ressources/images/lyre.svg") - _ : - slot2.texture = load("res://ressources/images/empty_slot.svg") diff --git a/scenes/interface.tscn b/scenes/interface.tscn deleted file mode 100644 index d24e6ae..0000000 --- a/scenes/interface.tscn +++ /dev/null @@ -1,99 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://cnd2a1x1smulq"] - -[ext_resource type="Script" path="res://scenes/interface.gd" id="1_5p24o"] -[ext_resource type="Texture2D" uid="uid://jyrl33rv1fnp" path="res://ressources/images/full_heart.svg" id="2_opn3r"] -[ext_resource type="Texture2D" uid="uid://cy7cv4qcmyyol" path="res://ressources/images/empty_slot.svg" id="3_8aruj"] - -[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 -size_flags_horizontal = 3 -size_flags_vertical = 3 -script = ExtResource("1_5p24o") - -[node name="VBoxContainer" type="VBoxContainer" parent="."] -layout_mode = 0 -offset_right = 1280.0 -offset_bottom = 720.0 - -[node name="HSeparator2" type="HSeparator" parent="VBoxContainer"] -modulate = Color(1, 1, 1, 0) -self_modulate = Color(1, 1, 1, 0) -custom_minimum_size = Vector2(0, 12) -layout_mode = 2 - -[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] -layout_mode = 2 - -[node name="VSeparator" type="VSeparator" parent="VBoxContainer/HBoxContainer"] -modulate = Color(1, 1, 1, 0) -self_modulate = Color(1, 1, 1, 0) -custom_minimum_size = Vector2(32, 0) -layout_mode = 2 - -[node name="TextureRect1" type="TextureRect" parent="VBoxContainer/HBoxContainer"] -custom_minimum_size = Vector2(64, 64) -layout_mode = 2 -texture = ExtResource("2_opn3r") -expand_mode = 1 - -[node name="TextureRect2" type="TextureRect" parent="VBoxContainer/HBoxContainer"] -custom_minimum_size = Vector2(64, 64) -layout_mode = 2 -texture = ExtResource("2_opn3r") -expand_mode = 1 - -[node name="TextureRect3" type="TextureRect" parent="VBoxContainer/HBoxContainer"] -custom_minimum_size = Vector2(64, 64) -layout_mode = 2 -texture = ExtResource("2_opn3r") -expand_mode = 1 - -[node name="TextureRect4" type="TextureRect" parent="VBoxContainer/HBoxContainer"] -custom_minimum_size = Vector2(64, 64) -layout_mode = 2 -texture = ExtResource("2_opn3r") -expand_mode = 1 - -[node name="TextureRect5" type="TextureRect" parent="VBoxContainer/HBoxContainer"] -custom_minimum_size = Vector2(64, 64) -layout_mode = 2 -texture = ExtResource("2_opn3r") -expand_mode = 1 - -[node name="HSeparator" type="HSeparator" parent="VBoxContainer"] -modulate = Color(1, 1, 1, 0) -self_modulate = Color(1, 1, 1, 0) -layout_mode = 2 -size_flags_vertical = 3 - -[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"] -layout_mode = 2 - -[node name="VSeparator" type="VSeparator" parent="VBoxContainer/HBoxContainer2"] -modulate = Color(1, 1, 1, 0) -self_modulate = Color(1, 1, 1, 0) -custom_minimum_size = Vector2(32, 0) -layout_mode = 2 - -[node name="TextureRect" type="TextureRect" parent="VBoxContainer/HBoxContainer2"] -custom_minimum_size = Vector2(64, 64) -layout_mode = 2 -texture = ExtResource("3_8aruj") -expand_mode = 1 - -[node name="TextureRect2" type="TextureRect" parent="VBoxContainer/HBoxContainer2"] -custom_minimum_size = Vector2(64, 64) -layout_mode = 2 -texture = ExtResource("3_8aruj") -expand_mode = 1 - -[node name="HSeparator3" type="HSeparator" parent="VBoxContainer"] -modulate = Color(1, 1, 1, 0) -self_modulate = Color(1, 1, 1, 0) -custom_minimum_size = Vector2(0, 12) -layout_mode = 2 diff --git a/scenes/room.gd b/scenes/room.gd index 4b0719a..5fbafdf 100644 --- a/scenes/room.gd +++ b/scenes/room.gd @@ -1,8 +1,6 @@ extends Node2D @onready var menu_parametres = $Menu_parametres -@onready var interface = $Interface -@onready var musique = $Musique # Called when the node enters the scene tree for the first time. func _ready() -> void: @@ -24,16 +22,3 @@ func on_exit_parametres() -> void : get_tree().paused = false menu_parametres.visible = false menu_parametres.set_process(false) - - -func _on_audio_stream_player_finished() -> void: - musique.play() - -func set_musique(nom : String) -> void : - match nom : - "idle" : - musique.stream = load("res://ressources/sons/idle_theme.wav") - "fight" : - musique.stream = load("res://ressources/sons/fight_theme.wav") - _ : - pass