Debugged Shockwave

buloz · Apr 16, 2024 · 3598e07 · 3598e07
1 parent 7efe8a7
commit 3598e07
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/Projet/Scenes/Attacks/Golem/Shockwave.tscn b/Projet/Scenes/Attacks/Golem/Shockwave.tscn
@@ -7,6 +7,7 @@
 [ext_resource type="AudioStream" uid="uid://cesr7dpc84k6h" path="res://Ressources/sounds/attack/explosion2.wav" id="5_cydjl"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_5147m"]
+resource_local_to_scene = true
 radius = 300.0
 
 [sub_resource type="Animation" id="Animation_ypmgq"]
@@ -100,6 +101,7 @@ attack = NodePath("AttackComponent")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("CircleShape2D_5147m")
+debug_color = Color(0.964706, 0, 0.498039, 0.419608)
 
 [node name="TravelTimer" type="Timer" parent="."]
 wait_time = 0.2

diff --git a/Projet/Scenes/Attacks/Haunted/Howl.tscn b/Projet/Scenes/Attacks/Haunted/Howl.tscn
@@ -10,6 +10,7 @@
 [ext_resource type="AudioStream" uid="uid://b4g2mvxlwlcjq" path="res://Ressources/sounds/attack/wolf5.wav" id="8_iufgq"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_5147m"]
+resource_local_to_scene = true
 
 [sub_resource type="Animation" id="Animation_sxgke"]
 length = 0.001
@@ -109,6 +110,7 @@ attack = NodePath("AttackComponent")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("CircleShape2D_5147m")
+debug_color = Color(0.635294, 0.52549, 0.0588235, 0.419608)
 
 [node name="TravelTimer" type="Timer" parent="."]
 wait_time = 0.2

diff --git a/Projet/Scenes/Entity/Summon/Summon.tscn b/Projet/Scenes/Entity/Summon/Summon.tscn
@@ -43,9 +43,6 @@
 [ext_resource type="AudioStream" uid="uid://b0skhrdghudth" path="res://Ressources/sounds/summons/spectredeath4.wav" id="41_prsqb"]
 [ext_resource type="AudioStream" uid="uid://cqpfg0egpbd48" path="res://Ressources/sounds/summons/spectredeath5.wav" id="42_wq03n"]
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_5ikrt"]
-size = Vector2(40, 40)
-
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_qj3d4"]
 shader = ExtResource("9_f7ot6")
 shader_parameter/walkingAlpha = null
@@ -153,6 +150,9 @@ stream_3/weight = 1.0
 stream_4/stream = ExtResource("37_eb5a3")
 stream_4/weight = 1.0
 
+[sub_resource type="CircleShape2D" id="CircleShape2D_yfpa6"]
+radius = 38.0526
+
 [node name="Summon" type="Node2D"]
 y_sort_enabled = true
 script = ExtResource("1_8wfjq")
@@ -166,13 +166,6 @@ MaxHealth = 20.0
 [node name="DamageReceiver" parent="." node_paths=PackedStringArray("hitBoxComponent") instance=ExtResource("3_klaw6")]
 hitBoxComponent = NodePath("../HitBoxComponent")
 
-[node name="HitBoxComponent" parent="." node_paths=PackedStringArray("healthComponent") instance=ExtResource("3_d1y05")]
-collision_mask = 2
-healthComponent = NodePath("../HealthComponent")
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="HitBoxComponent"]
-shape = SubResource("RectangleShape2D_5ikrt")
-
 [node name="AttackComponent" parent="." instance=ExtResource("6_y6iwy")]
 attack_damage = 5.0
 attack_cooldown = 0.1
@@ -205,3 +198,11 @@ pitch_scale = 1.15
 stream = SubResource("AudioStreamRandomizer_qka3f")
 volume_db = -5.0
 pitch_scale = 0.8
+
+[node name="HitBoxComponent" parent="." node_paths=PackedStringArray("healthComponent") instance=ExtResource("3_d1y05")]
+collision_mask = 2
+healthComponent = NodePath("../HealthComponent")
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="HitBoxComponent"]
+shape = SubResource("CircleShape2D_yfpa6")
+debug_color = Color(0.913725, 0, 0.713726, 0.419608)
diff --git a/Projet/Scenes/Menu/main_scene.tscn b/Projet/Scenes/Menu/main_scene.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=7 format=3 uid="uid://bu2rqxb6vsfem"]
+[gd_scene load_steps=8 format=3 uid="uid://bu2rqxb6vsfem"]
 
 [ext_resource type="Script" path="res://Scenes/Debug/MainScene.gd" id="1_im8m3"]
 [ext_resource type="PackedScene" uid="uid://lklc8nrekfu5" path="res://Scenes/Background/Background.tscn" id="2_r45ms"]