YourWishes/Dawn-Godot
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Almost fixed entities

Browse Source
This commit is contained in:
Dominic Masters
2025-05-12 21:00:13 -05:00
parent 828ff03e56
commit a575b8a47d
13 changed files with 158 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scenes/Entities/Rosa.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=3 uid="uid://yhtpoum3eek7"]
[gd_scene load_steps=12 format=3 uid="uid://yhtpoum3eek7"]
[ext_resource type="Script" uid="uid://ixwikdguyhf0" path="res://scripts/Entity/Rosa.gd" id="1_r5ufg"]
[ext_resource type="Script" uid="uid://dtjjqp2atjyhr" path="res://scripts/Entity/Entity.gd" id="1_rvn3n"]
@@ -7,6 +7,7 @@
[ext_resource type="Shader" uid="uid://7h2axb2tsh17" path="res://shaders/NPC Shader.gdshader" id="3_j5vis"]
[ext_resource type="Script" uid="uid://c5nfs0m6ua4eb" path="res://scripts/Entity/Component/EntityMovement.gd" id="4_7s3uq"]
[ext_resource type="Texture2D" uid="uid://cofrgefp8e617" path="res://textures/human.png" id="4_rvn3n"]
[ext_resource type="Script" uid="uid://dfh2rh8idx267" path="res://scripts/Entity/Component/EntityInteractor.gd" id="5_ug24t"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ls7r8"]
radius = 0.437175
@@ -32,10 +33,11 @@ metadata/_custom_type_script = "uid://ixwikdguyhf0"
script = ExtResource("1_rvn3n")
metadata/_custom_type_script = "uid://dtjjqp2atjyhr"
[node name="EntityDirection" type="Node" parent="Entity" node_paths=PackedStringArray("meshInstance")]
[node name="EntityDirection" type="Node" parent="Entity" node_paths=PackedStringArray("meshInstance", "characterBody")]
script = ExtResource("2_vcxxc")
meshInstance = NodePath("../../MeshInstance3D")
direction = 2
characterBody = NodePath("../..")
metadata/_custom_type_script = "uid://cjfcpi7sxentf"
[node name="EntityMoving" type="Node" parent="Entity" node_paths=PackedStringArray("characterBody", "entity", "entityDirection")]
@@ -45,6 +47,14 @@ entity = NodePath("..")
entityDirection = NodePath("../EntityDirection")
movementType = 0
[node name="EntityInteractor" type="Node" parent="Entity" node_paths=PackedStringArray("entityDirection", "characterBody", "entity")]
script = ExtResource("5_ug24t")
interactorType = 0
entityDirection = NodePath("../EntityDirection")
characterBody = NodePath("../..")
entity = NodePath("..")
metadata/_custom_type_script = "uid://dfh2rh8idx267"
[node name="Rosa Camera" type="Camera3D" parent="." node_paths=PackedStringArray("follow")]
transform = Transform3D(1, 0, 0, 0, 0.130388, 0.991463, 0, -0.991463, 0.130388, 0, 3.14994, 0.404846)
current = true

12
scenes/Entities/TestNPC.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=10 format=3 uid="uid://dr4b2pmsknuhc"]
[gd_scene load_steps=11 format=3 uid="uid://dr4b2pmsknuhc"]
[ext_resource type="Script" uid="uid://d23qg1ovkbxst" path="res://scripts/Entity/BasicNPCEntity.gd" id="1_1muh7"]
[ext_resource type="Shader" uid="uid://7h2axb2tsh17" path="res://shaders/NPC Shader.gdshader" id="1_xgcv1"]
@@ -6,6 +6,7 @@
[ext_resource type="Script" uid="uid://cjfcpi7sxentf" path="res://scripts/Entity/Component/EntityDirection.gd" id="3_gyi1p"]
[ext_resource type="Script" uid="uid://c5nfs0m6ua4eb" path="res://scripts/Entity/Component/EntityMovement.gd" id="4_3wesq"]
[ext_resource type="Texture2D" uid="uid://cofrgefp8e617" path="res://textures/human.png" id="4_vo0ku"]
[ext_resource type="Script" uid="uid://03dqknw7v4mr" path="res://scripts/Entity/Component/EntityInteractable.gd" id="5_gyi1p"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_dw1sy"]
radius = 0.420979
@@ -31,9 +32,10 @@ metadata/_custom_type_script = "uid://d23qg1ovkbxst"
script = ExtResource("2_ehu3x")
metadata/_custom_type_script = "uid://dtjjqp2atjyhr"
[node name="EntityDirection" type="Node" parent="Entity" node_paths=PackedStringArray("meshInstance")]
[node name="EntityDirection" type="Node" parent="Entity" node_paths=PackedStringArray("meshInstance", "characterBody")]
script = ExtResource("3_gyi1p")
meshInstance = NodePath("../../MeshInstance3D")
characterBody = NodePath("../..")
metadata/_custom_type_script = "uid://cjfcpi7sxentf"
[node name="EntityMoving" type="Node" parent="Entity" node_paths=PackedStringArray("characterBody", "entity", "entityDirection")]
@@ -43,6 +45,12 @@ entity = NodePath("..")
entityDirection = NodePath("../EntityDirection")
movementType = 2
[node name="EntityInteractable" type="Node" parent="Entity" node_paths=PackedStringArray("entityDirection", "entity")]
script = ExtResource("5_gyi1p")
entityDirection = NodePath("../EntityDirection")
entity = NodePath("..")
metadata/_custom_type_script = "uid://03dqknw7v4mr"
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("CapsuleShape3D_dw1sy")

3
scenes/Maps/TestMap/TestMap.tscn
View File

@@ -32,8 +32,9 @@ environment = SubResource("Environment_nyivo")
[node name="Rosa" parent="." instance=ExtResource("1_7b7hx")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.19857, 0.684572, 0.968477)
[node name="Green" parent="." instance=ExtResource("2_cg1ph")]
[node name="Green" parent="." node_paths=PackedStringArray("interactEvent") instance=ExtResource("2_cg1ph")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.68747, 0.459578, -0.399262)
interactEvent = NodePath("../Events/TestConversation")
[node name="OmniLight3D" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 7.20244, 3.80554)