Fix elemental damage fx, fix dialogue error

This commit is contained in:
2026-04-25 16:06:59 -07:00
parent 6ba1a24dbb
commit 15bd5e9982
15 changed files with 21 additions and 77 deletions

View File

@@ -3973,28 +3973,24 @@ libraries = {
[node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -4504,28 +4504,24 @@ libraries = {
[node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -5765,28 +5765,24 @@ libraries = {
[node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -4775,14 +4775,12 @@ libraries = {
[node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="HolyHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="HolyHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
@@ -4801,14 +4799,12 @@ libraries = {
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -5454,14 +5454,12 @@ libraries = {
[node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
@@ -5474,7 +5472,6 @@ libraries = {
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -6811,7 +6811,6 @@ libraries = {
[node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
@@ -6824,28 +6823,24 @@ libraries = {
[node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -5392,7 +5392,6 @@ libraries = {
[node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
@@ -5411,21 +5410,18 @@ libraries = {
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -5351,7 +5351,6 @@ libraries = {
[node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
@@ -5370,21 +5369,18 @@ libraries = {
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -5461,7 +5461,6 @@ libraries = {
[node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
@@ -5474,14 +5473,12 @@ libraries = {
[node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
@@ -5494,7 +5491,6 @@ libraries = {
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -5434,7 +5434,6 @@ libraries = {
[node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
@@ -5453,21 +5452,18 @@ libraries = {
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -5630,7 +5630,6 @@ libraries = {
[node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
@@ -5649,21 +5648,18 @@ libraries = {
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -6742,7 +6742,6 @@ libraries = {
[node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
@@ -6755,28 +6754,24 @@ libraries = {
[node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WindHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -3925,21 +3925,18 @@ libraries = {
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -5371,7 +5371,6 @@ libraries = {
[node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="RustHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
@@ -5390,21 +5389,18 @@ libraries = {
[node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="WaterHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="CurseHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }
[node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"] [node name="EarthHitAnimation" type="AnimationPlayer" parent="VFXAnimations"]
unique_name_in_owner = true unique_name_in_owner = true
root_node = NodePath("../../Secondary Animation Player")
libraries = { libraries = {
&"": SubResource("AnimationLibrary_0tqwp") &"": SubResource("AnimationLibrary_0tqwp")
} }

View File

@@ -22,50 +22,50 @@ public partial class Npc : Node3D
public void OnReady() public void OnReady()
{ {
SetPhysicsProcess(true); SetPhysicsProcess(true);
DialogueZone.BodyEntered += DialogueZone_BodyEntered; DialogueZone.BodyEntered += DialogueZone_BodyEntered;
DialogueZone.BodyExited += DialogueZone_BodyExited; DialogueZone.BodyExited += DialogueZone_BodyExited;
DialogueExitZone.BodyExited += DialogueExitZone_BodyExited; DialogueExitZone.BodyExited += DialogueExitZone_BodyExited;
Hitbox.AreaEntered += Hitbox_AreaEntered; Hitbox.AreaEntered += Hitbox_AreaEntered;
} }
private void Hitbox_AreaEntered(Area3D area) private void Hitbox_AreaEntered(Area3D area)
{ {
if (area.GetOwner() is ThrownItem thrownItem) if (area.GetOwner() is ThrownItem thrownItem)
{ {
DialogueController.ShowDialogue(Dialogue, "get_item"); DialogueController.ShowDialogue(Dialogue, "get_item");
thrownItem.QueueFree(); thrownItem.QueueFree();
} }
} }
private void DialogueZone_BodyExited(Node3D body) private void DialogueZone_BodyExited(Node3D body)
{ {
_isInDialogueZone = false; _isInDialogueZone = false;
} }
private void DialogueExitZone_BodyExited(Node3D body) private void DialogueExitZone_BodyExited(Node3D body)
{ {
DialogueController.Interrupt(); DialogueController.Interrupt();
} }
private void DialogueZone_BodyEntered(Node3D body) private void DialogueZone_BodyEntered(Node3D body)
{ {
_isInDialogueZone = true; _isInDialogueZone = true;
} }
public override void _Input(InputEvent @event) public override void _Input(InputEvent @event)
{ {
if (@event.IsActionPressed(GameInputs.Interact) && _isInDialogueZone) if (Dialogue != null && @event.IsActionPressed(GameInputs.Interact) && _isInDialogueZone)
{ {
DialogueController.ShowDialogue(Dialogue, "general"); DialogueController.ShowDialogue(Dialogue, "general");
} }
} }
public void OnExitTree() public void OnExitTree()
{ {
DialogueZone.BodyEntered -= DialogueZone_BodyEntered; DialogueZone.BodyEntered -= DialogueZone_BodyEntered;
DialogueZone.BodyExited -= DialogueZone_BodyExited; DialogueZone.BodyExited -= DialogueZone_BodyExited;
DialogueExitZone.BodyExited -= DialogueExitZone_BodyExited; DialogueExitZone.BodyExited -= DialogueExitZone_BodyExited;
Hitbox.AreaEntered -= Hitbox_AreaEntered; Hitbox.AreaEntered -= Hitbox_AreaEntered;
} }
} }