🧪 Tested music setup with new music concept

- Fight World data structure
- Generating basic fight world
- Opening correct fight room
- Block paths in fight rooms
- Transition between rooms

.idea/.idea.Babushka/.idea/.name

@@ -0,0 +1 @@
+Babushka

Babushka.sln.DotSettings

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=53eecf85_002Dd821_002D40e8_002Dac97_002Dfdb734542b84/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Instance fields (not private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=0B2502BD29F5EC4798EEFD2950AA7E06/Description/@EntryValue">Godot Signal</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=0B2502BD29F5EC4798EEFD2950AA7E06/Text/@EntryValue">[Signal]
 public delegate void $SignalName$EventHandler($END$);</s:String>

Babushka.sln.DotSettings.user

@@ -1,6 +1,29 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArea3D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F8a54226fa2e1c9371a8091f24cfd744aef11fe6869527dc23b9b837623a29b9_003FArea3D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArray_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe37dc1faf08a4d5ea030ad59bdf77522523400_003Fa3_003Fe272a3a7_003FArray_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAudioStreamPlayer2D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F848324b1c23114c3f5e8bbb5a42c4ade394c59a7a7a133a66b76581ca571_003FAudioStreamPlayer2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABabushka_002Escripts_002ECSharp_002ECommon_002EFarming_002EVesnaBehaviour2D_005FScriptMethods_002Egenerated_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FLocal_003FTemp_003FSourceGeneratedDocuments_003F9509A9D00FD8A232B5E86A84_003FGodot_002ESourceGenerators_003FGodot_002ESourceGenerators_002EScriptMethodsGenerator_003FBabushka_002Escripts_002ECSharp_002ECommon_002EFarming_002EVesnaBehaviour2D_005FScriptMethods_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABabushka_002Escripts_002ECSharp_002ECommon_002EFarming_002EVesnaBehaviour2D_005FScriptProperties_002Egenerated_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FLocal_003FTemp_003FSourceGeneratedDocuments_003F9509A9D00FD8A232B5E86A84_003FGodot_002ESourceGenerators_003FGodot_002ESourceGenerators_002EScriptPropertiesGenerator_003FBabushka_002Escripts_002ECSharp_002ECommon_002EFarming_002EVesnaBehaviour2D_005FScriptProperties_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABabushka_002Escripts_002ECSharp_002ECommon_002EFarming_002EVesnaBehaviour2D_005FScriptProperties_002Egenerated_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F4298b0f293f987511fc1b7956ee691fd778f8378_003FBabushka_002Escripts_002ECSharp_002ECommon_002EFarming_002EVesnaBehaviour2D_005FScriptProperties_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABabushka_002Escripts_002ECSharp_002ECommon_002EFarming_002EVesnaBehaviour2D_005FScriptProperties_002Egenerated_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F4298b0f293f987511fc1b7956ee691fd778f8378_003FBabushka_002Escripts_002ECSharp_002ECommon_002EFarming_002EVesnaBehaviour2D_005FScriptProperties_002Egenerated_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABabushka_002Escripts_002ECSharp_002ECommon_002EQuest_002EQuestListItemUi_005FScriptMethods_002Egenerated_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F48fad7e7f3c9e292b3fdbddf9d363f0d1752aa_003FBabushka_002Escripts_002ECSharp_002ECommon_002EQuest_002EQuestListItemUi_005FScriptMethods_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABabushka_002Escripts_002ECSharp_002ECommon_002EQuest_002EQuestManager_005FScriptSignals_002Egenerated_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FLocal_003FTemp_003FSourceGeneratedDocuments_003F9509A9D00FD8A232B5E86A84_003FGodot_002ESourceGenerators_003FGodot_002ESourceGenerators_002EScriptSignalsGenerator_003FBabushka_002Escripts_002ECSharp_002ECommon_002EQuest_002EQuestManager_005FScriptSignals_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACanvasItem_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fef7b819b226fab796d1dfe66d415dd7510bcac87675020ddb8f03a828e763_003FCanvasItem_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACastHelpers_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F3c92637ae2e83da0a63791071c41eae291d594156062866d8621b7ed7245c_003FCastHelpers_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACastHelpers_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd111abf504bf42b5968a609b168fd093b2e200_003Fbb_003F1c116fcd_003FCastHelpers_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACharacterBody2D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fbba0bbd7a98ee58286e9484fbe86e01afff6232283f6efd3556eb7116453_003FCharacterBody2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANode_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Ff1d69ec2da76ccf9bc8a75c8e0fdca9a7ba1adf8c8c9d5047e2fa5991c02eca_003FNode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACount_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Ffe5a7cee5a1771b89077bd73292de84439b4f816799e2ad6c2615c6ff5bd748e_003FCount_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003Fhome_003Fjonathan_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe37dc1faf08a4d5ea030ad59bdf77522523400_003Fd4_003Fbd338aeb_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F76fabf6f8acf4a0099cae0bcf8b218467f10_003F7e_003F28cee476_003FEnumerable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGD_005Fconstants_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F4ef0bac6437b6a9567d44f62ae567d854fa7b8513ef7139ef349b49768bc9df_003FGD_005Fconstants_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANode_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Ff1d69ec2da76ccf9bc8a75c8e0fdca9a7ba1adf8c8c9d5047e2fa5991c02eca_003FNode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANullable_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F5acc345db3c207bc9d886a36ff14867ef8d65557432172c2a42f19aeac04d1b_003FNullable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AResourceLoader_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F9f4e8eb124d11f8219cb513a19bed22b2120ed29f9d6785ba56e3367b48d581_003FResourceLoader_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASceneTree_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F8d6960554e939a669841b1ece03d27df4ab42f92bb80be3767eaec8cdaccf84b_003FSceneTree_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AShape2D_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F3671dbbd9b17cdf2bf9075b468b6bd7e3ab13fc3be7a116484085d3b6cc9fe_003FShape2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fc7102cd0ffb8973777e61b1942c3fffac7e14016a511d055c3adf73ff91748_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=bc5a80e4_002D7ba6_002D4f7d_002Db896_002Dc591eec7ab12/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="Tests" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;TestAncestor&gt;&#xD;
+    &lt;TestId&gt;NUnit3x::A6EF2269-9E64-40D4-BA0A-33CB234E2503::net9.0::BabushkaTest.Tests&lt;/TestId&gt;&#xD;
+  &lt;/TestAncestor&gt;&#xD;
+&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>

addons/babushkahelpers/babushkahelpers.gd

@@ -0,0 +1,22 @@
+@tool
+extends EditorPlugin
+
+
+func _enter_tree() -> void:
+	if !ProjectSettings.has_setting("babushka/hacks/speed_hack"):
+		ProjectSettings.set_setting("babushka/hacks/speed_hack",-1)
+	
+	var property_info = {
+		"name": "babushka/hacks/speed_hack",
+		"type": TYPE_FLOAT,
+		"hint": PROPERTY_HINT_RANGE,
+		"hint_string": "-1,20,0.5"
+	}
+	
+	ProjectSettings.add_property_info(property_info)
+	ProjectSettings.set_initial_value("babushka/hacks/speed_hack",-1)
+
+
+func _exit_tree() -> void:
+	# Clean-up of the plugin goes here.
+	pass

addons/babushkahelpers/babushkahelpers.gd.uid

@@ -0,0 +1 @@
+uid://buwfplh0xji8q

addons/babushkahelpers/plugin.cfg

@@ -0,0 +1,7 @@
+[plugin]
+
+name="BabushkaHelpers"
+description=""
+author="Cozy Raven"
+version=""
+script="babushkahelpers.gd"

addons/dialogic_additions/Quest/event_quest_activate.gd

@@ -8,8 +8,8 @@ var quest_resource: String
 
 func _execute() -> void:
 	var resource = ResourceLoader.load(quest_resource)
-	QuestManager.ChangeQuestStatus(resource,QuestEventUtils.QuestStatus.ACTIVE)
-	QuestManager.SetFollowQuest(resource)
+	QuestManager.ChangeQuestStatus(resource,QuestEventUtils.QuestStatus.AVAILABLE)
+	QuestManager.SetActiveQuest(resource)
 	finish() # called to continue with the next event
 
 

addons/dialogic_additions/Quest/event_quest_complete.gd

@@ -9,7 +9,7 @@ var quest_resource: String
 func _execute() -> void:
 	var resource = ResourceLoader.load(quest_resource)
 	QuestManager.ChangeQuestStatus(resource,QuestEventUtils.QuestStatus.DONE)
-	QuestManager.SetFollowQuest(null)
+	QuestManager.SetActiveQuest(null)
 	finish() # called to continue with the next event
 
 

addons/dialogic_additions/Quest/event_quest_condition.gd

@@ -0,0 +1,163 @@
+@tool
+extends DialogicEvent
+class_name DialogicQuestConditionEvent
+
+## Event that allows branching a timeline based on a condition.
+
+#enum ConditionTypes {IF, ELIF, ELSE}
+
+### Settings
+## condition type (see [ConditionTypes]). Defaults to if.
+#var condition_type := ConditionTypes.IF
+## The condition as a string. Will be executed as an Expression.
+#var condition := ""
+var quest_resource: String
+var compare_status: QuestEventUtils.QuestStatusOrActive
+
+################################################################################
+## 						EXECUTE
+################################################################################
+
+func _execute() -> void:
+	var resource = ResourceLoader.load(quest_resource)
+	
+	var result: bool
+	if compare_status == QuestEventUtils.QuestStatusOrActive.ACTIVE:
+		result = QuestManager.GetActiveQuest() == resource
+	elif compare_status == QuestEventUtils.QuestStatusOrActive.NOT_ACTIVE:
+		result = QuestManager.GetActiveQuest() != resource
+	else:
+		result = QuestManager.GetQuestStatus(resource).status == compare_status
+	
+	if not result:
+		var idx: int = dialogic.current_event_idx
+		var ignore := 1
+		while true:
+			idx += 1
+			if not dialogic.current_timeline.get_event(idx) or ignore == 0:
+				break
+			elif dialogic.current_timeline.get_event(idx).can_contain_events:
+				ignore += 1
+			elif dialogic.current_timeline.get_event(idx) is DialogicEndBranchEvent:
+				ignore -= 1
+
+		dialogic.current_event_idx = idx-1
+	finish()
+
+
+## only called if the previous event was an end-branch event
+## return true if this event should be executed if the previous event was an end-branch event
+func should_execute_this_branch() -> bool:
+	return true
+
+
+################################################################################
+## 						INITIALIZE
+################################################################################
+
+func _init() -> void:
+	event_name = "Quest Condition"
+	set_default_color('Color3')
+	event_category = "Quest"
+	event_sorting_index = 1
+	can_contain_events = true
+
+
+# return a control node that should show on the END BRANCH node
+func get_end_branch_control() -> Control:
+	return load(get_script().resource_path.get_base_dir().path_join('ui_quest_condition_end.tscn')).instantiate()
+
+################################################################################
+## 						SAVING/LOADING
+################################################################################
+
+func to_text() -> String:
+	return 'ifquest ' + quest_resource + ', ' + str(compare_status) + ':'
+
+
+func from_text(string:String) -> void:
+	#if string.strip_edges().begins_with('if'):
+	#	condition = string.strip_edges().trim_prefix('if ').trim_suffix(':').strip_edges()
+	#	condition_type = ConditionTypes.IF
+	var strings:Array[String]
+	strings.assign(string.strip_edges().trim_prefix('ifquest ').trim_suffix(':').strip_edges().split(','))
+	quest_resource = strings[0].strip_edges()
+	var compare_string: String = strings[1].strip_edges()
+	if compare_string.is_valid_int():
+		compare_status = compare_string.to_int()
+	else:
+		compare_status = QuestEventUtils.QuestStatusOrActive.get(compare_string)
+
+
+func is_valid_event(string:String) -> bool:
+	if string.strip_edges().begins_with('ifquest '):
+		return true
+	return false
+
+
+################################################################################
+## 						EDITOR REPRESENTATION
+################################################################################
+
+func build_event_editor() -> void:
+	add_header_label("IF")
+	add_header_edit(
+	"quest_resource",
+	ValueType.DYNAMIC_OPTIONS,
+	{
+		"mode":2,
+		"suggestions_func":QuestEventUtils.quest_resource_suggestrions
+	})
+	add_header_label("IS")
+	add_header_edit("compare_status",ValueType.FIXED_OPTIONS,{
+		'options': [
+			{
+				'label': 'HIDDEN',
+				'value': QuestEventUtils.QuestStatusOrActive.HIDDEN,
+			},
+			{
+				'label': 'AVAILABLE',
+				'value': QuestEventUtils.QuestStatusOrActive.AVAILABLE,
+			},
+			{
+				'label': 'DONE',
+				'value': QuestEventUtils.QuestStatusOrActive.DONE,
+			},
+			{
+				'label': 'CANCLED',
+				'value': QuestEventUtils.QuestStatusOrActive.CANCLED,
+			},
+			{
+				'label': 'ACTIVE',
+				'value': QuestEventUtils.QuestStatusOrActive.ACTIVE,
+			},
+			{
+				'label': 'NOT_ACTIVE',
+				'value': QuestEventUtils.QuestStatusOrActive.NOT_ACTIVE,
+			}
+		]})
+
+func _get_icon() -> Resource:
+	return load("res://addons/dialogic/Modules/Condition/icon.svg")
+
+####################### CODE COMPLETION ########################################
+################################################################################
+
+func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:String, _word:String, symbol:String) -> void:
+	pass
+
+
+func _get_start_code_completion(_CodeCompletionHelper:Node, TextNode:TextEdit) -> void:
+	TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'ifquest', 'ifquest ', TextNode.syntax_highlighter.code_flow_color)
+
+
+#################### SYNTAX HIGHLIGHTING #######################################
+################################################################################
+
+
+func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, line:String) -> Dictionary:
+	var word := line.get_slice(' ', 0)
+	dict[line.find(word)] = {"color":Highlighter.code_flow_color}
+	dict[line.find(word)+len(word)] = {"color":Highlighter.normal_color}
+	dict = Highlighter.color_condition(dict, line)
+	return dict

addons/dialogic_additions/Quest/event_quest_condition.gd.uid

@@ -0,0 +1 @@
+uid://b2ggc2f5kh61j

addons/dialogic_additions/Quest/event_utils.gd

@@ -1,12 +1,22 @@
+@tool
 class_name QuestEventUtils
 
 enum QuestStatus{
 	HIDDEN = 0,
-	ACTIVE = 1,
+	AVAILABLE = 1,
 	DONE = 2,
 	CANCLED = 3
 }
 
+enum QuestStatusOrActive{
+	HIDDEN = 0,
+	AVAILABLE = 1,
+	DONE = 2,
+	CANCLED = 3,
+	ACTIVE = 4,
+	NOT_ACTIVE = 5
+}
+
 
 static func quest_resource_suggestrions(search_text:String) -> Dictionary:
 	var ret_val = {}

addons/dialogic_additions/Quest/index.gd

@@ -4,5 +4,6 @@ extends DialogicIndexer
 func _get_events() -> Array:
 	return [
 		this_folder.path_join('event_quest_activate.gd'),
-		this_folder.path_join('event_quest_complete.gd')
+		this_folder.path_join('event_quest_complete.gd'),
+		this_folder.path_join('event_quest_condition.gd')
 		]

addons/dialogic_additions/Quest/ui_condition_end.gd

@@ -0,0 +1,51 @@
+@tool
+extends HBoxContainer
+
+var parent_resource: DialogicEvent = null
+
+
+func _ready() -> void:
+	$AddElif.button_up.connect(add_elif)
+	$AddElse.button_up.connect(add_else)
+
+
+func refresh() -> void:
+	if parent_resource is DialogicQuestConditionEvent:
+		# hide add elif and add else button on ELSE event
+		$AddElif.visible = false# parent_resource.condition_type != DialogicConditionEvent.ConditionTypes.ELSE
+		$AddElse.visible = true# parent_resource.condition_type != DialogicConditionEvent.ConditionTypes.ELSE
+		$Label.text = "End of If Quest" #"End of "+["IF", "ELIF", "ELSE"][parent_resource.condition_type]+" ("+parent_resource.condition+")"
+
+		# hide add add else button if followed by ELIF or ELSE event
+		var timeline_editor := find_parent('VisualEditor')
+		if timeline_editor:
+			var next_event: DialogicEvent = null
+			if timeline_editor.get_block_below(get_parent()):
+				next_event = timeline_editor.get_block_below(get_parent()).resource
+				if next_event is DialogicConditionEvent:
+					if next_event.condition_type != DialogicConditionEvent.ConditionTypes.IF:
+						$AddElse.hide()
+		#if parent_resource.condition_type == DialogicConditionEvent.ConditionTypes.ELSE:
+		#	$Label.text = "End of ELSE"
+	else:
+		hide()
+
+
+func add_elif() -> void:
+	var timeline := find_parent('VisualEditor')
+	if timeline:
+		var resource := DialogicConditionEvent.new()
+		resource.condition_type = DialogicConditionEvent.ConditionTypes.ELIF
+		timeline.add_event_undoable(resource, get_parent().get_index()+1)
+		timeline.indent_events()
+		timeline.something_changed()
+
+
+func add_else() -> void:
+	var timeline := find_parent('VisualEditor')
+	if timeline:
+		var resource := DialogicConditionEvent.new()
+		resource.condition_type = DialogicConditionEvent.ConditionTypes.ELSE
+		timeline.add_event_undoable(resource, get_parent().get_index()+1)
+		timeline.indent_events()
+		timeline.something_changed()

addons/dialogic_additions/Quest/ui_condition_end.gd.uid

@@ -0,0 +1 @@
+uid://dlrnhnnonum4o

addons/dialogic_additions/Quest/ui_quest_condition_end.tscn

@@ -0,0 +1,20 @@
+[gd_scene load_steps=2 format=3 uid="uid://dnrpcgjkyoiau"]
+
+[ext_resource type="Script" uid="uid://dlrnhnnonum4o" path="res://addons/dialogic_additions/Quest/ui_condition_end.gd" id="1_f3miq"]
+
+[node name="Condition_End" type="HBoxContainer"]
+offset_right = 90.0
+offset_bottom = 23.0
+script = ExtResource("1_f3miq")
+
+[node name="Label" type="Label" parent="."]
+layout_mode = 2
+text = "End of condition X"
+
+[node name="AddElif" type="Button" parent="."]
+layout_mode = 2
+text = "Add Elif"
+
+[node name="AddElse" type="Button" parent="."]
+layout_mode = 2
+text = "Add Else"

art/farm/Babushka_house_frontDoor.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ccy6bwunhfvrf"
+path="res://.godot/imported/Babushka_house_frontDoor.png-345830acb7ae8cbbb97011f89455fd91.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/farm/Babushka_house_frontDoor.png"
+dest_files=["res://.godot/imported/Babushka_house_frontDoor.png-345830acb7ae8cbbb97011f89455fd91.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

art/materials/inventory_interactable_outline.tres

@@ -0,0 +1,9 @@
+[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://bv3m12duf0dj6"]
+
+[ext_resource type="Shader" uid="uid://dsa3lv2as7q3b" path="res://shader/outline.gdshader" id="1_fxlom"]
+
+[resource]
+shader = ExtResource("1_fxlom")
+shader_parameter/allow_out_of_bounds = true
+shader_parameter/outline_thickness = 8.0
+shader_parameter/outline_color = Color(0.88, 0.54208, 0.4576, 1)

art/materials/simple_interactable_outline.tres

@@ -0,0 +1,9 @@
+[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://blch5kdhkbj75"]
+
+[ext_resource type="Shader" uid="uid://dsa3lv2as7q3b" path="res://shader/outline.gdshader" id="1_ovtva"]
+
+[resource]
+shader = ExtResource("1_ovtva")
+shader_parameter/allow_out_of_bounds = true
+shader_parameter/outline_thickness = 8.0
+shader_parameter/outline_color = Color(0.88, 0.79684, 0.3256, 1)

art/mockups/3d/best_house_blender.blend.import

@@ -4,11 +4,12 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://b3kyrsoobmkhp"
-valid=false
+path="res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"
 
 [deps]
 
 source_file="res://art/mockups/3d/best_house_blender.blend"
+dest_files=["res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"]
 
 [params]
 

audio/Music/TestingMusic/FightTest_Base.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://iux86v7qmf33"
+path="res://.godot/imported/FightTest_Base.ogg-c2135a351140994f825ac3a4c95512e9.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/FightTest_Base.ogg"
+dest_files=["res://.godot/imported/FightTest_Base.ogg-c2135a351140994f825ac3a4c95512e9.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4

audio/Music/TestingMusic/FightTest_Pattern1.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cimd2rvdwtfkv"
+path="res://.godot/imported/FightTest_Pattern1.ogg-366a24f1c5b2de03be94df3cb6e2b4db.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/FightTest_Pattern1.ogg"
+dest_files=["res://.godot/imported/FightTest_Pattern1.ogg-366a24f1c5b2de03be94df3cb6e2b4db.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4

audio/Music/TestingMusic/FightTest_Pattern2.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://kpbkw64o86q4"
+path="res://.godot/imported/FightTest_Pattern2.ogg-deeb2006ba9921b2d3fd3c5e9154d31c.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/FightTest_Pattern2.ogg"
+dest_files=["res://.godot/imported/FightTest_Pattern2.ogg-deeb2006ba9921b2d3fd3c5e9154d31c.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4

audio/Music/TestingMusic/FightTest_Pattern3.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cmyrgerm8m4nw"
+path="res://.godot/imported/FightTest_Pattern3.ogg-bc6fa475a04ff9ce3eb12d0e5a8b2946.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/FightTest_Pattern3.ogg"
+dest_files=["res://.godot/imported/FightTest_Pattern3.ogg-bc6fa475a04ff9ce3eb12d0e5a8b2946.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4

audio/Music/TestingMusic/NightTest_Pattern1.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://ddu3pxk121x87"
+path="res://.godot/imported/NightTest_Pattern1.ogg-3eb5d685e76ee80df0e3a06c333e5881.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/NightTest_Pattern1.ogg"
+dest_files=["res://.godot/imported/NightTest_Pattern1.ogg-3eb5d685e76ee80df0e3a06c333e5881.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4

audio/Music/TestingMusic/NightTest_Pattern2.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://ddxekmi71ekin"
+path="res://.godot/imported/NightTest_Pattern2.ogg-3f45cf34ddc5716cb6e571b63e7168e6.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/NightTest_Pattern2.ogg"
+dest_files=["res://.godot/imported/NightTest_Pattern2.ogg-3f45cf34ddc5716cb6e571b63e7168e6.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4

audio/Music/TestingMusic/NightTest_Pattern3.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cjnt07ai5bed8"
+path="res://.godot/imported/NightTest_Pattern3.ogg-54521b103c362f6dfd049e0947d34740.oggvorbisstr"
+
+[deps]
+
+source_file="res://audio/Music/TestingMusic/NightTest_Pattern3.ogg"
+dest_files=["res://.godot/imported/NightTest_Pattern3.ogg-54521b103c362f6dfd049e0947d34740.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=130.0
+beat_count=0
+bar_beats=4

dialog/NPC_narrative.tres

@@ -15,8 +15,8 @@
 script = ExtResource("1_0jwhi")
 overrides = {
 "global_bg_color": "Color(0.898375, 0.917922, 0.835355, 1)",
-"global_font_color": "Color(0.242786, 0.16463, 0.180255, 1)",
-"global_font_size": "20.0"
+"global_font_color": "Color(0.257812, 0.125248, 0.0533752, 1)",
+"global_font_size": "30.0"
 }
 
 [sub_resource type="Resource" id="Resource_uxnk3"]
@@ -44,10 +44,10 @@ overrides = {
 "name_label_alignment": "2",
 "name_label_box_modulate": "Color(1, 1, 1, 1)",
 "name_label_box_panel": "\"res://dialog/Babushka_NPC_Namebox_background.tres\"",
+"name_label_custom_font_size": "30.0",
 "name_label_use_global_color": "false",
 "next_indicator_enabled": "false",
-"text_alignment": "1",
-"text_size": "20.0",
+"text_size": "40.0",
 "typing_sounds_end_sound": "\"res://audio/sfx/UI/Dialog/SFX_Dialog_Open_01.wav\""
 }
 
@@ -59,7 +59,14 @@ overrides = {}
 [sub_resource type="Resource" id="Resource_umvdi"]
 script = ExtResource("1_0jwhi")
 scene = ExtResource("7_rg32j")
-overrides = {}
+overrides = {
+"font_size_custom": "30.0",
+"text_color_disabled": "Color(0.605469, 0.605469, 0.605469, 1)",
+"text_color_focused": "Color(1, 0.628906, 0.628906, 1)",
+"text_color_hovered": "Color(0.882353, 0.572549, 0.572549, 1)",
+"text_color_pressed": "Color(1, 0.882812, 0.53125, 1)",
+"text_color_use_global": "false"
+}
 
 [sub_resource type="Resource" id="Resource_ci2ul"]
 script = ExtResource("1_0jwhi")
@@ -94,4 +101,4 @@ layer_info = {
 }
 base_overrides = {}
 layers = Array[ExtResource("1_0jwhi")]([])
-metadata/_latest_layer = "14"
+metadata/_latest_layer = "15"

dialog/Scene1_farm_outside/yeli_intro_05.dtl

@@ -0,0 +1,8 @@
+[quest_complete quest_resource="res://resources/quests/demo/7_talk_yeli_inside_1.tres"]
+join Yeli center
+Yeli: Thank you for your help out there.
+Yeli: You must be tired. Please rest. I prepared a bed for you. It's in the room to the left.
+Yeli: There is nothing interesting to see here.
+leave Yeli
+[quest_activate quest_resource="res://resources/quests/demo/8_goto_bed.tres"]
+[end_timeline]

dialog/Scene2_farm_inside/quest4_dinner.dtl

@@ -1,18 +1,18 @@
 join Yeli center
-join Vesna2 center
+join vesna center
 Everyone: Smachnoho!
-Vesna2: Lovely soup, Yeli!
+vesna: Lovely soup, Yeli!
 Yeli (_part_side): God bless you, my child! That’s also thanks to you.
-Vesna2: So, how do you like it in Lasnoye so far?
+vesna: So, how do you like it in Lasnoye so far?
 - It feels different from when Vasily and I used to live here.
 - It’s just as I remembered it.
 Yeli (_part_side): Indeed, it is.
 Yeli (_part_side): Since the evacuation, Lasnoye and its people had to adapt to…new circumstances.
 Yeli (_part_side): But at its core, it’s still our motherland from back then.
-Vesna2: …And the forest? Has anyone tried to go back and--
+vesna: …And the forest? Has anyone tried to go back and--
 Yeli (_part_side): The forest is strictly off-limits!
 Yeli (_part_side): Dragana forbids it.
 Yeli (_part_side): The grime turned the forest into a dangerous place.
 Yeli (_part_side): But here you’re safe. After all, you can always count on your Yeli!
-Vesna2: In that case, pass me some more soup!
+vesna: In that case, pass me some more soup!
 [end_timeline]

dialog/Vesna2.dch

@@ -1,19 +0,0 @@
-{
-"@path": "res://addons/dialogic/Resources/character.gd",
-"@subpath": NodePath(""),
-&"_translation_id": "",
-&"color": Color(1, 1, 1, 1),
-&"custom_info": {
-"sound_mood_default": "",
-"sound_moods": {},
-"style": "NPC_narrative"
-},
-&"default_portrait": "",
-&"description": "Main character",
-&"display_name": "Vesna2",
-&"mirror": false,
-&"nicknames": [""],
-&"offset": Vector2(0, 0),
-&"portraits": {},
-&"scale": 1.0
-}

dialog/Vesna2.dch.uid

@@ -1 +0,0 @@
-uid://c0vfdx7xal0py

dialog/quest2_tomatoes_end.dtl

@@ -1,4 +0,0 @@
-join Vesna2 center
-Vesna2: I just wish I liked tomatoes more.
-Vesna2: Well…Yeli probably started with the cooking. I should go inside.
-[end_timeline]

dialog/quest2_tomatoes_start.dtl

@@ -1,10 +0,0 @@
-join Yeli center
-join Vesna2 center
-Yeli (_part_side): Thank you, my child! Your Yeli is not so agile anymore.
-Vesna2: But you’re diligent! You’ve started with the preparation for dinner.
-Yeli (_part_side): Indeed, I have.
-Yeli (_part_side):  But, oh my, those ducks messed up the tomatos.
-Yeli (_part_side): Oh, would you like to assist me?
-Vesna2: What do I have to do?
-Yeli (_part_side): First, take the hoe and watering can over there! Then come back to me!
-[end_timeline]

dialog/quests/beetroot/quest3_beets_end.dtl

@@ -1,5 +1,5 @@
 join Yeli center
-join Vesna2 center
+join vesna center
 Yeli (_part_side): Wow! So many?
 Yeli (_part_side): Good job! Put it in the kettle!
 [wait_input]

dialog/quests/beetroot/quest3_beets_interim.dtl

@@ -1,15 +1,15 @@
-join Vesna2 center
+join vesna center
 join Domovoi center
-Vesna2: Oh no, most of the beets aren’t ripe yet.
+vesna: Oh no, most of the beets aren’t ripe yet.
 Domovoi: Pssss!
 Domovoi: Yeah, you!
 Domovoi: The code word is “Rosty Rosty”
-Vesna2: What?
+vesna: What?
 Domovoi: Just say it!
-Vesna2: Rosty…rosty?
+vesna: Rosty…rosty?
 # Hier wächst die rote Beete magisch. Mit einem Signal/Ereignis?
 [signal arg="MagicWord"]
-Vesna2: It worked! How did it work?
-Vesna2: Thank y…and he’s gone.
-What a truly quirky individual.
+vesna: It worked! How did it work?
+vesna: Thank y…and he’s gone.
+vesna: What a truly quirky individual.
 [end_timeline]

dialog/quests/ducks/quest1_ducks_start.dtl

@@ -3,7 +3,7 @@ join vesna left
 [quest_complete quest_resource="res://resources/quests/demo/1_talk_yeli_1.tres"]
 Yeli (_part_side): Come here, you little quacking beast!
 - What a mess!
-- You haven’t called me that way yet.
+- How did you call me?
 Yeli (_part_side): Vesna, oh, thank goodness!
 Yeli (_part_side): Please could you get the runner ducks back into their coop?
 [quest_activate quest_resource="res://resources/quests/demo/2_collect_ducks.tres"]

dialog/quests/forest/quest5_forest_end.dtl

@@ -1,6 +1,6 @@
 join Chuga center
 Chuga: I believe you’ve seen enough for today.
 Chuga: And yes, you too.
-Thank you for playing!
+vesna: Thank you for playing!
 do SceneTransition.ChangeSceneToFileThreaded("res://scenes/Babushka_scene_credits.tscn")
 [end_timeline]

dialog/quests/forest/quest5_forest_start.dtl

@@ -1,22 +1,24 @@
-join Vesna2 center
+[quest_complete quest_resource="res://resources/quests/demo/9_talk_to_chuga.tres"]
+join vesna center
 join Chuga center
 Chuga: Look who it is!
-Vesna2: Your name was Chuga, right? I want to go to the forest!
+vesna: Your name was Chuga, right? I want to go to the forest!
 Chuga: To the forest? After everything the others told you?
-Vesna2: Will you let me through?
+vesna: Will you let me through?
 Chuga: Will I?
 Chuga: Let us have a riddle!
 Chuga: If you answer correctly, I let you through.
 Chuga: If not, I let you through anyway.
-Vesna2: So, what’s the point of answering?
+vesna: So, what’s the point of answering?
 Chuga: You give me an answer, and I give you something to see in the dark.
 Chuga: Or are you planning to return with bumps and bruises?
 Chuga: So, listen\: “I wear a crown, but I’m no king.” Vesna, what am I?
 - Queen
 	Chuga: What a boring answer.
 - Tree
-	That’s it!
+	Chuga: That’s it!
 - Soup
 	Chuga: Hate the player, not the game.
 Chuga: Here you go!
+[quest_activate quest_resource="res://resources/quests/demo/10_fight_the_monsters.tres"]
 [end_timeline]

dialog/quests/tomatoes/quest2_tomatoes_end.dtl

@@ -0,0 +1,4 @@
+join vesna center
+vesna: I just wish I liked tomatoes more.
+vesna: Well…Yeli probably started with the cooking. I should go inside.
+[end_timeline]

dialog/quests/tomatoes/quest2_tomatoes_interim.dtl

@@ -1,5 +1,6 @@
 join Yeli center
-join Vesna2 center
+join vesna center
+[quest_complete quest_resource="res://resources/quests/demo/5_talk_yeli_3.tres"]
 Yeli (_part_side): Great! Now I need you to plant some tomatoes!
 label plant tomatoes
 Yeli (_part_side): Use the hoe to break up the soil. Then plant the seeds and water the fields.
@@ -7,4 +8,5 @@ Yeli (_part_side): Got it?
 - Of course!
 - Wait … How do I plant the tomatoes again?
 	jump plant tomatoes
+[quest_activate quest_resource="res://resources/quests/demo/6_till_and_water.tres"]
 [end_timeline]

dialog/quests/tomatoes/quest2_tomatoes_start.dtl

@@ -0,0 +1,12 @@
+join Yeli center
+join vesna center
+[quest_complete quest_resource="res://resources/quests/demo/3_talk_yeli_2.tres"]
+Yeli (_part_side): Thank you, my child! Your Yeli is not so agile anymore.
+vesna: But you’re diligent! You’ve started with the preparation for dinner.
+Yeli (_part_side): Indeed, I have.
+Yeli (_part_side): But, oh my, those ducks messed up the tomatos.
+Yeli (_part_side): Oh, would you like to assist me?
+vesna: What do I have to do?
+Yeli (_part_side): First, take the hoe and watering can over there! Then come back to me!
+[quest_activate quest_resource="res://resources/quests/demo/4_collect_tools.tres"]
+[end_timeline]

dialog/testing/test_1.dtl

@@ -0,0 +1,15 @@
+Quest\: {ACTIVEQUEST}
+ifquest res://resources/quests/test/test_01.tres, 4:
+	Test 1 active
+else:
+	Test 1 is not active
+	ifquest res://resources/quests/test/test_01.tres, 1:
+		But its available
+	else:
+		And not available
+ifquest res://resources/quests/test/test_02.tres, 4:
+	Test 2 active
+	ifquest res://resources/quests/test/test_02.tres, 1:
+		And Available
+else:
+	Else 2

dialog/testing/test_1.dtl.uid

@@ -0,0 +1 @@
+uid://xfkdvitmhgln

dialog/yeli_intro_05.dtl

@@ -1,6 +0,0 @@
-join Yeli center
-Yeli: Thank you for your help out there. 
-Yeli: You must be tired. Please rest. I prepared a bed for you. It's in the room to the left.
-Yeli: There is nothing interesting to see here.
-leave Yeli
-[end_timeline]

dialog/yeli_quest_select.dtl

@@ -1,4 +1,10 @@
-if {ACTIVEQUEST} == "1_talk_yeli_1":
+ifquest res://resources/quests/demo/1_talk_yeli_1.tres, 1:
 	jump quest1_ducks_start/
-else:
-	No Dialog for active quest {ACTIVEQUEST}
+	[end_timeline]
+ifquest res://resources/quests/demo/3_talk_yeli_2.tres, 1:
+	jump quest2_tomatoes_start/
+	[end_timeline]
+ifquest res://resources/quests/demo/5_talk_yeli_3.tres, 1:
+	jump quest2_tomatoes_interim/
+	[end_timeline]
+No Dialog for active quest "{ACTIVEQUEST}"

prefabs/Interactables/trash_object.tscn

@@ -28,11 +28,16 @@ stream_8/stream = ExtResource("11_kb03l")
 stream_9/stream = ExtResource("12_kka6u")
 
 [node name="trashObject" type="Sprite2D"]
+z_index = 1
+y_sort_enabled = true
 texture = ExtResource("1_k4ca3")
+offset = Vector2(1, -215)
 region_enabled = true
-region_rect = Rect2(57, 493, 334, 475)
+region_rect = Rect2(44, 479, 356, 503)
 
-[node name="InteractionArea" parent="." instance=ExtResource("2_gcgfd")]
+[node name="InteractionArea" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("2_gcgfd")]
+position = Vector2(0, -172)
+_spriteToOutline = NodePath("..")
 
 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
 stream = SubResource("AudioStreamRandomizer_dich4")

prefabs/UI/Inventory/Inventory.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=11 format=3 uid="uid://cgjc4wurbgimy"]
 
 [ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"]
-[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="1_l3npx"]
+[ext_resource type="Script" path="res://scripts/GdScript/dialogic_toggle.gd" id="1_l3npx"]
 [ext_resource type="Texture2D" uid="uid://3ln8aleyxgp1" path="res://art/ui/UI/UI_bag_export_01.png" id="3_vvo7l"]
 [ext_resource type="Texture2D" uid="uid://u0dku75l17re" path="res://art/ui/UI/UI_bag_export_highlight_01.png" id="5_df8i8"]
 [ext_resource type="PackedScene" uid="uid://c0kmdjeqkqrwv" path="res://prefabs/UI/Inventory/Slot.tscn" id="5_u7kje"]
@@ -458,7 +458,6 @@ expand_mode = 1
 [node name="QuestLogRoot" parent="." instance=ExtResource("7_vvo7l")]
 
 [node name="Control" type="Control" parent="."]
-visible = false
 layout_mode = 3
 anchors_preset = 2
 anchor_top = 1.0

prefabs/characters/Chugar.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=8 format=3 uid="uid://ddpl8cbck7e6s"]
+[gd_scene load_steps=9 format=3 uid="uid://ddpl8cbck7e6s"]
 
 [ext_resource type="Script" uid="uid://d0kgxh4ykuv23" path="res://scripts/CSharp/Common/NPC/TalkingCharacter.cs" id="1_xix7p"]
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="2_udjjv"]
 [ext_resource type="Texture2D" uid="uid://bgba1uv0muxat" path="res://art/characters/chugeist_tmp.png" id="3_42og6"]
+[ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/simple_interactable_outline.tres" id="3_kd44q"]
 [ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="43_xooq4"]
-[ext_resource type="Script" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_v6w16"]
+[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_v6w16"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_at1n1"]
 resource_local_to_scene = true
@@ -20,24 +21,16 @@ z_index = 1
 y_sort_enabled = true
 script = ExtResource("1_xix7p")
 
-[node name="InteractionArea" parent="." instance=ExtResource("2_udjjv")]
+[node name="InteractionArea" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("2_udjjv")]
 position = Vector2(0, -450)
 scale = Vector2(2.805, 2.805)
+_outlineMaterial = ExtResource("3_kd44q")
+_spriteToOutline = NodePath("../TalkingControl/Visual")
 
 [node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"]
 position = Vector2(-4.99109, 63.4581)
 shape = SubResource("CircleShape2D_at1n1")
 
-[node name="Label" parent="InteractionArea" index="1"]
-z_index = 5
-custom_minimum_size = Vector2(10, 10)
-offset_left = -131.194
-offset_top = -157.219
-offset_right = 115.806
-offset_bottom = -54.2193
-theme_override_font_sizes/font_size = 60
-text = "[E] talk"
-
 [node name="TalkingControl" type="Node2D" parent="."]
 
 [node name="Visual" type="Sprite2D" parent="TalkingControl"]

prefabs/characters/Player2D.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=476 format=3 uid="uid://c25udixd5m6l0"]
+[gd_scene load_steps=477 format=3 uid="uid://c25udixd5m6l0"]
 
 [ext_resource type="Script" uid="uid://b05uyj001ehwi" path="res://scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs" id="1_yd5ep"]
-[ext_resource type="Script" uid="uid://cjbclkxesh3hc" path="res://scripts/CSharp/Common/CharacterControls/Player2D.cs" id="2_1vqmv"]
+[ext_resource type="Script" uid="uid://cjbclkxesh3hc" path="res://scripts/CSharp/Common/CharacterControls/PlayerMovement.cs" id="2_1vqmv"]
+[ext_resource type="Script" uid="uid://n7oihifvqp23" path="res://scripts/CSharp/Common/Animation/VesnaAnimations.cs" id="3_f6xmn"]
 [ext_resource type="Texture2D" uid="uid://7jrac5ii3ah3" path="res://art/animation/Vesna2D/Vesna Anims Sequences/B01-Idle/0001.png" id="3_tb2wl"]
 [ext_resource type="Texture2D" uid="uid://c06b551t2qlo6" path="res://art/animation/Vesna2D/Vesna Anims Sequences/B01-Idle/0002.png" id="4_dy5kt"]
 [ext_resource type="Texture2D" uid="uid://bj2ssu0ixr0p1" path="res://art/animation/Vesna2D/Vesna Anims Sequences/B01-Idle/0004.png" id="6_3sina"]
@@ -472,7 +473,7 @@
 [ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="816_1a3c1"]
 [ext_resource type="Script" uid="uid://bcskt5ckh3rqa" path="res://scripts/CSharp/Common/Farming/FarmingControls2D.cs" id="817_6nrw3"]
 [ext_resource type="PackedScene" uid="uid://b1d2e7ely6hyw" path="res://prefabs/farm/tomato_field.tscn" id="818_16w6h"]
-[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="819_4na52"]
+[ext_resource type="Script" path="res://scripts/GdScript/dialogic_toggle.gd" id="819_4na52"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_ssqtd"]
 radius = 110.018
@@ -744,7 +745,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"back walking",
-"speed": 15.0
+"speed": 20.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -824,7 +825,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"back walking backpack",
-"speed": 25.0
+"speed": 45.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -862,7 +863,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"back walking rake",
-"speed": 5.0
+"speed": 20.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -900,7 +901,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"back walking wateringcan",
-"speed": 15.0
+"speed": 20.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1471,7 +1472,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"front walking",
-"speed": 15.0
+"speed": 20.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1551,7 +1552,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"front walking backpack",
-"speed": 25.0
+"speed": 42.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1589,7 +1590,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"front walking rake",
-"speed": 15.0
+"speed": 20.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1627,7 +1628,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"front walking wateringcan",
-"speed": 15.0
+"speed": 20.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1948,7 +1949,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"side walking",
-"speed": 25.0
+"speed": 38.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1986,7 +1987,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"side walking rake",
-"speed": 15.0
+"speed": 16.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -2024,7 +2025,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"side walking simplified",
-"speed": 15.0
+"speed": 16.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -2062,38 +2063,41 @@ animations = [{
 }],
 "loop": true,
 "name": &"side walking wateringcan",
-"speed": 11.0
+"speed": 16.0
 }]
 
-[node name="Player2d" type="Node2D" node_paths=PackedStringArray("_farmingControls", "_player2d")]
+[node name="Vesna" type="Node2D" node_paths=PackedStringArray("_farmingControls", "_player2d", "_vesnaAnimations")]
 y_sort_enabled = true
 script = ExtResource("1_yd5ep")
 _farmingControls = NodePath("FarmingControls")
 _player2d = NodePath("CharacterBody2D")
+_vesnaAnimations = NodePath("CharacterBody2D/visuals")
 
-[node name="CharacterBody2D" type="CharacterBody2D" parent="." node_paths=PackedStringArray("_sprite", "_wateringParticles") groups=["PlantGrowing"]]
+[node name="CharacterBody2D" type="CharacterBody2D" parent="." groups=["PlantGrowing"]]
 position = Vector2(0, 374)
 collision_layer = 4
 collision_mask = 3
 script = ExtResource("2_1vqmv")
-_speed = 1500.0
-_sprite = NodePath("visuals/Animated Sprites")
-_wateringParticles = NodePath("../pouring water vfx")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"]
+visible = false
 z_index = 1
 y_sort_enabled = true
 position = Vector2(-24, -13)
 shape = SubResource("CircleShape2D_ssqtd")
 debug_color = Color(0.923708, 0.202722, 0.475262, 0.42)
 
-[node name="visuals" type="Node2D" parent="CharacterBody2D"]
+[node name="visuals" type="Node2D" parent="CharacterBody2D" node_paths=PackedStringArray("_sprite", "_wateringParticles")]
 position = Vector2(0, -374)
+script = ExtResource("3_f6xmn")
+_sprite = NodePath("Animated Sprites")
+_wateringParticles = NodePath("../../pouring water vfx")
 
 [node name="Animated Sprites" type="AnimatedSprite2D" parent="CharacterBody2D/visuals"]
 position = Vector2(0, 450)
 sprite_frames = SubResource("SpriteFrames_4yiyq")
-animation = &"front walking backpack"
+animation = &"side walking wateringcan"
+frame_progress = 0.130831
 offset = Vector2(0, -450)
 
 [node name="Hoe" type="Sprite2D" parent="CharacterBody2D/visuals"]
@@ -2193,6 +2197,11 @@ scale_amount_max = 0.8
 color = Color(0.400601, 0.62444, 0.791217, 1)
 hue_variation_max = 0.4
 
+[node name="DialogicToggle" type="Node2D" parent="." node_paths=PackedStringArray("itemToToggle")]
+scale = Vector2(0.7, 0.7)
+script = ExtResource("819_4na52")
+itemToToggle = NodePath("../CharacterBody2D/visuals/Animated Sprites")
+
 [connection signal="FilledWateringCan" from="." to="CharacterBody2D/WateringCanUI" method="Refill"]
 [connection signal="InventorySelectionChanged" from="." to="CharacterBody2D/WateringCanUI" method="IsWateringCanActive"]
 [connection signal="PickedUpTool" from="." to="CharacterBody2D" method="ActivateTool"]

prefabs/characters/Yeli.tscn

@@ -43,7 +43,7 @@
 [ext_resource type="Texture2D" uid="uid://droj8w1mbm5k3" path="res://art/animation/Yeli2D/F02-Yeli_Talk/0019.png" id="39_vg7xi"]
 [ext_resource type="Texture2D" uid="uid://by5vtadhdwwag" path="res://art/animation/Yeli2D/F02-Yeli_Talk/0020.png" id="40_ipyxb"]
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="42_ahrat"]
-[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_aqu1t"]
+[ext_resource type="Script" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_aqu1t"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_at1n1"]
 resource_local_to_scene = true
@@ -192,22 +192,14 @@ y_sort_enabled = true
 script = ExtResource("1_hn8at")
 _sprite = NodePath("TalkingControl/AnimatedSprite")
 
-[node name="InteractionArea" parent="." instance=ExtResource("42_ahrat")]
+[node name="InteractionArea" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("42_ahrat")]
 position = Vector2(0, -450)
 scale = Vector2(2.805, 2.805)
+_spriteToOutline = NodePath("../TalkingControl/AnimatedSprite")
 
 [node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_at1n1")
 
-[node name="Label" parent="InteractionArea" index="1"]
-custom_minimum_size = Vector2(10, 10)
-offset_left = -127.273
-offset_top = -245.633
-offset_right = 119.727
-offset_bottom = -142.633
-theme_override_font_sizes/font_size = 60
-text = "[E] talk"
-
 [node name="TalkingControl" type="Node2D" parent="."]
 
 [node name="AnimatedSprite" type="AnimatedSprite2D" parent="TalkingControl"]
@@ -220,9 +212,6 @@ offset = Vector2(0, -450)
 [node name="Dialogic starter" type="Node2D" parent="."]
 script = ExtResource("1_at1n1")
 
-[node name="DialogicToggle" type="Node2D" parent="Dialogic starter"]
-script = ExtResource("44_aqu1t")
-
 [node name="AnimatableBody2D" type="AnimatableBody2D" parent="."]
 position = Vector2(0, -172)
 
@@ -230,8 +219,12 @@ position = Vector2(0, -172)
 position = Vector2(0, 94)
 shape = SubResource("CapsuleShape2D_aqu1t")
 
+[node name="DialogicToggle" type="Node2D" parent="." node_paths=PackedStringArray("itemToToggle")]
+scale = Vector2(0.7, 0.7)
+script = ExtResource("44_aqu1t")
+itemToToggle = NodePath("../TalkingControl/AnimatedSprite")
+
 [connection signal="Talking" from="." to="Dialogic starter" method="open"]
 [connection signal="Interacted" from="InteractionArea" to="." method="ToggleTalking"]
-[connection signal="timelineEnded" from="Dialogic starter/DialogicToggle" to="." method="ToggleTalking"]
 
 [editable path="InteractionArea"]

prefabs/farm/beet_field.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=13 format=3 uid="uid://d4m5iy5mwqpq3"]
+[gd_scene load_steps=14 format=3 uid="uid://d4m5iy5mwqpq3"]
 
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="1_tp1yj"]
 [ext_resource type="Script" uid="uid://bdffon388rkty" path="res://scripts/CSharp/Common/Farming/FieldBehaviour2D.cs" id="2_c6u1a"]
+[ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/simple_interactable_outline.tres" id="2_pdgar"]
 [ext_resource type="Texture2D" uid="uid://cgmu3qlovdr22" path="res://art/masks/field_outline_1.png" id="3_b5av1"]
 [ext_resource type="Texture2D" uid="uid://eg5ej0mtuac" path="res://art/masks/field_outline_2.png" id="4_yav45"]
 [ext_resource type="Texture2D" uid="uid://djpigvoyadvjs" path="res://art/masks/field_outline_3.png" id="5_pdgar"]
@@ -12,16 +13,18 @@
 [ext_resource type="Script" uid="uid://dnipeibppjirs" path="res://scripts/CSharp/Common/NPC/DialogicOverlayStarter.cs" id="10_yav45"]
 [ext_resource type="Script" uid="uid://drle5aies8ye4" path="res://scripts/GdScript/dialogic_event_forward.gd" id="11_yav45"]
 
-[sub_resource type="CircleShape2D" id="CircleShape2D_tp1yj"]
+[sub_resource type="CircleShape2D" id="CircleShape2D_a35l4"]
 resource_local_to_scene = true
 radius = 300.0
 
 [node name="BaseField" type="Node2D"]
 
-[node name="InteractionArea2" parent="." instance=ExtResource("1_tp1yj")]
+[node name="InteractionArea2" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("1_tp1yj")]
 visible = false
 z_index = 1
 scale = Vector2(2.225, 2.225)
+_outlineMaterial = ExtResource("2_pdgar")
+_spriteToOutline = NodePath("../FieldBehaviour/MaskedField")
 
 [node name="FieldBehaviour" type="Sprite2D" parent="." node_paths=PackedStringArray("_fieldSprite", "_maskSprite", "_growingCollider")]
 z_index = -1
@@ -50,8 +53,8 @@ _field = NodePath("..")
 [node name="01" parent="FieldBehaviour/BeetRoot/BigPlant" index="0"]
 visible = true
 
-[node name="CollisionShape3D" parent="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"]
-shape = SubResource("CircleShape2D_tp1yj")
+[node name="CollisionShape3D" parent="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"]
+shape = SubResource("CircleShape2D_a35l4")
 
 [node name="01" parent="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/ReadyPlant" index="0"]
 scale = Vector2(3, 3)
@@ -84,4 +87,4 @@ eventName = "MagicWord"
 
 [editable path="FieldBehaviour/BeetRoot"]
 [editable path="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem"]
-[editable path="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2"]
+[editable path="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea"]

prefabs/farm/beet_plant.tscn

@@ -20,7 +20,7 @@ shader_parameter/distortion = 0.0
 shader_parameter/heightOffset = 0.635
 shader_parameter/offset = 0.0
 
-[sub_resource type="CircleShape2D" id="CircleShape2D_2tt5u"]
+[sub_resource type="CircleShape2D" id="CircleShape2D_rvwu0"]
 resource_local_to_scene = true
 radius = 300.0
 
@@ -126,6 +126,8 @@ region_rect = Rect2(18, 311, 129, 142)
 
 [node name="InteractionArea" parent="." instance=ExtResource("4_cfgyx")]
 position = Vector2(0, 2.3)
+_useOutline = false
+_useSprite = false
 
 [node name="ReadyPlantInventoryItem" parent="." instance=ExtResource("5_25lcb")]
 position = Vector2(0, 2.3)
@@ -140,8 +142,8 @@ visible = false
 [node name="PickupErrorLabel" parent="ReadyPlantInventoryItem" index="2"]
 visible = false
 
-[node name="CollisionShape3D" parent="ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"]
-shape = SubResource("CircleShape2D_2tt5u")
+[node name="CollisionShape3D" parent="ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"]
+shape = SubResource("CircleShape2D_rvwu0")
 
 [node name="Icon" parent="ReadyPlantInventoryItem" index="4"]
 visible = false
@@ -202,4 +204,4 @@ hue_variation_max = 0.4
 [connection signal="Interacted" from="InteractionArea" to="." method="Grow"]
 
 [editable path="ReadyPlantInventoryItem"]
-[editable path="ReadyPlantInventoryItem/InteractionArea2"]
+[editable path="ReadyPlantInventoryItem/PickupInteractionArea"]

prefabs/farm/duck.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=23 format=3 uid="uid://muuxxgvx33fp"]
+[gd_scene load_steps=25 format=3 uid="uid://muuxxgvx33fp"]
 
 [ext_resource type="Script" uid="uid://7m1rt7agb6rm" path="res://scripts/CSharp/Common/Temp/MVPDuck.cs" id="1_54k4r"]
 [ext_resource type="Texture2D" uid="uid://hvchk6t0xe7j" path="res://art/animals/Ente.png" id="1_cgxhx"]
@@ -16,6 +16,7 @@
 [ext_resource type="Animation" uid="uid://b3dwd88uvfk1k" path="res://art/animals/duck_flapFlap.res" id="14_uo3dh"]
 [ext_resource type="AudioStream" uid="uid://bsr5m8u2sle5k" path="res://audio/sfx/Animals/SFX_Duck_Wings_07.wav" id="14_xhefb"]
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="15_uo3dh"]
+[ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/simple_interactable_outline.tres" id="16_nxoeu"]
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_sot7i"]
 streams_count = 4
@@ -39,7 +40,7 @@ length = 0.001
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
-tracks/0/path = NodePath("bodyLookingRight/wingR:rotation")
+tracks/0/path = NodePath("SubViewport/bodyLookingRight/wingR:rotation")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
@@ -51,7 +52,7 @@ tracks/0/keys = {
 tracks/1/type = "value"
 tracks/1/imported = false
 tracks/1/enabled = true
-tracks/1/path = NodePath("bodyLookingRight/wingL:rotation")
+tracks/1/path = NodePath("SubViewport/bodyLookingRight/wingL:rotation")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/keys = {
@@ -63,7 +64,7 @@ tracks/1/keys = {
 tracks/2/type = "value"
 tracks/2/imported = false
 tracks/2/enabled = true
-tracks/2/path = NodePath("bodyLookingRight/head:rotation")
+tracks/2/path = NodePath("SubViewport/bodyLookingRight/head:rotation")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
@@ -75,7 +76,7 @@ tracks/2/keys = {
 tracks/3/type = "value"
 tracks/3/imported = false
 tracks/3/enabled = true
-tracks/3/path = NodePath("bodyLookingRight/head/beak upper:rotation")
+tracks/3/path = NodePath("SubViewport/bodyLookingRight/head/beak upper:rotation")
 tracks/3/interp = 1
 tracks/3/loop_wrap = true
 tracks/3/keys = {
@@ -87,7 +88,7 @@ tracks/3/keys = {
 tracks/4/type = "value"
 tracks/4/imported = false
 tracks/4/enabled = true
-tracks/4/path = NodePath("bodyLookingRight/head/beak lower:rotation")
+tracks/4/path = NodePath("SubViewport/bodyLookingRight/head/beak lower:rotation")
 tracks/4/interp = 1
 tracks/4/loop_wrap = true
 tracks/4/keys = {
@@ -135,6 +136,9 @@ _data = {
 resource_local_to_scene = true
 radius = 443.041
 
+[sub_resource type="ViewportTexture" id="ViewportTexture_4830j"]
+viewport_path = NodePath("SubViewport")
+
 [node name="Duck" type="Node2D" node_paths=PackedStringArray("_animationPlayer")]
 z_index = 1
 y_sort_enabled = true
@@ -157,16 +161,28 @@ libraries = {
 &"": SubResource("AnimationLibrary_54k4r")
 }
 
-[node name="bodyLookingRight" type="Node2D" parent="."]
-z_index = 1
-y_sort_enabled = true
-position = Vector2(-5, -537)
+[node name="InteractionArea" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("15_uo3dh")]
+position = Vector2(18, -250)
+_outlineMaterial = ExtResource("16_nxoeu")
+_spriteToOutline = NodePath("../Duck rendered")
+
+[node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"]
+shape = SubResource("CircleShape2D_uo3dh")
+
+[node name="Duck rendered" type="Sprite2D" parent="."]
+position = Vector2(0, -250)
+texture = SubResource("ViewportTexture_4830j")
+
+[node name="SubViewport" type="SubViewport" parent="."]
+transparent_bg = true
+size = Vector2i(400, 600)
+
+[node name="bodyLookingRight" type="Node2D" parent="SubViewport"]
+position = Vector2(200, 550)
 rotation = 0.0135349
 
-[node name="head" type="Sprite2D" parent="bodyLookingRight"]
-z_index = 1
-y_sort_enabled = true
-position = Vector2(46.9624, 76.1606)
+[node name="head" type="Sprite2D" parent="SubViewport/bodyLookingRight"]
+position = Vector2(45.706, -451.714)
 rotation = 0.284615
 scale = Vector2(1, 0.997)
 skew = 0.024546
@@ -175,9 +191,8 @@ offset = Vector2(25.2328, -23.0689)
 region_enabled = true
 region_rect = Rect2(45, 24, 87, 82)
 
-[node name="beak upper" type="Sprite2D" parent="bodyLookingRight/head"]
+[node name="beak upper" type="Sprite2D" parent="SubViewport/bodyLookingRight/head"]
 z_index = 1
-y_sort_enabled = true
 position = Vector2(50.669, -7.16257)
 rotation = -0.0427724
 scale = Vector2(0.62715, 0.62715)
@@ -186,9 +201,7 @@ offset = Vector2(57.1263, -7.47815)
 region_enabled = true
 region_rect = Rect2(292, 37, 152, 98)
 
-[node name="beak lower" type="Sprite2D" parent="bodyLookingRight/head"]
-z_index = 1
-y_sort_enabled = true
+[node name="beak lower" type="Sprite2D" parent="SubViewport/bodyLookingRight/head"]
 position = Vector2(47.9076, -15.7341)
 rotation = 0.0364142
 scale = Vector2(0.58615, 0.58615)
@@ -197,30 +210,24 @@ offset = Vector2(60.4601, 37.8134)
 region_enabled = true
 region_rect = Rect2(295, 170, 145, 39)
 
-[node name="torso" type="Sprite2D" parent="bodyLookingRight"]
-z_index = 1
-y_sort_enabled = true
-position = Vector2(5.90997, 355.352)
+[node name="torso" type="Sprite2D" parent="SubViewport/bodyLookingRight"]
+position = Vector2(4.65357, -172.523)
 scale = Vector2(1.07526, 1.01724)
 texture = ExtResource("1_cgxhx")
 offset = Vector2(2.87376, -131.092)
 region_enabled = true
 region_rect = Rect2(30, 168, 125, 326)
 
-[node name="wingR" type="Sprite2D" parent="bodyLookingRight"]
-z_index = 1
-y_sort_enabled = true
-position = Vector2(-28, 262)
+[node name="wingR" type="Sprite2D" parent="SubViewport/bodyLookingRight"]
+position = Vector2(-29.2564, -265.875)
 rotation = -0.371117
 texture = ExtResource("1_cgxhx")
 offset = Vector2(-50, 50)
 region_enabled = true
 region_rect = Rect2(196, 231, 180, 164)
 
-[node name="wingL" type="Sprite2D" parent="bodyLookingRight"]
-z_index = 1
-y_sort_enabled = true
-position = Vector2(47.0695, 245.905)
+[node name="wingL" type="Sprite2D" parent="SubViewport/bodyLookingRight"]
+position = Vector2(45.8131, -281.97)
 rotation = -0.0925884
 skew = -0.0345086
 texture = ExtResource("1_cgxhx")
@@ -228,10 +235,8 @@ offset = Vector2(-59.5924, 55.37)
 region_enabled = true
 region_rect = Rect2(196, 231, 180, 164)
 
-[node name="underbelly" type="Sprite2D" parent="bodyLookingRight"]
-z_index = 1
-y_sort_enabled = true
-position = Vector2(-11.4038, 439.203)
+[node name="underbelly" type="Sprite2D" parent="SubViewport/bodyLookingRight"]
+position = Vector2(-12.6602, -88.6718)
 rotation = -2.98225
 scale = Vector2(0.672245, 0.955267)
 skew = 0.0185422
@@ -240,8 +245,8 @@ offset = Vector2(26.4135, 70.6083)
 region_enabled = true
 region_rect = Rect2(196, 231, 180, 164)
 
-[node name="leg left" type="Sprite2D" parent="bodyLookingRight"]
-position = Vector2(36.2887, 300.645)
+[node name="leg left" type="Sprite2D" parent="SubViewport/bodyLookingRight"]
+position = Vector2(35.0323, -227.23)
 rotation = 2.42655
 scale = Vector2(1.05221, 1.04106)
 skew = -0.0544101
@@ -249,7 +254,7 @@ texture = ExtResource("1_cgxhx")
 region_enabled = true
 region_rect = Rect2(196, 231, 177, 161)
 
-[node name="left thigh" type="Sprite2D" parent="bodyLookingRight/leg left"]
+[node name="left thigh" type="Sprite2D" parent="SubViewport/bodyLookingRight/leg left"]
 z_index = 1
 y_sort_enabled = true
 position = Vector2(73.353, -69.771)
@@ -259,7 +264,7 @@ texture = ExtResource("1_cgxhx")
 region_enabled = true
 region_rect = Rect2(368, 263, 81, 89)
 
-[node name="left shin" type="Sprite2D" parent="bodyLookingRight/leg left/left thigh"]
+[node name="left shin" type="Sprite2D" parent="SubViewport/bodyLookingRight/leg left/left thigh"]
 z_index = 1
 y_sort_enabled = true
 position = Vector2(-5.71882, 19.9984)
@@ -271,7 +276,7 @@ offset = Vector2(10, -50)
 region_enabled = true
 region_rect = Rect2(360, 361, 68, 126)
 
-[node name="left foot" type="Sprite2D" parent="bodyLookingRight/leg left/left thigh/left shin"]
+[node name="left foot" type="Sprite2D" parent="SubViewport/bodyLookingRight/leg left/left thigh/left shin"]
 z_index = 1
 y_sort_enabled = true
 position = Vector2(15.1289, -77.6075)
@@ -282,19 +287,15 @@ offset = Vector2(40, 40)
 region_enabled = true
 region_rect = Rect2(246, 393, 111, 111)
 
-[node name="right leg" type="Sprite2D" parent="bodyLookingRight"]
-z_index = 1
-y_sort_enabled = true
-position = Vector2(-24, 364)
+[node name="right leg" type="Sprite2D" parent="SubViewport/bodyLookingRight"]
+position = Vector2(-25.2564, -163.875)
 rotation = -0.463741
 scale = Vector2(1.07492, 1.01762)
 texture = ExtResource("1_cgxhx")
 region_enabled = true
 region_rect = Rect2(196, 231, 177, 161)
 
-[node name="right thigh" type="Sprite2D" parent="bodyLookingRight/right leg"]
-z_index = 1
-y_sort_enabled = true
+[node name="right thigh" type="Sprite2D" parent="SubViewport/bodyLookingRight/right leg"]
 position = Vector2(-29.7603, 44.2374)
 rotation = 0.249342
 scale = Vector2(0.625107, 0.655894)
@@ -303,9 +304,7 @@ texture = ExtResource("1_cgxhx")
 region_enabled = true
 region_rect = Rect2(368, 263, 81, 89)
 
-[node name="right shin" type="Sprite2D" parent="bodyLookingRight/right leg/right thigh"]
-z_index = 1
-y_sort_enabled = true
+[node name="right shin" type="Sprite2D" parent="SubViewport/bodyLookingRight/right leg/right thigh"]
 position = Vector2(-2.78734, 11.5692)
 rotation = 0.0689206
 scale = Vector2(1.12016, 1.07128)
@@ -315,9 +314,7 @@ offset = Vector2(-14.163, 37.0936)
 region_enabled = true
 region_rect = Rect2(360, 361, 68, 126)
 
-[node name="right foot" type="Sprite2D" parent="bodyLookingRight/right leg/right thigh/right shin"]
-z_index = 1
-y_sort_enabled = true
+[node name="right foot" type="Sprite2D" parent="SubViewport/bodyLookingRight/right leg/right thigh/right shin"]
 position = Vector2(-20.0986, 67.7507)
 rotation = 0.14855
 scale = Vector2(1.212, 1.212)
@@ -326,17 +323,6 @@ offset = Vector2(40, 40)
 region_enabled = true
 region_rect = Rect2(246, 393, 111, 111)
 
-[node name="InteractionArea" parent="." instance=ExtResource("15_uo3dh")]
-position = Vector2(-3, -274)
-
-[node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"]
-shape = SubResource("CircleShape2D_uo3dh")
-
-[node name="Label" parent="InteractionArea" index="1"]
-modulate = Color(0, 0, 0, 1)
-z_index = 1
-y_sort_enabled = true
-
 [connection signal="Interacted" from="InteractionArea" to="." method="TransferToTargetAfterDelay"]
 [connection signal="Interacted" from="InteractionArea" to="Audio/NakNak" method="PlayOneShot"]
 

prefabs/farm/tomato_field.tscn

@@ -30,22 +30,16 @@ Watered = ExtResource("7_f504p")
 _growingCollider = NodePath("BasePlant2/GrowingInteractionArea")
 
 [node name="BasePlant2" parent="FieldBehaviour" node_paths=PackedStringArray("_field") groups=["PlantGrowing"] instance=ExtResource("8_jrdc4")]
+visible = false
 _field = NodePath("..")
 _magicWordNeeded = false
 
 [node name="CollisionShape3D" parent="FieldBehaviour/BasePlant2/GrowingInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_jrdc4")
 
-[node name="Label" parent="FieldBehaviour/BasePlant2/GrowingInteractionArea" index="1"]
-text = "[E] Grow
-"
-
 [node name="CollisionShape3D" parent="FieldBehaviour/BasePlant2/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_l0vvv")
 
-[node name="Label" parent="FieldBehaviour/BasePlant2/ReadyPlantInventoryItem/PickupInteractionArea" index="1"]
-text = "[E] Harvest"
-
 [node name="MaskedField" type="Sprite2D" parent="FieldBehaviour"]
 clip_children = 1
 scale = Vector2(1.5, 1.5)

prefabs/farm/tomato_plant.tscn

@@ -140,13 +140,12 @@ region_rect = Rect2(546, 697, 535, 687)
 
 [node name="GrowingInteractionArea" parent="." instance=ExtResource("5_3j24b")]
 position = Vector2(0, 2.3)
+_useOutline = false
+_useSprite = false
 
 [node name="CollisionShape3D" parent="GrowingInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_vjw4j")
 
-[node name="Label" parent="GrowingInteractionArea" index="1"]
-text = "[E] Grow"
-
 [node name="ReadyPlantInventoryItem" parent="." instance=ExtResource("6_gdrin")]
 position = Vector2(0, 2.3)
 IsActive = false