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

Cleaned and improved some event stuff

Browse Source
This commit is contained in:
Dominic Masters
2025-05-26 13:11:27 -05:00
parent c1d8dd46d8
commit d6a2f4b567
27 changed files with 296 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ ambient_light_source = 1
[node name="TestMap" type="Node3D"]
script = ExtResource("1_ru75d")
mapName = "My cool map"
title = "map.test_map.title"
[node name="Entities" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.19857, 0.684572, 0.968477)
@@ -44,11 +44,33 @@ interactEvent = NodePath("../../Events/TestConversation")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.56382, -0.547748, 1.61289)
interactEvent = NodePath("../../Events/TestConversation")
[node name="ItemOnGround" parent="Entities" instance=ExtResource("4_ejcqv")]
[node name="Onion0" parent="Entities" instance=ExtResource("4_ejcqv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.546944, -0.547748, -3.46628)
itemType = 2
quantity = 2
[node name="Onion1" parent="Entities" instance=ExtResource("4_ejcqv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.25922, -0.547748, -4.61426)
itemType = 2
quantity = 2
[node name="Onion2" parent="Entities" instance=ExtResource("4_ejcqv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.83853, -0.547748, -3.29584)
itemType = 2
quantity = 2
[node name="SweetPotato0" parent="Entities" instance=ExtResource("4_ejcqv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31019, -0.547748, 3.74619)
itemType = 3
[node name="SweetPotato1" parent="Entities" instance=ExtResource("4_ejcqv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0143311, -0.547748, 4.4158)
itemType = 3
[node name="SweetPotato2" parent="Entities" instance=ExtResource("4_ejcqv")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.05915, -0.547748, 5.04958)
itemType = 3
[node name="Map" type="Node3D" parent="."]
metadata/_edit_lock_ = true
@@ -85,39 +107,35 @@ event = 1
eventFlag = 1
metadata/_custom_type_script = "uid://ccujhcc446mvh"
[node name="Text 0" type="Node" parent="Events/TestConversation/After Quest Started"]
[node name="Text 2" type="Node" parent="Events/TestConversation/After Quest Started"]
script = ExtResource("6_gxq5o")
text = "Go find those ingredients!"
text = "map.test_map.event.gather_onion.text2"
[node name="Before Quest STarted" type="Node" parent="Events/TestConversation"]
[node name="Before Quest Started" type="Node" parent="Events/TestConversation"]
script = ExtResource("13_60ixl")
event = 1
type = 2
eventFlag = 1
metadata/_custom_type_script = "uid://ccujhcc446mvh"
[node name="Text 0" type="Node" parent="Events/TestConversation/Before Quest STarted"]
[node name="Text 0" type="Node" parent="Events/TestConversation/Before Quest Started"]
script = ExtResource("6_gxq5o")
text = "I am giving you a quest to gather some ingredients."
text = "map.test_map.event.gather_onion.text0"
[node name="Quest" type="Node" parent="Events/TestConversation/Before Quest STarted"]
[node name="Quest" type="Node" parent="Events/TestConversation/Before Quest Started"]
script = ExtResource("7_brp0k")
metadata/_custom_type_script = "uid://c4d7nithqnx5y"
[node name="Text 1" type="Node" parent="Events/TestConversation/Before Quest STarted"]
[node name="Text 1" type="Node" parent="Events/TestConversation/Before Quest Started"]
script = ExtResource("6_gxq5o")
text = "Take this potion to help you on your way."
text = "map.test_map.event.gather_onion.text1"
[node name="Get Item" type="Node" parent="Events/TestConversation/Before Quest STarted"]
[node name="Get Item" type="Node" parent="Events/TestConversation/Before Quest Started"]
script = ExtResource("10_avybc")
getType = 1
metadata/_custom_type_script = "uid://b41umpbgqfuc2"
[node name="Text 2" type="Node" parent="Events/TestConversation/Before Quest STarted"]
script = ExtResource("6_gxq5o")
text = "Thanks for taking that potion."
[node name="EventFlagModify" type="Node" parent="Events/TestConversation/Before Quest STarted"]
[node name="EventFlagModify" type="Node" parent="Events/TestConversation/Before Quest Started"]
script = ExtResource("12_ncdgy")
event = 1
eventFlag = 1

9
scenes/Singletons/Event.tscn Normal file
View File

@@ -0,0 +1,9 @@
[gd_scene load_steps=2 format=3 uid="uid://dqde5pj14u71"]
[ext_resource type="Script" uid="uid://dy8gbmwddma3b" path="res://scripts/Singleton/EventSystem.gd" id="1_pu13l"]
[node name="EventSystem" type="Node"]
script = ExtResource("1_pu13l")
metadata/_custom_type_script = "uid://dy8gbmwddma3b"
[node name="StartedEvents" type="Node" parent="."]

8
scenes/Singletons/Quest.tscn
View File

@@ -14,10 +14,10 @@ script = ExtResource("2_n4ii1")
title = "quest.test_quest.title"
metadata/_custom_type_script = "uid://dn0kxbe85n40f"
[node name="Find Onion" type="Node" parent="Quests/Test Quest"]
[node name="Find Sweet Potato" type="Node" parent="Quests/Test Quest"]
script = ExtResource("3_l8p7p")
title = "quest.test_quest.onion.title"
description = "quest.test_quest.onion.description"
itemType = 2
title = "quest.test_quest.sweet_potato.title"
description = "quest.test_quest.sweet_potato.description"
itemType = 3
quantity = 2
metadata/_custom_type_script = "uid://de1ao4huhy0hm"

6
scenes/Singletons/UI.tscn
View File

@@ -26,11 +26,11 @@ visible = false
layout_mode = 2
anchors_preset = 0
[node name="VNTextbox" parent="." instance=ExtResource("3_btpxp")]
visible = false
[node name="EventFlagMenu" parent="." instance=ExtResource("5_12prj")]
layout_mode = 1
[node name="EventFlagMenu" parent="." instance=ExtResource("5_12prj")]
[node name="VNTextbox" parent="." instance=ExtResource("3_btpxp")]
visible = false
layout_mode = 1
[node name="DebugMenu" parent="." instance=ExtResource("2_is0g4")]

42
scenes/UI/EventFlagMenu.tscn
View File

@@ -2,15 +2,18 @@
[ext_resource type="Script" uid="uid://b4a3ne2vn36mt" path="res://scripts/UI/EventFlagMenu.gd" id="1_nnw5f"]
[node name="EventFlagsMenu" type="Panel" node_paths=PackedStringArray("flagList", "grid")]
[node name="EventFlagsMenu" type="Panel" node_paths=PackedStringArray("flagList", "grid", "btnClose")]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 3
size_flags_vertical = 3
script = ExtResource("1_nnw5f")
flagList = NodePath("HBoxContainer/FlagList")
grid = NodePath("HBoxContainer/Control")
grid = NodePath("HBoxContainer/VBoxContainer/Control")
btnClose = NodePath("HBoxContainer/VBoxContainer/HBoxContainer/Button")
metadata/_custom_type_script = "uid://b4a3ne2vn36mt"
[node name="HBoxContainer" type="HBoxContainer" parent="."]
@@ -31,43 +34,56 @@ item_count = 2
item_0/text = "Item 0"
item_1/text = "Item 1"
[node name="Control" type="GridContainer" parent="HBoxContainer"]
[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"]
clip_contents = true
layout_mode = 2
size_flags_horizontal = 3
columns = 6
[node name="Flag0" type="CheckBox" parent="HBoxContainer/Control"]
[node name="HBoxContainer" type="HBoxContainer" parent="HBoxContainer/VBoxContainer"]
layout_mode = 2
alignment = 2
[node name="Button" type="Button" parent="HBoxContainer/VBoxContainer/HBoxContainer"]
layout_mode = 2
text = "close"
[node name="Control" type="GridContainer" parent="HBoxContainer/VBoxContainer"]
layout_mode = 2
size_flags_horizontal = 3
columns = 5
[node name="Flag0" type="CheckBox" parent="HBoxContainer/VBoxContainer/Control"]
layout_mode = 2
text = "Flag 0"
[node name="Flag1" type="CheckBox" parent="HBoxContainer/Control"]
[node name="Flag1" type="CheckBox" parent="HBoxContainer/VBoxContainer/Control"]
layout_mode = 2
text = "Flag 0"
[node name="Flag2" type="CheckBox" parent="HBoxContainer/Control"]
[node name="Flag2" type="CheckBox" parent="HBoxContainer/VBoxContainer/Control"]
layout_mode = 2
text = "Flag 0"
[node name="Flag3" type="CheckBox" parent="HBoxContainer/Control"]
[node name="Flag3" type="CheckBox" parent="HBoxContainer/VBoxContainer/Control"]
layout_mode = 2
text = "Flag 0"
[node name="Flag4" type="CheckBox" parent="HBoxContainer/Control"]
[node name="Flag4" type="CheckBox" parent="HBoxContainer/VBoxContainer/Control"]
layout_mode = 2
text = "Flag 0"
[node name="Flag5" type="CheckBox" parent="HBoxContainer/Control"]
[node name="Flag5" type="CheckBox" parent="HBoxContainer/VBoxContainer/Control"]
layout_mode = 2
text = "Flag 0"
[node name="Flag6" type="CheckBox" parent="HBoxContainer/Control"]
[node name="Flag6" type="CheckBox" parent="HBoxContainer/VBoxContainer/Control"]
layout_mode = 2
text = "Flag 0"
[node name="Flag7" type="CheckBox" parent="HBoxContainer/Control"]
[node name="Flag7" type="CheckBox" parent="HBoxContainer/VBoxContainer/Control"]
layout_mode = 2
text = "Flag 0"
[node name="Flag8" type="CheckBox" parent="HBoxContainer/Control"]
[node name="Flag8" type="CheckBox" parent="HBoxContainer/VBoxContainer/Control"]
layout_mode = 2
text = "Flag 0"

23
scenes/UI/VNTextbox.tscn
View File

@@ -1,14 +1,15 @@
[gd_scene load_steps=3 format=3 uid="uid://bkx3l0kckf4a8"]
[gd_scene load_steps=4 format=3 uid="uid://bkx3l0kckf4a8"]
[ext_resource type="Theme" uid="uid://dm7ee4aqjr2dl" path="res://ui/UI Theme.tres" id="1_wx4lp"]
[ext_resource type="Script" uid="uid://ck62jug2gl4wk" path="res://scripts/UI/VNTextbox.gd" id="2_uo1gm"]
[ext_resource type="Script" uid="uid://cq6bvma0kk6tg" path="res://scripts/UI/AdvancedRichText.gd" id="3_j0315"]
[node name="VNTextbox" type="PanelContainer"]
anchors_preset = 12
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_top = -50.0
offset_top = -58.0
grow_horizontal = 2
grow_vertical = 0
theme = ExtResource("1_wx4lp")
@@ -17,12 +18,22 @@ script = ExtResource("2_uo1gm")
[node name="MarginContainer" type="MarginContainer" parent="."]
layout_mode = 2
theme = ExtResource("1_wx4lp")
theme_override_constants/margin_left = 4
theme_override_constants/margin_top = 4
theme_override_constants/margin_right = 4
theme_override_constants/margin_bottom = 4
[node name="Label" type="RichTextLabel" parent="MarginContainer"]
layout_mode = 2
theme = ExtResource("1_wx4lp")
bbcode_enabled = true
text = "test
test
test
test"
text = "Text
Text
Text
Text"
script = ExtResource("3_j0315")
advancedText = "Text
Text
Text
Text"
metadata/_custom_type_script = "uid://cq6bvma0kk6tg"