From 4ad63b8c41c67e8fa0065c333066386debdf5fbe Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Mon, 5 May 2025 23:52:10 -0500 Subject: [PATCH] Comitting progress --- project.godot | 4 ++-- scenes/Entities/Rosa.tscn | 5 ++--- scenes/Entities/TestNPC.tscn | 5 ++--- scenes/{ => Singletons}/Debug.tscn | 0 scenes/Singletons/VN.tscn | 18 ++++++++++++++++++ scripts/Singletons/VN.gd | 3 +-- 6 files changed, 25 insertions(+), 10 deletions(-) rename scenes/{ => Singletons}/Debug.tscn (100%) create mode 100644 scenes/Singletons/VN.tscn diff --git a/project.godot b/project.godot index 94eaab5..a24b492 100644 --- a/project.godot +++ b/project.godot @@ -17,7 +17,7 @@ config/icon="res://icon.svg" [autoload] -DEBUG="*res://scenes/Debug.tscn" +DEBUG="*res://scenes/Singletons/Debug.tscn" BATTLE="*res://scripts/Singletons/Battle.gd" CUTSCENE="*res://scripts/Singletons/Cutscene.gd" COOKING="*res://scripts/Singletons/Cooking.gd" @@ -26,7 +26,7 @@ OVERWORLD="*res://scripts/Singletons/Overworld.gd" PAUSE="*res://scripts/Singletons/Pause.gd" QUEST="*res://scripts/Singletons/Quest.gd" SCENE_MANAGER="*res://scripts/Singletons/SceneManager.gd" -VN="*res://scripts/Singletons/VN.gd" +VN="*res://scenes/Singletons/VN.tscn" [dotnet] diff --git a/scenes/Entities/Rosa.tscn b/scenes/Entities/Rosa.tscn index 8dd2daa..80b98c4 100644 --- a/scenes/Entities/Rosa.tscn +++ b/scenes/Entities/Rosa.tscn @@ -6,8 +6,8 @@ [ext_resource type="Texture2D" uid="uid://cofrgefp8e617" path="res://textures/human.png" id="4_rvn3n"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ls7r8"] -radius = 0.331611 -height = 0.804274 +radius = 0.437175 +height = 0.945346 [sub_resource type="QuadMesh" id="QuadMesh_dyaax"] @@ -28,7 +28,6 @@ fov = 30.0 script = ExtResource("2_tr66j") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.126485) shape = SubResource("CapsuleShape3D_ls7r8") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] diff --git a/scenes/Entities/TestNPC.tscn b/scenes/Entities/TestNPC.tscn index be3adb8..c683962 100644 --- a/scenes/Entities/TestNPC.tscn +++ b/scenes/Entities/TestNPC.tscn @@ -6,8 +6,8 @@ [ext_resource type="Texture2D" uid="uid://cofrgefp8e617" path="res://textures/human.png" id="4_vo0ku"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_dw1sy"] -radius = 0.331611 -height = 0.804274 +radius = 0.420979 +height = 0.919425 [sub_resource type="QuadMesh" id="QuadMesh_xhkdv"] @@ -24,7 +24,6 @@ script = ExtResource("1_1muh7") interactCutscene = ExtResource("2_jwvuu") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.126485) shape = SubResource("CapsuleShape3D_dw1sy") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] diff --git a/scenes/Debug.tscn b/scenes/Singletons/Debug.tscn similarity index 100% rename from scenes/Debug.tscn rename to scenes/Singletons/Debug.tscn diff --git a/scenes/Singletons/VN.tscn b/scenes/Singletons/VN.tscn new file mode 100644 index 0000000..084998e --- /dev/null +++ b/scenes/Singletons/VN.tscn @@ -0,0 +1,18 @@ +[gd_scene load_steps=3 format=3 uid="uid://b6pl1cq5y05ad"] + +[ext_resource type="Script" uid="uid://benvf7v4p4i2l" path="res://scripts/Singletons/VN.gd" id="1_01fad"] +[ext_resource type="PackedScene" uid="uid://bkx3l0kckf4a8" path="res://scenes/UI/VNTextbox.tscn" id="2_adm0d"] + +[node name="VN" type="Node"] +script = ExtResource("1_01fad") + +[node name="UI" type="Control" parent="."] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="VNTextbox" parent="UI" instance=ExtResource("2_adm0d")] +layout_mode = 1 diff --git a/scripts/Singletons/VN.gd b/scripts/Singletons/VN.gd index cda6bb4..bfe3f27 100644 --- a/scripts/Singletons/VN.gd +++ b/scripts/Singletons/VN.gd @@ -2,5 +2,4 @@ class_name VNSystem extends Node const VNTextbox = preload("res://scripts/UI/VNTextbox.gd") func getTextbox() -> VNTextbox: - return null - # return get_tree().current_scene.get_node("UI/VNTextbox") as VNTextbox; + return $UI/VNTextbox;