Minor fixes for NPC dialogue stuff
Add collisions for overworld
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=14 format=3 uid="uid://cjj6wabswtkk1"]
|
||||
[gd_scene load_steps=15 format=3 uid="uid://cjj6wabswtkk1"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_3at8w"]
|
||||
[ext_resource type="Resource" uid="uid://lao0opxww3ib" path="res://src/dialog/Dialogue.dialogue" id="2_egfgt"]
|
||||
@@ -36,9 +36,6 @@ animations = [{
|
||||
"speed": 5.0
|
||||
}]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
|
||||
radius = 3.0
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
|
||||
radius = 0.837722
|
||||
height = 2.8375
|
||||
@@ -47,6 +44,12 @@ height = 2.8375
|
||||
height = 2.24425
|
||||
radius = 1.941
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfx33"]
|
||||
radius = 3.83154
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_lsu6x"]
|
||||
radius = 5.81592
|
||||
|
||||
[node name="Caretaker of Saints" type="Node3D"]
|
||||
script = ExtResource("1_3at8w")
|
||||
Dialogue = ExtResource("2_egfgt")
|
||||
@@ -68,15 +71,6 @@ offset = Vector2(5, 2)
|
||||
texture_filter = 0
|
||||
texture = ExtResource("9_wfx33")
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00131226, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfhgc")
|
||||
|
||||
[node name="Collision" type="RigidBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.105047, -0.0490516, 0)
|
||||
collision_mask = 0
|
||||
@@ -93,3 +87,23 @@ collision_mask = 16
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Hitbox"]
|
||||
shape = SubResource("CylinderShape3D_nwuwj")
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfx33")
|
||||
|
||||
[node name="DialogueExitZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_lsu6x")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=12 format=3 uid="uid://ccwn5dfst7o4d"]
|
||||
[gd_scene load_steps=13 format=3 uid="uid://ccwn5dfst7o4d"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_38loe"]
|
||||
[ext_resource type="Resource" uid="uid://lao0opxww3ib" path="res://src/dialog/Dialogue.dialogue" id="2_x0dcb"]
|
||||
@@ -28,9 +28,6 @@ animations = [{
|
||||
"speed": 5.0
|
||||
}]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
|
||||
radius = 5.0
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
|
||||
radius = 0.837722
|
||||
height = 2.8375
|
||||
@@ -39,6 +36,12 @@ height = 2.8375
|
||||
height = 2.24425
|
||||
radius = 1.941
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_lsxy3"]
|
||||
radius = 3.83154
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_mui6r"]
|
||||
radius = 5.81592
|
||||
|
||||
[node name="Clalo" type="Node3D"]
|
||||
script = ExtResource("1_38loe")
|
||||
Dialogue = ExtResource("2_x0dcb")
|
||||
@@ -54,15 +57,6 @@ sprite_frames = SubResource("SpriteFrames_2xsnq")
|
||||
autoplay = "default"
|
||||
frame_progress = 0.274888
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
collision_layer = 0
|
||||
collision_mask = 2070
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00131226, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfhgc")
|
||||
|
||||
[node name="Collision" type="RigidBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.105047, -0.0490516, 0)
|
||||
collision_mask = 0
|
||||
@@ -87,3 +81,23 @@ cast_shadow = 0
|
||||
modulate = Color(1, 1, 1, 0.669)
|
||||
texture_filter = 0
|
||||
texture = ExtResource("7_lsxy3")
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_lsxy3")
|
||||
|
||||
[node name="DialogueExitZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_mui6r")
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
[gd_scene load_steps=7 format=3 uid="uid://cuvhqm4t3e68o"]
|
||||
[gd_scene load_steps=8 format=3 uid="uid://cuvhqm4t3e68o"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_e5axu"]
|
||||
[ext_resource type="PackedScene" uid="uid://bvbl7teafxyfr" path="res://src/npc/Feather/Feather_Well VER.01.glb" id="2_jla86"]
|
||||
[ext_resource type="Resource" uid="uid://lao0opxww3ib" path="res://src/dialog/Dialogue.dialogue" id="2_y21f1"]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
|
||||
radius = 3.0
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
|
||||
radius = 0.837722
|
||||
height = 2.8375
|
||||
@@ -15,6 +12,12 @@ height = 2.8375
|
||||
height = 2.24425
|
||||
radius = 1.941
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_y21f1"]
|
||||
radius = 3.83154
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_en0hy"]
|
||||
radius = 5.81592
|
||||
|
||||
[node name="Feather" type="Node3D"]
|
||||
script = ExtResource("1_e5axu")
|
||||
Dialogue = ExtResource("2_y21f1")
|
||||
@@ -26,15 +29,6 @@ gi_mode = 0
|
||||
billboard = 2
|
||||
texture_filter = 0
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00131226, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfhgc")
|
||||
|
||||
[node name="Collision" type="RigidBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.105047, -0.0490516, 0)
|
||||
collision_mask = 0
|
||||
@@ -54,3 +48,23 @@ shape = SubResource("CylinderShape3D_nwuwj")
|
||||
disabled = true
|
||||
|
||||
[node name="Feather_Well VER_01" parent="." instance=ExtResource("2_jla86")]
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_y21f1")
|
||||
|
||||
[node name="DialogueExitZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_en0hy")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=12 format=3 uid="uid://b5tl2jawmvwtd"]
|
||||
[gd_scene load_steps=13 format=3 uid="uid://b5tl2jawmvwtd"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_d5tpe"]
|
||||
[ext_resource type="Resource" uid="uid://lao0opxww3ib" path="res://src/dialog/Dialogue.dialogue" id="2_xassj"]
|
||||
@@ -28,9 +28,6 @@ animations = [{
|
||||
"speed": 5.0
|
||||
}]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
|
||||
radius = 3.0
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
|
||||
radius = 0.837722
|
||||
height = 2.8375
|
||||
@@ -39,6 +36,12 @@ height = 2.8375
|
||||
height = 2.24425
|
||||
radius = 1.941
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_xlatl"]
|
||||
radius = 3.83154
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_m57jb"]
|
||||
radius = 5.81592
|
||||
|
||||
[node name="Gesthemii" type="Node3D"]
|
||||
script = ExtResource("1_d5tpe")
|
||||
Dialogue = ExtResource("2_xassj")
|
||||
@@ -51,15 +54,6 @@ sprite_frames = SubResource("SpriteFrames_yguia")
|
||||
autoplay = "default"
|
||||
frame_progress = 0.621314
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00131226, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfhgc")
|
||||
|
||||
[node name="Collision" type="RigidBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.105047, -0.0490516, 0)
|
||||
collision_mask = 0
|
||||
@@ -84,3 +78,23 @@ cast_shadow = 0
|
||||
modulate = Color(1, 1, 1, 0.625)
|
||||
texture_filter = 0
|
||||
texture = ExtResource("7_xlatl")
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_xlatl")
|
||||
|
||||
[node name="DialogueExitZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_m57jb")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=12 format=3 uid="uid://bxybc56hq0566"]
|
||||
[gd_scene load_steps=13 format=3 uid="uid://bxybc56hq0566"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_6dvbs"]
|
||||
[ext_resource type="Resource" uid="uid://lao0opxww3ib" path="res://src/dialog/Dialogue.dialogue" id="2_v6uui"]
|
||||
@@ -34,9 +34,6 @@ animations = [{
|
||||
"speed": 5.0
|
||||
}]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
|
||||
radius = 3.0
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
|
||||
radius = 0.837722
|
||||
height = 2.8375
|
||||
@@ -45,6 +42,12 @@ height = 2.8375
|
||||
height = 2.24425
|
||||
radius = 1.941
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_fytn6"]
|
||||
radius = 3.83154
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_oy1li"]
|
||||
radius = 5.81592
|
||||
|
||||
[node name="Gesthemii" type="Node3D"]
|
||||
script = ExtResource("1_6dvbs")
|
||||
Dialogue = ExtResource("2_v6uui")
|
||||
@@ -56,15 +59,6 @@ sprite_frames = SubResource("SpriteFrames_21rbj")
|
||||
autoplay = "default"
|
||||
frame_progress = 0.103734
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00131226, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfhgc")
|
||||
|
||||
[node name="Collision" type="RigidBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.105047, -0.0490516, 0)
|
||||
collision_mask = 0
|
||||
@@ -89,3 +83,23 @@ cast_shadow = 0
|
||||
modulate = Color(1, 1, 1, 0.785)
|
||||
texture_filter = 0
|
||||
texture = ExtResource("7_fytn6")
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_fytn6")
|
||||
|
||||
[node name="DialogueExitZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_oy1li")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=12 format=3 uid="uid://sv8yixbryu55"]
|
||||
[gd_scene load_steps=13 format=3 uid="uid://sv8yixbryu55"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_ihoh1"]
|
||||
[ext_resource type="Resource" uid="uid://lao0opxww3ib" path="res://src/dialog/Dialogue.dialogue" id="2_ylaym"]
|
||||
@@ -34,9 +34,6 @@ animations = [{
|
||||
"speed": 5.0
|
||||
}]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
|
||||
radius = 3.0
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
|
||||
radius = 0.837722
|
||||
height = 2.8375
|
||||
@@ -45,6 +42,12 @@ height = 2.8375
|
||||
height = 2.24425
|
||||
radius = 1.941
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_p8o3h"]
|
||||
radius = 3.83154
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_8bo0q"]
|
||||
radius = 5.81592
|
||||
|
||||
[node name="Goddess of Guidance" type="Node3D"]
|
||||
script = ExtResource("1_ihoh1")
|
||||
Dialogue = ExtResource("2_ylaym")
|
||||
@@ -66,15 +69,6 @@ sprite_frames = SubResource("SpriteFrames_lb2dk")
|
||||
autoplay = "default"
|
||||
frame_progress = 0.0978483
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00131226, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfhgc")
|
||||
|
||||
[node name="Collision" type="RigidBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.105047, -0.0490516, 0)
|
||||
collision_mask = 0
|
||||
@@ -91,3 +85,23 @@ collision_mask = 2068
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="Hitbox"]
|
||||
shape = SubResource("CylinderShape3D_nwuwj")
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_p8o3h")
|
||||
|
||||
[node name="DialogueExitZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_8bo0q")
|
||||
|
||||
@@ -10,6 +10,8 @@ public partial class Npc : Node3D
|
||||
|
||||
[Node] public Area3D DialogueZone { get; set; } = default!;
|
||||
|
||||
[Node] public Area3D DialogueExitZone { get; set; } = default!;
|
||||
|
||||
[Node] public Area3D Hitbox { get; set; } = default!;
|
||||
|
||||
[Export]
|
||||
@@ -23,6 +25,7 @@ public partial class Npc : Node3D
|
||||
SetPhysicsProcess(true);
|
||||
DialogueZone.BodyEntered += DialogueZone_BodyEntered;
|
||||
DialogueZone.BodyExited += DialogueZone_BodyExited;
|
||||
DialogueExitZone.BodyExited += DialogueExitZone_BodyExited;
|
||||
Hitbox.AreaEntered += Hitbox_AreaEntered;
|
||||
|
||||
}
|
||||
@@ -48,6 +51,10 @@ public partial class Npc : Node3D
|
||||
private void DialogueZone_BodyExited(Node3D body)
|
||||
{
|
||||
_isInDialogueZone = false;
|
||||
}
|
||||
|
||||
private void DialogueExitZone_BodyExited(Node3D body)
|
||||
{
|
||||
DialogueController.Interrupt();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=12 format=3 uid="uid://bhsoehmr37aws"]
|
||||
[gd_scene load_steps=13 format=3 uid="uid://bhsoehmr37aws"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_knba1"]
|
||||
[ext_resource type="Resource" uid="uid://lao0opxww3ib" path="res://src/dialog/Dialogue.dialogue" id="2_dgby4"]
|
||||
@@ -28,9 +28,6 @@ animations = [{
|
||||
"speed": 4.0
|
||||
}]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
|
||||
radius = 3.0
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
|
||||
radius = 0.837722
|
||||
height = 2.8375
|
||||
@@ -39,6 +36,12 @@ height = 2.8375
|
||||
height = 2.24425
|
||||
radius = 1.941
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_kvk3a"]
|
||||
radius = 3.83154
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_h28nr"]
|
||||
radius = 5.81592
|
||||
|
||||
[node name="Proscenium" type="Node3D"]
|
||||
script = ExtResource("1_knba1")
|
||||
Dialogue = ExtResource("2_dgby4")
|
||||
@@ -56,15 +59,6 @@ sprite_frames = SubResource("SpriteFrames_fbxbh")
|
||||
autoplay = "default"
|
||||
frame_progress = 0.250763
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00131226, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfhgc")
|
||||
|
||||
[node name="Collision" type="RigidBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.105047, -0.0490516, 0)
|
||||
collision_mask = 0
|
||||
@@ -89,3 +83,23 @@ cast_shadow = 0
|
||||
modulate = Color(1, 1, 1, 0.63)
|
||||
texture_filter = 0
|
||||
texture = ExtResource("7_kvk3a")
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_kvk3a")
|
||||
|
||||
[node name="DialogueExitZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_h28nr")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=19 format=3 uid="uid://b6a0erl0euhgq"]
|
||||
[gd_scene load_steps=20 format=3 uid="uid://b6a0erl0euhgq"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_5qwnr"]
|
||||
[ext_resource type="Resource" uid="uid://lao0opxww3ib" path="res://src/dialog/Dialogue.dialogue" id="2_j753f"]
|
||||
@@ -97,9 +97,6 @@ animations = [{
|
||||
"speed": 5.0
|
||||
}]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
|
||||
radius = 5.25195
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
|
||||
radius = 0.837722
|
||||
height = 2.8375
|
||||
@@ -108,6 +105,12 @@ height = 2.8375
|
||||
height = 2.24425
|
||||
radius = 1.941
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_vbqit"]
|
||||
radius = 3.83154
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_moxl4"]
|
||||
radius = 5.81592
|
||||
|
||||
[node name="Puer" type="Node3D"]
|
||||
script = ExtResource("1_5qwnr")
|
||||
Dialogue = ExtResource("2_j753f")
|
||||
@@ -122,16 +125,6 @@ autoplay = "Idle"
|
||||
billboard = 2
|
||||
sprite_frames = SubResource("SpriteFrames_7w2s0")
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.421529, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00131226, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfhgc")
|
||||
|
||||
[node name="Collision" type="RigidBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.105047, -0.0490516, 0)
|
||||
collision_mask = 0
|
||||
@@ -156,3 +149,23 @@ cast_shadow = 0
|
||||
modulate = Color(1, 1, 1, 0.663)
|
||||
texture_filter = 0
|
||||
texture = ExtResource("11_vbqit")
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_vbqit")
|
||||
|
||||
[node name="DialogueExitZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_moxl4")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=51 format=3 uid="uid://jds3hr41coal"]
|
||||
[gd_scene load_steps=52 format=3 uid="uid://jds3hr41coal"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_f3624"]
|
||||
[ext_resource type="Resource" uid="uid://lao0opxww3ib" path="res://src/dialog/Dialogue.dialogue" id="2_3udpp"]
|
||||
@@ -159,9 +159,6 @@ animations = [{
|
||||
"speed": 14.0
|
||||
}]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
|
||||
radius = 3.0
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
|
||||
radius = 0.837722
|
||||
height = 2.8375
|
||||
@@ -245,6 +242,12 @@ states/idle/node = SubResource("AnimationNodeAnimation_3udpp")
|
||||
states/idle/position = Vector2(291, 80)
|
||||
transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition_bww12")]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_bww12"]
|
||||
radius = 11.8086
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_jl1c6"]
|
||||
radius = 18.1694
|
||||
|
||||
[node name="Ran" type="Node3D"]
|
||||
script = ExtResource("1_f3624")
|
||||
Dialogue = ExtResource("2_3udpp")
|
||||
@@ -277,15 +280,6 @@ sprite_frames = SubResource("SpriteFrames_f3624")
|
||||
animation = &"idle"
|
||||
autoplay = "idle"
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
collision_layer = 0
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00131226, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfhgc")
|
||||
|
||||
[node name="Collision" type="RigidBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.105047, -0.0490516, 0)
|
||||
collision_mask = 0
|
||||
@@ -320,3 +314,23 @@ cast_shadow = 0
|
||||
modulate = Color(1, 1, 1, 0.591)
|
||||
texture_filter = 0
|
||||
texture = ExtResource("39_bww12")
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_bww12")
|
||||
|
||||
[node name="DialogueExitZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_jl1c6")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=15 format=3 uid="uid://d4l4qutp8x40c"]
|
||||
[gd_scene load_steps=16 format=3 uid="uid://d4l4qutp8x40c"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_4xcbq"]
|
||||
[ext_resource type="Resource" uid="uid://cf7ycgdiihyh" path="res://src/npc/Rat/ratdialogue.dialogue" id="2_ru5ai"]
|
||||
@@ -74,7 +74,10 @@ animations = [{
|
||||
}]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
|
||||
radius = 3.0
|
||||
radius = 5.88818
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_gb32p"]
|
||||
radius = 9.76318
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
|
||||
radius = 0.837722
|
||||
@@ -84,7 +87,7 @@ height = 2.8375
|
||||
height = 2.24425
|
||||
radius = 1.941
|
||||
|
||||
[node name="NPC" type="Node3D"]
|
||||
[node name="Rat" type="Node3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.263835, 0, 0)
|
||||
script = ExtResource("1_4xcbq")
|
||||
Dialogue = ExtResource("2_ru5ai")
|
||||
@@ -123,6 +126,16 @@ collision_mask = 2
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfhgc")
|
||||
|
||||
[node name="DialogueExitZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_gb32p")
|
||||
|
||||
[node name="Collision" type="RigidBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0978584, 0.0479951, 0)
|
||||
collision_mask = 0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=12 format=3 uid="uid://1g7jw72deonb"]
|
||||
[gd_scene load_steps=13 format=3 uid="uid://1g7jw72deonb"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_13kbh"]
|
||||
[ext_resource type="Resource" uid="uid://lao0opxww3ib" path="res://src/dialog/Dialogue.dialogue" id="2_4em6t"]
|
||||
@@ -34,9 +34,6 @@ animations = [{
|
||||
"speed": 5.0
|
||||
}]
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
|
||||
radius = 3.0
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
|
||||
radius = 0.837722
|
||||
height = 2.8375
|
||||
@@ -45,6 +42,12 @@ height = 2.8375
|
||||
height = 2.24425
|
||||
radius = 1.941
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_8crcx"]
|
||||
radius = 3.83154
|
||||
|
||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_br2sn"]
|
||||
radius = 5.81592
|
||||
|
||||
[node name="Seshat" type="Node3D"]
|
||||
script = ExtResource("1_13kbh")
|
||||
Dialogue = ExtResource("2_4em6t")
|
||||
@@ -57,15 +60,6 @@ sprite_frames = SubResource("SpriteFrames_ht37r")
|
||||
autoplay = "default"
|
||||
frame_progress = 0.356716
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00131226, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_wfhgc")
|
||||
|
||||
[node name="Collision" type="RigidBody3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.105047, -0.0490516, 0)
|
||||
collision_mask = 0
|
||||
@@ -90,3 +84,23 @@ cast_shadow = 0
|
||||
modulate = Color(1, 1, 1, 0.635)
|
||||
texture_filter = 0
|
||||
texture = ExtResource("7_8crcx")
|
||||
|
||||
[node name="DialogueZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_8crcx")
|
||||
|
||||
[node name="DialogueExitZone" type="Area3D" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0)
|
||||
collision_layer = 2
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
|
||||
shape = SubResource("CylinderShape3D_br2sn")
|
||||
|
||||
Reference in New Issue
Block a user