From 8311d7c68fad21aa8e2f8d52b32bb4e1c49552bd Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Tue, 20 May 2025 11:04:04 -0500 Subject: [PATCH] Some extra event stuff --- scenes/Maps/TestMap/TestMap.tscn | 20 +++++++++---------- scenes/Singletons/Quest.tscn | 1 + scripts/Event/{Flow => Condition}/EventIf.gd | 0 .../Event/{Flow => Condition}/EventIf.gd.uid | 0 .../Event/{Flow => Condition}/EventIfFlag.gd | 2 +- .../{Flow => Condition}/EventIfFlag.gd.uid | 0 6 files changed, 12 insertions(+), 11 deletions(-) rename scripts/Event/{Flow => Condition}/EventIf.gd (100%) rename scripts/Event/{Flow => Condition}/EventIf.gd.uid (100%) rename scripts/Event/{Flow => Condition}/EventIfFlag.gd (93%) rename scripts/Event/{Flow => Condition}/EventIfFlag.gd.uid (100%) diff --git a/scenes/Maps/TestMap/TestMap.tscn b/scenes/Maps/TestMap/TestMap.tscn index a7a26f1..dda543d 100644 --- a/scenes/Maps/TestMap/TestMap.tscn +++ b/scenes/Maps/TestMap/TestMap.tscn @@ -12,7 +12,7 @@ [ext_resource type="PackedScene" uid="uid://bkj630bhmnvsi" path="res://scenes/Entities/Sign.tscn" id="9_xfqoe"] [ext_resource type="Script" uid="uid://b41umpbgqfuc2" path="res://scripts/Event/Item/EventGetItem.gd" id="10_avybc"] [ext_resource type="Script" uid="uid://0ygswaohp7kj" path="res://scripts/Event/EventFlagModify.gd" id="12_ncdgy"] -[ext_resource type="Script" uid="uid://ccujhcc446mvh" path="res://scripts/Event/Flow/EventIfFlag.gd" id="13_60ixl"] +[ext_resource type="Script" uid="uid://ccujhcc446mvh" path="res://scripts/Event/Condition/EventIfFlag.gd" id="13_60ixl"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_e1h75"] sky_horizon_color = Color(0.59625, 0.6135, 0.6375, 1) @@ -79,45 +79,45 @@ omni_range = 281.646 [node name="TestConversation" type="Node" parent="Events"] script = ExtResource("5_cg1ph") -[node name="EventIfEvent2" type="Node" parent="Events/TestConversation"] +[node name="After Quest Started" type="Node" parent="Events/TestConversation"] script = ExtResource("13_60ixl") event = 1 eventFlag = 1 metadata/_custom_type_script = "uid://ccujhcc446mvh" -[node name="Text 0" type="Node" parent="Events/TestConversation/EventIfEvent2"] +[node name="Text 0" type="Node" parent="Events/TestConversation/After Quest Started"] script = ExtResource("6_gxq5o") text = "Go find those ingredients!" -[node name="EventIfEvent" 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/EventIfEvent"] +[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." -[node name="Quest" type="Node" parent="Events/TestConversation/EventIfEvent"] +[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/EventIfEvent"] +[node name="Text 1" type="Node" parent="Events/TestConversation/Before Quest STarted"] script = ExtResource("6_gxq5o") text = "Thanks for closing the quest menu" -[node name="Get Item" type="Node" parent="Events/TestConversation/EventIfEvent"] +[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/EventIfEvent"] +[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/EventIfEvent"] +[node name="EventFlagModify" type="Node" parent="Events/TestConversation/Before Quest STarted"] script = ExtResource("12_ncdgy") event = 1 eventFlag = 1 diff --git a/scenes/Singletons/Quest.tscn b/scenes/Singletons/Quest.tscn index fbe6988..8eef6db 100644 --- a/scenes/Singletons/Quest.tscn +++ b/scenes/Singletons/Quest.tscn @@ -15,3 +15,4 @@ script = ExtResource("2_n4ii1") [node name="Find Onion" type="Node" parent="Quests/Some Quest"] script = ExtResource("3_l8p7p") objectiveName = "Find Onions" +itemType = 1 diff --git a/scripts/Event/Flow/EventIf.gd b/scripts/Event/Condition/EventIf.gd similarity index 100% rename from scripts/Event/Flow/EventIf.gd rename to scripts/Event/Condition/EventIf.gd diff --git a/scripts/Event/Flow/EventIf.gd.uid b/scripts/Event/Condition/EventIf.gd.uid similarity index 100% rename from scripts/Event/Flow/EventIf.gd.uid rename to scripts/Event/Condition/EventIf.gd.uid diff --git a/scripts/Event/Flow/EventIfFlag.gd b/scripts/Event/Condition/EventIfFlag.gd similarity index 93% rename from scripts/Event/Flow/EventIfFlag.gd rename to scripts/Event/Condition/EventIfFlag.gd index 451ed8d..625217b 100644 --- a/scripts/Event/Flow/EventIfFlag.gd +++ b/scripts/Event/Condition/EventIfFlag.gd @@ -1,4 +1,4 @@ -class_name EventIfEvent extends "res://scripts/Event/Flow/EventIf.gd" +class_name EventIfFlag extends "res://scripts/Event/Condition/EventIf.gd" enum Type { ANY_OF_FLAGS_ON, diff --git a/scripts/Event/Flow/EventIfFlag.gd.uid b/scripts/Event/Condition/EventIfFlag.gd.uid similarity index 100% rename from scripts/Event/Flow/EventIfFlag.gd.uid rename to scripts/Event/Condition/EventIfFlag.gd.uid