From e9952f4ec923788246ca1496d7d0f458c05ec7e1 Mon Sep 17 00:00:00 2001 From: Renarde-dev Date: Fri, 24 Jan 2025 21:18:53 +0100 Subject: [PATCH] Remove print and merge assets --- ressources/images/poulpe-1.png.import | 34 ++++++++++++++++++++++ ressources/images/poulpe-2.png.import | 34 ++++++++++++++++++++++ ressources/images/poulpe-atk.png.import | 34 ++++++++++++++++++++++ ressources/images/poulpe-bullet.png.import | 34 ++++++++++++++++++++++ ressources/sons/idle_theme.wav.import | 24 +++++++++++++++ scenes/attaques/Balle.tscn | 3 +- scenes/enemies/slime.gd | 1 - 7 files changed, 161 insertions(+), 3 deletions(-) create mode 100644 ressources/images/poulpe-1.png.import create mode 100644 ressources/images/poulpe-2.png.import create mode 100644 ressources/images/poulpe-atk.png.import create mode 100644 ressources/images/poulpe-bullet.png.import create mode 100644 ressources/sons/idle_theme.wav.import diff --git a/ressources/images/poulpe-1.png.import b/ressources/images/poulpe-1.png.import new file mode 100644 index 0000000..a0600ae --- /dev/null +++ b/ressources/images/poulpe-1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://2spn60rmdyy5" +path="res://.godot/imported/poulpe-1.png-9fe980980e71224a7a2953bc228f988d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/poulpe-1.png" +dest_files=["res://.godot/imported/poulpe-1.png-9fe980980e71224a7a2953bc228f988d.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/poulpe-2.png.import b/ressources/images/poulpe-2.png.import new file mode 100644 index 0000000..d147605 --- /dev/null +++ b/ressources/images/poulpe-2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b4ukmsspx16f" +path="res://.godot/imported/poulpe-2.png-e0bb613d3a74e50be7b911ae44672c8a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/poulpe-2.png" +dest_files=["res://.godot/imported/poulpe-2.png-e0bb613d3a74e50be7b911ae44672c8a.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/poulpe-atk.png.import b/ressources/images/poulpe-atk.png.import new file mode 100644 index 0000000..1f97b0a --- /dev/null +++ b/ressources/images/poulpe-atk.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dinxaox0ug7kx" +path="res://.godot/imported/poulpe-atk.png-083584296229d569f6bbc6969a32bc79.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/poulpe-atk.png" +dest_files=["res://.godot/imported/poulpe-atk.png-083584296229d569f6bbc6969a32bc79.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/poulpe-bullet.png.import b/ressources/images/poulpe-bullet.png.import new file mode 100644 index 0000000..3640b00 --- /dev/null +++ b/ressources/images/poulpe-bullet.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bg7xknf5g2rfj" +path="res://.godot/imported/poulpe-bullet.png-b20bc813564a020a5c3d1f084af754d3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/poulpe-bullet.png" +dest_files=["res://.godot/imported/poulpe-bullet.png-b20bc813564a020a5c3d1f084af754d3.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/idle_theme.wav.import b/ressources/sons/idle_theme.wav.import new file mode 100644 index 0000000..496bf8c --- /dev/null +++ b/ressources/sons/idle_theme.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://drtyf4pv1cswd" +path="res://.godot/imported/idle_theme.wav-7d853091879d7fbaec43f980f4ba9daf.sample" + +[deps] + +source_file="res://ressources/sons/idle_theme.wav" +dest_files=["res://.godot/imported/idle_theme.wav-7d853091879d7fbaec43f980f4ba9daf.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/attaques/Balle.tscn b/scenes/attaques/Balle.tscn index 8a4e666..919db87 100644 --- a/scenes/attaques/Balle.tscn +++ b/scenes/attaques/Balle.tscn @@ -6,11 +6,10 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_1x7bj"] size = Vector2(8, 16) -[node name="Balle" type="Area2D" node_paths=PackedStringArray("raycast")] +[node name="Balle" type="Area2D"] collision_layer = 3 collision_mask = 3 script = ExtResource("1_4kd3w") -raycast = NodePath("") [node name="Sprite2D" type="Sprite2D" parent="."] rotation = 3.14159 diff --git a/scenes/enemies/slime.gd b/scenes/enemies/slime.gd index 6f42d06..adfd4ff 100644 --- a/scenes/enemies/slime.gd +++ b/scenes/enemies/slime.gd @@ -16,7 +16,6 @@ func _physics_process(delta: float) -> void: 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