Resolve img conflict

ressources/images/blob-1.png.import

@@ -0,0 +1,34 @@
+[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

ressources/images/blob-2-4.png.import

@@ -0,0 +1,34 @@
+[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

ressources/images/blob-3-side.png.import

@@ -0,0 +1,34 @@
+[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

ressources/images/blob-3.png.import

@@ -0,0 +1,34 @@
+[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

ressources/images/flute.svg.import

@@ -0,0 +1,37 @@
+[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

ressources/images/griffes.svg.import

@@ -0,0 +1,37 @@
+[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

ressources/images/lyre.svg.import

@@ -0,0 +1,37 @@
+[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

ressources/images/tambour.svg.import

@@ -0,0 +1,37 @@
+[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

ressources/images/zone.svg.import

@@ -0,0 +1,37 @@
+[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

scenes/Room.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=7 format=3 uid="uid://durhes43gex7a"]
+[gd_scene load_steps=8 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)
@@ -48,3 +49,6 @@ 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)

scenes/enemies/slime.gd

@@ -0,0 +1,34 @@
+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

scenes/enemies/slime.tscn

@@ -0,0 +1,54 @@
+[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