diff --git a/scenes/Entities/OnionSprig.tscn b/scenes/Entities/ItemOnGround.tscn similarity index 91% rename from scenes/Entities/OnionSprig.tscn rename to scenes/Entities/ItemOnGround.tscn index b3098c6..cc2a1d7 100644 --- a/scenes/Entities/OnionSprig.tscn +++ b/scenes/Entities/ItemOnGround.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=3 uid="uid://bes5p6ckw6d58"] -[ext_resource type="Script" uid="uid://0nn3ix2nwk3f" path="res://scripts/Entity/OnionSprig.gd" id="1_pnyp6"] +[ext_resource type="Script" uid="uid://d2jqsiapy07ii" path="res://scripts/Entity/ItemOnGround.gd" id="1_pnyp6"] [ext_resource type="Script" uid="uid://dtjjqp2atjyhr" path="res://scripts/Entity/Entity.gd" id="2_crfvs"] [ext_resource type="Script" uid="uid://03dqknw7v4mr" path="res://scripts/Entity/Component/EntityInteractable.gd" id="3_7clu1"] [ext_resource type="Shader" uid="uid://7h2axb2tsh17" path="res://shaders/NPC Shader.gdshader" id="4_w0eam"] @@ -18,7 +18,7 @@ shader_parameter/color = Color(0.77816, 0.965494, 0.746061, 1) shader_parameter/frame = 0 shader_parameter/direction = 2 -[node name="OnionSprig" type="StaticBody3D"] +[node name="ItemOnGround" type="StaticBody3D"] collision_layer = 2 collision_mask = 258 script = ExtResource("1_pnyp6") diff --git a/scenes/Maps/TestMap/TestMap.tscn b/scenes/Maps/TestMap/TestMap.tscn index 6fcdf1c..6c8cdc3 100644 --- a/scenes/Maps/TestMap/TestMap.tscn +++ b/scenes/Maps/TestMap/TestMap.tscn @@ -5,7 +5,7 @@ [ext_resource type="PackedScene" uid="uid://dr4b2pmsknuhc" path="res://scenes/Entities/TestNPC.tscn" id="2_cg1ph"] [ext_resource type="PackedScene" uid="uid://lh713g04d3bg" path="res://scenes/Maps/TestMap/TestMapGround.tscn" id="3_gxq5o"] [ext_resource type="PackedScene" uid="uid://boj5o4fx41rv8" path="res://scenes/Maps/TestMap/TestMapBuilding.tscn" id="4_brp0k"] -[ext_resource type="PackedScene" uid="uid://bes5p6ckw6d58" path="res://scenes/Entities/OnionSprig.tscn" id="4_ejcqv"] +[ext_resource type="PackedScene" uid="uid://bes5p6ckw6d58" path="res://scenes/Entities/ItemOnGround.tscn" id="4_ejcqv"] [ext_resource type="Script" uid="uid://tkfc88q8m86f" path="res://scripts/Event/EventConversation.gd" id="5_cg1ph"] [ext_resource type="Script" uid="uid://y7ckj1tn5cro" path="res://scripts/Event/EventTextbox.gd" id="6_gxq5o"] [ext_resource type="Script" uid="uid://c4d7nithqnx5y" path="res://scripts/Event/Quest/EventStartQuest.gd" id="7_brp0k"] @@ -38,11 +38,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.19857, 0.684572, 0.968477) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.68747, 0.459578, -0.399262) interactEvent = NodePath("../Events/TestConversation") -[node name="OnionSprig2" parent="." instance=ExtResource("4_ejcqv")] +[node name="ItemOnGround" parent="." instance=ExtResource("4_ejcqv")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.09634, 0.190375, -4.64262) +script = null -[node name="OnionSprig" parent="." instance=ExtResource("4_ejcqv")] +[node name="ItemOnGround2" parent="." instance=ExtResource("4_ejcqv")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.75248, 0.159876, -4.57086) +script = null [node name="Sign" parent="." node_paths=PackedStringArray("interactEvent") instance=ExtResource("9_xfqoe")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.36525, 0.136824, 2.58137) diff --git a/scripts/Entity/OnionSprig.gd b/scripts/Entity/ItemOnGround.gd similarity index 90% rename from scripts/Entity/OnionSprig.gd rename to scripts/Entity/ItemOnGround.gd index 9a7bcb0..17db318 100644 --- a/scripts/Entity/OnionSprig.gd +++ b/scripts/Entity/ItemOnGround.gd @@ -1,4 +1,4 @@ -class_name OnionSprig extends StaticBody3D +class_name ItemOnGround extends StaticBody3D func _ready() -> void: $Entity/EntityInteractable.onInteract.connect( diff --git a/scripts/Entity/ItemOnGround.gd.uid b/scripts/Entity/ItemOnGround.gd.uid new file mode 100644 index 0000000..eb5ab06 --- /dev/null +++ b/scripts/Entity/ItemOnGround.gd.uid @@ -0,0 +1 @@ +uid://d2jqsiapy07ii