Merge pull request 'feature/interaction_outline' (#13) from feature/interaction_outline into develop

Reviewed-on: #13

Babushka.sln.DotSettings.user

@@ -1,12 +1,6 @@
 <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_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_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_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_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_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_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_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_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003FJonathan_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fc7102cd0ffb8973777e61b1942c3fffac7e14016a511d055c3adf73ff91748_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
+	<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>

addons/babushkahelpers/babushkahelpers.gd

@@ -1,22 +0,0 @@
-@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

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

addons/babushkahelpers/plugin.cfg

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

addons/dialogic/plugin.gd

@@ -95,8 +95,6 @@ func _make_visible(visible:bool) -> void:
 func _save_external_data() -> void:
 	if _editor_view_and_manager_exist():
 		editor_view.editors_manager.save_current_resource()
-	
-	DialogicResourceUtil.update_directory('.tres')
 
 
 func _get_unsaved_status(for_scene:String) -> String:

addons/dialogic_additions/Quest/event_quest_activate.gd

@@ -1,55 +0,0 @@
-@tool
-extends DialogicEvent
-class_name DialogicQuestActivateEvent
-
-
-# Define properties of the event here
-var quest_resource: String
-
-func _execute() -> void:
-	var resource = ResourceLoader.load(quest_resource)
-	QuestManager.ChangeQuestStatus(resource,QuestEventUtils.QuestStatus.AVAILABLE)
-	QuestManager.SetActiveQuest(resource)
-	finish() # called to continue with the next event
-
-
-#region INITIALIZE
-################################################################################
-# Set fixed settings of this event
-func _init() -> void:
-	event_name = "Activate Quest"
-	event_category = "Quest"
-
-
-
-#endregion
-
-#region SAVING/LOADING
-################################################################################
-func get_shortcode() -> String:
-	return "quest_activate"
-
-func get_shortcode_parameters() -> Dictionary:
-	return {
-		#param_name 		: property_info
-		"quest_resource"		: {"property": "quest_resource", "default": ""},
-	}
-
-# You can alternatively overwrite these 3 functions: to_text(), from_text(), is_valid_event()
-#endregion
-
-
-#region EDITOR REPRESENTATION
-################################################################################
-
-func build_event_editor() -> void:
-	add_header_label("Activate Quest")
-	add_header_edit(
-		"quest_resource",
-		ValueType.DYNAMIC_OPTIONS,
-		{
-			"mode":2,
-			"suggestions_func":QuestEventUtils.quest_resource_suggestrions
-		})
-
-#endregion

addons/dialogic_additions/Quest/event_quest_activate.gd.uid

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

addons/dialogic_additions/Quest/event_quest_complete.gd

@@ -1,55 +0,0 @@
-@tool
-extends DialogicEvent
-class_name DialogicQuestCompleteEvent
-
-
-# Define properties of the event here
-var quest_resource: String
-
-func _execute() -> void:
-	var resource = ResourceLoader.load(quest_resource)
-	QuestManager.ChangeQuestStatus(resource,QuestEventUtils.QuestStatus.DONE)
-	QuestManager.SetActiveQuest(null)
-	finish() # called to continue with the next event
-
-
-#region INITIALIZE
-################################################################################
-# Set fixed settings of this event
-func _init() -> void:
-	event_name = "Complete Quest"
-	event_category = "Quest"
-
-
-
-#endregion
-
-#region SAVING/LOADING
-################################################################################
-func get_shortcode() -> String:
-	return "quest_complete"
-
-func get_shortcode_parameters() -> Dictionary:
-	return {
-		#param_name 		: property_info
-		"quest_resource"		: {"property": "quest_resource", "default": ""},
-	}
-
-# You can alternatively overwrite these 3 functions: to_text(), from_text(), is_valid_event()
-#endregion
-
-
-#region EDITOR REPRESENTATION
-################################################################################
-
-func build_event_editor() -> void:
-	add_header_label("Complete Quest")
-	add_header_edit(
-		"quest_resource",
-		ValueType.DYNAMIC_OPTIONS,
-		{
-			"mode":2,
-			"suggestions_func":QuestEventUtils.quest_resource_suggestrions
-		})
-
-#endregion

addons/dialogic_additions/Quest/event_quest_complete.gd.uid

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

addons/dialogic_additions/Quest/event_quest_condition.gd

@@ -1,163 +0,0 @@
-@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

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

addons/dialogic_additions/Quest/event_utils.gd

@@ -1,43 +0,0 @@
-@tool
-class_name QuestEventUtils
-
-enum QuestStatus{
-	HIDDEN = 0,
-	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 = {}
-	var quest_paths = get_all_file_paths("res://resources/quests")
-	
-	for path in quest_paths:
-		var res = ResourceLoader.load(path)
-		ret_val[res.id]= {"value":path, "tooltip":res.title + "\n\n" + res.description}
-	
-	return ret_val
-
-static func get_all_file_paths(path: String) -> Array[String]:  
-	var file_paths: Array[String] = []  
-	var dir = DirAccess.open(path)  
-	dir.list_dir_begin()  
-	var file_name = dir.get_next()  
-	while file_name != "":  
-		var file_path = path + "/" + file_name  
-		if dir.current_is_dir():  
-			file_paths += get_all_file_paths(file_path)  
-		else:  
-			file_paths.append(file_path)  
-		file_name = dir.get_next()  
-	return file_paths

addons/dialogic_additions/Quest/event_utils.gd.uid

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

addons/dialogic_additions/Quest/index.gd

@@ -1,9 +0,0 @@
-@tool
-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_condition.gd')
-		]

addons/dialogic_additions/Quest/index.gd.uid

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

addons/dialogic_additions/Quest/ui_condition_end.gd

@@ -1,51 +0,0 @@
-@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

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

addons/dialogic_additions/Quest/ui_quest_condition_end.tscn

@@ -1,20 +0,0 @@
-[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

@@ -1,34 +0,0 @@
-[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/intaractable_outline.tres

@@ -1,9 +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"]
+[ext_resource type="Shader" uid="uid://dsa3lv2as7q3b" path="res://shader/outline.gdshader" id="1_awyqf"]
 
 [resource]
-shader = ExtResource("1_ovtva")
+shader = ExtResource("1_awyqf")
 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)
+shader_parameter/outline_color = Color(0.88, 0.81664, 0.4576, 1)

art/materials/inventory_interactable_outline.tres

@@ -1,9 +0,0 @@
-[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)

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.257812, 0.125248, 0.0533752, 1)",
-"global_font_size": "30.0"
+"global_font_color": "Color(0.242786, 0.16463, 0.180255, 1)",
+"global_font_size": "20.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_size": "40.0",
+"text_alignment": "1",
+"text_size": "20.0",
 "typing_sounds_end_sound": "\"res://audio/sfx/UI/Dialog/SFX_Dialog_Open_01.wav\""
 }
 
@@ -59,14 +59,7 @@ overrides = {}
 [sub_resource type="Resource" id="Resource_umvdi"]
 script = ExtResource("1_0jwhi")
 scene = ExtResource("7_rg32j")
-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"
-}
+overrides = {}
 
 [sub_resource type="Resource" id="Resource_ci2ul"]
 script = ExtResource("1_0jwhi")
@@ -101,4 +94,4 @@ layer_info = {
 }
 base_overrides = {}
 layers = Array[ExtResource("1_0jwhi")]([])
-metadata/_latest_layer = "15"
+metadata/_latest_layer = "14"

dialog/Scene1_farm_outside/yeli_intro_05.dtl

@@ -1,8 +0,0 @@
-[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/Vesna2.dch

@@ -0,0 +1,19 @@
+{
+"@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

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

dialog/quest1_ducks_end.dtl

@@ -0,0 +1,3 @@
+join vesna center
+That’s the last one. I should get back to Yeli.
+[end_timeline]

dialog/quest1_ducks_start.dtl

@@ -1,10 +1,8 @@
 join Yeli right
 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!
-- How did you call me?
+- You haven’t called me that way yet.
 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"]
 [end_timeline]

dialog/quest2_tomatoes_end.dtl

@@ -0,0 +1,4 @@
+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_interim.dtl

@@ -1,6 +1,5 @@
 join Yeli center
-join vesna center
-[quest_complete quest_resource="res://resources/quests/demo/5_talk_yeli_3.tres"]
+join Vesna2 center
 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.
@@ -8,5 +7,4 @@ 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/quest2_tomatoes_start.dtl

@@ -0,0 +1,10 @@
+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/quest3_beets_end.dtl

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

dialog/quest3_beets_interim.dtl

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

dialog/quest4_dinner.dtl

@@ -1,18 +1,18 @@
 join Yeli center
-join vesna center
+join Vesna2 center
 Everyone: Smachnoho!
-vesna: Lovely soup, Yeli!
+Vesna2: Lovely soup, Yeli!
 Yeli (_part_side): God bless you, my child! That’s also thanks to you.
-vesna: So, how do you like it in Lasnoye so far?
+Vesna2: 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.
-vesna: …And the forest? Has anyone tried to go back and--
+Vesna2: …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!
-vesna: In that case, pass me some more soup!
+Vesna2: In that case, pass me some more soup!
 [end_timeline]

dialog/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.
-vesna: Thank you for playing!
+Thank you for playing!
 do SceneTransition.ChangeSceneToFileThreaded("res://scenes/Babushka_scene_credits.tscn")
 [end_timeline]

dialog/quest5_forest_start.dtl

@@ -1,24 +1,22 @@
-[quest_complete quest_resource="res://resources/quests/demo/9_talk_to_chuga.tres"]
-join vesna center
+join Vesna2 center
 join Chuga center
 Chuga: Look who it is!
-vesna: Your name was Chuga, right? I want to go to the forest!
+Vesna2: Your name was Chuga, right? I want to go to the forest!
 Chuga: To the forest? After everything the others told you?
-vesna: Will you let me through?
+Vesna2: 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.
-vesna: So, what’s the point of answering?
+Vesna2: 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
-	Chuga: That’s it!
+	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/ducks/quest1_ducks_end.dtl

@@ -1,5 +0,0 @@
-join vesna center
-[quest_complete quest_resource="res://resources/quests/demo/2_collect_ducks.tres"]
-That’s the last one. I should get back to Yeli.
-[quest_activate quest_resource="res://resources/quests/demo/3_talk_yeli_2.tres"]
-[end_timeline]

dialog/quests/tomatoes/quest2_tomatoes_end.dtl

@@ -1,4 +0,0 @@
-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_start.dtl

@@ -1,12 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

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

dialog/yeli_intro_05.dtl

@@ -0,0 +1,6 @@
+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,10 +0,0 @@
-ifquest res://resources/quests/demo/1_talk_yeli_1.tres, 1:
-	jump quest1_ducks_start/
-	[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}"

dialog/yeli_quest_select.dtl.uid

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

export_presets.cfg

@@ -9,7 +9,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="_builds/Babushka_showcase_win_04/Babushka.exe"
+export_path="_builds/Babushka_win_0_3/Babushka.exe"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""
@@ -79,7 +79,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="_builds/Babushka_showcase_lux_04/Babushka.x86_64"
+export_path="_builds/Babushka_linux_0_2/Babushka.x86_64"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""

prefabs/Interactables/trash_object.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=15 format=3 uid="uid://sbf12hin4kes"]
+[gd_scene load_steps=16 format=3 uid="uid://sbf12hin4kes"]
 
 [ext_resource type="Texture2D" uid="uid://bylgmr0skwtrs" path="res://art/farm/farming/farmobjekte/broken tools atlas.png" id="1_k4ca3"]
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="2_gcgfd"]
+[ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/intaractable_outline.tres" id="3_ic616"]
 [ext_resource type="AudioStream" uid="uid://be6g8b3v3u1ai" path="res://audio/sfx/Kitchen/SFX_Cooking_Knife_PickUp_01.wav" id="3_ktmp7"]
 [ext_resource type="AudioStream" uid="uid://cgjsajsdrrn0j" path="res://audio/sfx/Kitchen/SFX_Cooking_Knife_PutDown_01.wav" id="4_ic616"]
 [ext_resource type="AudioStream" uid="uid://br4drgupled6c" path="res://audio/sfx/Kitchen/SFX_Cooking_Pot_01.wav" id="5_dx175"]
@@ -28,15 +29,13 @@ 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(44, 479, 356, 503)
 
 [node name="InteractionArea" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("2_gcgfd")]
 position = Vector2(0, -172)
+_outlineMaterial = ExtResource("3_ic616")
 _spriteToOutline = NodePath("..")
 
 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]

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" path="res://scripts/GdScript/dialogic_toggle.gd" id="1_l3npx"]
+[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" 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,6 +458,7 @@ 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,11 +1,10 @@
-[gd_scene load_steps=9 format=3 uid="uid://ddpl8cbck7e6s"]
+[gd_scene load_steps=8 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" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_v6w16"]
+[ext_resource type="Script" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_v6w16"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_at1n1"]
 resource_local_to_scene = true
@@ -21,16 +20,24 @@ z_index = 1
 y_sort_enabled = true
 script = ExtResource("1_xix7p")
 
-[node name="InteractionArea" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("2_udjjv")]
+[node name="InteractionArea" parent="." 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,8 +1,7 @@
-[gd_scene load_steps=477 format=3 uid="uid://c25udixd5m6l0"]
+[gd_scene load_steps=476 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/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="Script" uid="uid://cjbclkxesh3hc" path="res://scripts/CSharp/Common/CharacterControls/Player2D.cs" id="2_1vqmv"]
 [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"]
@@ -473,7 +472,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" path="res://scripts/GdScript/dialogic_toggle.gd" id="819_4na52"]
+[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="819_4na52"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_ssqtd"]
 radius = 110.018
@@ -745,7 +744,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"back walking",
-"speed": 20.0
+"speed": 15.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -825,7 +824,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"back walking backpack",
-"speed": 45.0
+"speed": 25.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -863,7 +862,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"back walking rake",
-"speed": 20.0
+"speed": 5.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -901,7 +900,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"back walking wateringcan",
-"speed": 20.0
+"speed": 15.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1472,7 +1471,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"front walking",
-"speed": 20.0
+"speed": 15.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1552,7 +1551,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"front walking backpack",
-"speed": 42.0
+"speed": 25.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1590,7 +1589,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"front walking rake",
-"speed": 20.0
+"speed": 15.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1628,7 +1627,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"front walking wateringcan",
-"speed": 20.0
+"speed": 15.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1949,7 +1948,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"side walking",
-"speed": 38.0
+"speed": 25.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -1987,7 +1986,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"side walking rake",
-"speed": 16.0
+"speed": 15.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -2025,7 +2024,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"side walking simplified",
-"speed": 16.0
+"speed": 15.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -2063,41 +2062,38 @@ animations = [{
 }],
 "loop": true,
 "name": &"side walking wateringcan",
-"speed": 16.0
+"speed": 11.0
 }]
 
-[node name="Vesna" type="Node2D" node_paths=PackedStringArray("_farmingControls", "_player2d", "_vesnaAnimations")]
+[node name="Player2d" type="Node2D" node_paths=PackedStringArray("_farmingControls", "_player2d")]
 y_sort_enabled = true
 script = ExtResource("1_yd5ep")
 _farmingControls = NodePath("FarmingControls")
 _player2d = NodePath("CharacterBody2D")
-_vesnaAnimations = NodePath("CharacterBody2D/visuals")
 
-[node name="CharacterBody2D" type="CharacterBody2D" parent="." groups=["PlantGrowing"]]
+[node name="CharacterBody2D" type="CharacterBody2D" parent="." node_paths=PackedStringArray("_sprite", "_wateringParticles") 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_paths=PackedStringArray("_sprite", "_wateringParticles")]
+[node name="visuals" type="Node2D" parent="CharacterBody2D"]
 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 = &"side walking wateringcan"
-frame_progress = 0.130831
+animation = &"front walking backpack"
 offset = Vector2(0, -450)
 
 [node name="Hoe" type="Sprite2D" parent="CharacterBody2D/visuals"]
@@ -2197,11 +2193,6 @@ 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

@@ -1,10 +1,11 @@
-[gd_scene load_steps=48 format=3 uid="uid://dfvgp1my5rydh"]
+[gd_scene load_steps=49 format=3 uid="uid://dfvgp1my5rydh"]
 
 [ext_resource type="Texture2D" uid="uid://c34012j5ukiuf" path="res://art/animation/Yeli2D/F01-Yeli_Idle/0001.png" id="1_03m0b"]
 [ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="1_at1n1"]
 [ext_resource type="Script" uid="uid://d0kgxh4ykuv23" path="res://scripts/CSharp/Common/NPC/TalkingCharacter.cs" id="1_hn8at"]
 [ext_resource type="Texture2D" uid="uid://cksf38vypfsae" path="res://art/animation/Yeli2D/F01-Yeli_Idle/0002.png" id="2_hn8at"]
 [ext_resource type="Texture2D" uid="uid://e8dj27qcpuoo" path="res://art/animation/Yeli2D/F01-Yeli_Idle/0003.png" id="3_ahrat"]
+[ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/intaractable_outline.tres" id="3_pfk7p"]
 [ext_resource type="Texture2D" uid="uid://c5k63jgxqr0do" path="res://art/animation/Yeli2D/F01-Yeli_Idle/0004.png" id="4_at1n1"]
 [ext_resource type="Texture2D" uid="uid://b8lkbpi220b5h" path="res://art/animation/Yeli2D/F01-Yeli_Idle/0005.png" id="5_aqu1t"]
 [ext_resource type="Texture2D" uid="uid://bv5bxpx6vf2h0" path="res://art/animation/Yeli2D/F01-Yeli_Idle/0006.png" id="6_pfk7p"]
@@ -43,7 +44,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" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_aqu1t"]
+[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_aqu1t"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_at1n1"]
 resource_local_to_scene = true
@@ -195,6 +196,7 @@ _sprite = NodePath("TalkingControl/AnimatedSprite")
 [node name="InteractionArea" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("42_ahrat")]
 position = Vector2(0, -450)
 scale = Vector2(2.805, 2.805)
+_outlineMaterial = ExtResource("3_pfk7p")
 _spriteToOutline = NodePath("../TalkingControl/AnimatedSprite")
 
 [node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"]
@@ -212,6 +214,9 @@ 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)
 
@@ -219,12 +224,8 @@ 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,8 +1,7 @@
-[gd_scene load_steps=14 format=3 uid="uid://d4m5iy5mwqpq3"]
+[gd_scene load_steps=13 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"]
@@ -13,18 +12,16 @@
 [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_a35l4"]
+[sub_resource type="CircleShape2D" id="CircleShape2D_tp1yj"]
 resource_local_to_scene = true
 radius = 300.0
 
 [node name="BaseField" type="Node2D"]
 
-[node name="InteractionArea2" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("1_tp1yj")]
+[node name="InteractionArea2" parent="." 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
@@ -53,8 +50,8 @@ _field = NodePath("..")
 [node name="01" parent="FieldBehaviour/BeetRoot/BigPlant" index="0"]
 visible = true
 
-[node name="CollisionShape3D" parent="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"]
-shape = SubResource("CircleShape2D_a35l4")
+[node name="CollisionShape3D" parent="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"]
+shape = SubResource("CircleShape2D_tp1yj")
 
 [node name="01" parent="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/ReadyPlant" index="0"]
 scale = Vector2(3, 3)
@@ -87,4 +84,4 @@ eventName = "MagicWord"
 
 [editable path="FieldBehaviour/BeetRoot"]
 [editable path="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem"]
-[editable path="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/PickupInteractionArea"]
+[editable path="FieldBehaviour/BeetRoot/ReadyPlantInventoryItem/InteractionArea2"]

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_rvwu0"]
+[sub_resource type="CircleShape2D" id="CircleShape2D_2tt5u"]
 resource_local_to_scene = true
 radius = 300.0
 
@@ -126,8 +126,6 @@ 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)
@@ -142,8 +140,8 @@ visible = false
 [node name="PickupErrorLabel" parent="ReadyPlantInventoryItem" index="2"]
 visible = false
 
-[node name="CollisionShape3D" parent="ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"]
-shape = SubResource("CircleShape2D_rvwu0")
+[node name="CollisionShape3D" parent="ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"]
+shape = SubResource("CircleShape2D_2tt5u")
 
 [node name="Icon" parent="ReadyPlantInventoryItem" index="4"]
 visible = false
@@ -204,4 +202,4 @@ hue_variation_max = 0.4
 [connection signal="Interacted" from="InteractionArea" to="." method="Grow"]
 
 [editable path="ReadyPlantInventoryItem"]
-[editable path="ReadyPlantInventoryItem/PickupInteractionArea"]
+[editable path="ReadyPlantInventoryItem/InteractionArea2"]

prefabs/farm/duck.tscn

@@ -16,7 +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"]
+[ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/intaractable_outline.tres" id="16_nxoeu"]
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_sot7i"]
 streams_count = 4

prefabs/farm/tomato_field.tscn

@@ -1,5 +1,6 @@
 [gd_scene load_steps=10 format=3 uid="uid://b1d2e7ely6hyw"]
 
+[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="1_jrdc4"]
 [ext_resource type="Script" uid="uid://bdffon388rkty" path="res://scripts/CSharp/Common/Farming/FieldBehaviour2D.cs" id="2_vl3uw"]
 [ext_resource type="Texture2D" uid="uid://cgmu3qlovdr22" path="res://art/masks/field_outline_1.png" id="3_uqkef"]
 [ext_resource type="Texture2D" uid="uid://eg5ej0mtuac" path="res://art/masks/field_outline_2.png" id="4_di17a"]
@@ -8,16 +9,17 @@
 [ext_resource type="Texture2D" uid="uid://ctvdxwgmfaj5c" path="res://art/farm/tilable grounds/böden/nasse farming erde.png" id="7_f504p"]
 [ext_resource type="PackedScene" uid="uid://gishbn0a8eke" path="res://prefabs/farm/tomato_plant.tscn" id="8_jrdc4"]
 
-[sub_resource type="CircleShape2D" id="CircleShape2D_jrdc4"]
-resource_local_to_scene = true
-radius = 300.0
-
-[sub_resource type="CircleShape2D" id="CircleShape2D_l0vvv"]
+[sub_resource type="CircleShape2D" id="CircleShape2D_vl3uw"]
 resource_local_to_scene = true
 radius = 300.0
 
 [node name="BaseField" type="Node2D"]
 
+[node name="InteractionArea2" parent="." instance=ExtResource("1_jrdc4")]
+visible = false
+z_index = 1
+scale = Vector2(2.225, 2.225)
+
 [node name="FieldBehaviour" type="Sprite2D" parent="." node_paths=PackedStringArray("_fieldSprite", "_maskSprite", "_growingCollider")]
 z_index = -1
 scale = Vector2(0.9, 1)
@@ -27,18 +29,13 @@ _maskSprite = NodePath("MaskedField")
 _maskTexture = Array[Texture2D]([ExtResource("3_uqkef"), ExtResource("4_di17a"), ExtResource("5_4a8nv")])
 Tilled = ExtResource("6_l7j4c")
 Watered = ExtResource("7_f504p")
-_growingCollider = NodePath("BasePlant2/GrowingInteractionArea")
+_growingCollider = NodePath("BasePlant2/InteractionArea")
 
 [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="CollisionShape3D" parent="FieldBehaviour/BasePlant2/ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"]
-shape = SubResource("CircleShape2D_l0vvv")
+[node name="CollisionShape3D" parent="FieldBehaviour/BasePlant2/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"]
+shape = SubResource("CircleShape2D_vl3uw")
 
 [node name="MaskedField" type="Sprite2D" parent="FieldBehaviour"]
 clip_children = 1
@@ -49,6 +46,5 @@ texture = ExtResource("4_di17a")
 texture = ExtResource("6_l7j4c")
 
 [editable path="FieldBehaviour/BasePlant2"]
-[editable path="FieldBehaviour/BasePlant2/GrowingInteractionArea"]
 [editable path="FieldBehaviour/BasePlant2/ReadyPlantInventoryItem"]
-[editable path="FieldBehaviour/BasePlant2/ReadyPlantInventoryItem/PickupInteractionArea"]
+[editable path="FieldBehaviour/BasePlant2/ReadyPlantInventoryItem/InteractionArea2"]

prefabs/farm/tomato_plant.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=3 uid="uid://gishbn0a8eke"]
+[gd_scene load_steps=12 format=3 uid="uid://gishbn0a8eke"]
 
 [ext_resource type="Script" uid="uid://cms357f23fmfy" path="res://scripts/CSharp/Common/Farming/PlantBehaviour2D.cs" id="1_66p1c"]
 [ext_resource type="Texture2D" uid="uid://dtr4uga5uspg" path="res://art/farm/farming/farmobjekte/tomaten/tomaten baby.png" id="2_vjw4j"]
@@ -22,11 +22,7 @@ shader_parameter/distortion = 0.0
 shader_parameter/heightOffset = 0.635
 shader_parameter/offset = 0.0
 
-[sub_resource type="CircleShape2D" id="CircleShape2D_vjw4j"]
-resource_local_to_scene = true
-radius = 300.0
-
-[sub_resource type="CircleShape2D" id="CircleShape2D_7hdur"]
+[sub_resource type="CircleShape2D" id="CircleShape2D_2tt5u"]
 resource_local_to_scene = true
 radius = 300.0
 
@@ -104,7 +100,7 @@ region_enabled = true
 region_rect = Rect2(228, 600, 85, 92)
 
 [node name="BigPlant" type="Node2D" parent="."]
-position = Vector2(0, -300)
+position = Vector2(0, 2)
 
 [node name="01" type="Sprite2D" parent="BigPlant"]
 visible = false
@@ -138,13 +134,8 @@ texture = ExtResource("4_hmj2d")
 region_enabled = true
 region_rect = Rect2(546, 697, 535, 687)
 
-[node name="GrowingInteractionArea" parent="." instance=ExtResource("5_3j24b")]
+[node name="InteractionArea" 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="ReadyPlantInventoryItem" parent="." instance=ExtResource("6_gdrin")]
 position = Vector2(0, 2.3)
@@ -155,23 +146,17 @@ _blueprint = ExtResource("7_di4m0")
 
 [node name="ItemLabel" parent="ReadyPlantInventoryItem" index="1"]
 visible = false
-z_index = 100
-text = "[E] harvest"
 
 [node name="PickupErrorLabel" parent="ReadyPlantInventoryItem" index="2"]
 visible = false
 
-[node name="PickupInteractionArea" parent="ReadyPlantInventoryItem" index="3"]
-visible = false
-
-[node name="CollisionShape3D" parent="ReadyPlantInventoryItem/PickupInteractionArea/Area2D" index="0"]
-shape = SubResource("CircleShape2D_7hdur")
+[node name="CollisionShape3D" parent="ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"]
+shape = SubResource("CircleShape2D_2tt5u")
 
 [node name="Icon" parent="ReadyPlantInventoryItem" index="4"]
 visible = false
 
 [node name="ReadyPlant" type="Node2D" parent="ReadyPlantInventoryItem"]
-position = Vector2(0, -400)
 
 [node name="01" type="Sprite2D" parent="ReadyPlantInventoryItem/ReadyPlant"]
 visible = false
@@ -224,8 +209,7 @@ scale_amount_max = 0.1
 color = Color(0.400601, 0.62444, 0.791217, 1)
 hue_variation_max = 0.4
 
-[connection signal="Interacted" from="GrowingInteractionArea" to="." method="Grow"]
+[connection signal="Interacted" from="InteractionArea" to="." method="Grow"]
 
-[editable path="GrowingInteractionArea"]
 [editable path="ReadyPlantInventoryItem"]
-[editable path="ReadyPlantInventoryItem/PickupInteractionArea"]
+[editable path="ReadyPlantInventoryItem/InteractionArea2"]

prefabs/interactions/generic_item_on_ground_2d.tscn

@@ -1,8 +1,8 @@
-[gd_scene load_steps=9 format=3 uid="uid://dpbbroif2tnil"]
+[gd_scene load_steps=8 format=3 uid="uid://dpbbroif2tnil"]
 
 [ext_resource type="Script" uid="uid://btusf04xnywhm" path="res://scripts/CSharp/Common/Inventory/ItemOnGround2D.cs" id="1_tlhp6"]
 [ext_resource type="Script" uid="uid://c8suoi3i6kqai" path="res://scripts/CSharp/Common/Inventory/ItemOnGroundSpawnWith.cs" id="3_xu8me"]
-[ext_resource type="Material" uid="uid://bv3m12duf0dj6" path="res://art/materials/inventory_interactable_outline.tres" id="4_harr4"]
+[ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/intaractable_outline.tres" id="4_harr4"]
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="4_xu8me"]
 [ext_resource type="Texture2D" uid="uid://cfxibry711o16" path="res://art/ui/UI/icons/icon-scythe.png" id="5_harr4"]
 
@@ -12,13 +12,7 @@ default_font_size = 80
 [sub_resource type="Theme" id="Theme_harr4"]
 default_font_size = 40
 
-[sub_resource type="CircleShape2D" id="CircleShape2D_tlhp6"]
-resource_local_to_scene = true
-radius = 300.0
-
 [node name="GenericItemOnGround" type="Node2D"]
-z_index = 1
-y_sort_enabled = true
 script = ExtResource("1_tlhp6")
 
 [node name="SpawnWithItem" type="Node" parent="."]
@@ -47,14 +41,7 @@ autowrap_mode = 3
 _outlineMaterial = ExtResource("4_harr4")
 _spriteToOutline = NodePath("../Icon")
 
-[node name="CollisionShape3D" parent="PickupInteractionArea/Area2D" index="0"]
-shape = SubResource("CircleShape2D_tlhp6")
-
 [node name="Icon" type="Sprite2D" parent="."]
 position = Vector2(5, -300)
 scale = Vector2(0.868852, 0.868852)
 texture = ExtResource("5_harr4")
-
-[connection signal="Interacted" from="PickupInteractionArea" to="." method="TryPickUp"]
-
-[editable path="PickupInteractionArea"]

prefabs/interactions/interaction_area_2d.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=5 format=3 uid="uid://cqc72e4hq6bcd"]
+[gd_scene load_steps=4 format=3 uid="uid://cqc72e4hq6bcd"]
 
 [ext_resource type="Script" uid="uid://ckp413wrub5fm" path="res://scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs" id="1_5ajrf"]
-[ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/simple_interactable_outline.tres" id="2_qoey7"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_npluf"]
 resource_local_to_scene = true
@@ -14,7 +13,6 @@ default_font_size = 30
 script = ExtResource("1_5ajrf")
 _area = NodePath("Area2D")
 _label = NodePath("Area2D/CanvasLayer/MarginContainer/Label")
-_outlineMaterial = ExtResource("2_qoey7")
 
 [node name="Area2D" type="Area2D" parent="."]
 collision_mask = 4

prefabs/quests/quest_manager_autoload.tscn

@@ -1,12 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://bworek1jcmq0e"]
-
-[ext_resource type="Script" uid="uid://dl2uhq12p3qks" path="res://scripts/CSharp/Common/Quest/QuestManager.cs" id="1_anowe"]
-[ext_resource type="Script" path="res://scripts/GdScript/dialogic_var_setter.gd" id="4_v86gc"]
-
-[node name="QuestManager" type="Node"]
-script = ExtResource("1_anowe")
-
-[node name="DialogicRelay" type="Node" parent="."]
-script = ExtResource("4_v86gc")
-
-[connection signal="DialogicActiveQuest" from="." to="DialogicRelay" method="_SetActiveQuestVar"]

project.godot

@@ -17,7 +17,6 @@ run/max_fps=120
 boot_splash/fullsize=false
 boot_splash/image="uid://utam4axkvutc"
 config/icon="uid://b2smanpdo1y5e"
-boot_splash/minimum_display_time=1000
 
 [audio]
 
@@ -28,48 +27,45 @@ buses/default_bus_layout="uid://b6dwkmkyb0axk"
 SceneTransition="*res://scenes/SceneTransition.tscn"
 Dialogic="*res://addons/dialogic/Core/DialogicGameHandler.gd"
 InventoryManager="*res://scripts/CSharp/Common/Inventory/InventoryManager.cs"
-FightManagerAutoload="*res://prefabs/fight/fight_manager_autoload.tscn"
-InputService="*res://scripts/CSharp/Common/Services/InputService.cs"
-QuestManager="*res://prefabs/quests/quest_manager_autoload.tscn"
 Signal_Debugger="*res://addons/SignalVisualizer/Debugger/SignalDebugger.gd"
+QuestManager="*res://scripts/CSharp/Common/Quest/QuestManager.cs"
+FightManagerAutoload="*res://prefabs/fight/fight_manager_autoload.tscn"
 
 [dialogic]
 
 directories/dch_directory={
-"Chuga": "res://dialog/Characters/Chuga.dch",
-"Domovoi": "res://dialog/Characters/Domovoi.dch",
-"Everyone": "res://dialog/Characters/Everyone.dch",
-"Yeli": "res://dialog/Characters/Yeli.dch",
-"defaulty_the_default_character": "res://dialog/Characters/defaulty_the_default_character.dch",
-"semi_cat": "res://dialog/Characters/semi_cat.dch",
-"vesna": "res://dialog/Characters/vesna.dch"
+"Chuga": "res://dialog/Chuga.dch",
+"Domovoi": "res://dialog/Domovoi.dch",
+"Everyone": "res://dialog/Everyone.dch",
+"Vesna2": "res://dialog/Vesna2.dch",
+"Yeli": "res://dialog/Yeli.dch",
+"defaulty_the_default_character": "res://dialog/defaulty_the_default_character.dch",
+"semi_cat": "res://dialog/semi_cat.dch",
+"vesna": "res://dialog/vesna.dch"
 }
 directories/dtl_directory={
 "disclaimer": "res://dialog/disclaimer.dtl",
-"quest1_ducks_end": "res://dialog/quests/ducks/quest1_ducks_end.dtl",
-"quest1_ducks_start": "res://dialog/quests/ducks/quest1_ducks_start.dtl",
-"quest2_tomatoes_end": "res://dialog/quests/tomatoes/quest2_tomatoes_end.dtl",
-"quest2_tomatoes_interim": "res://dialog/quests/tomatoes/quest2_tomatoes_interim.dtl",
-"quest2_tomatoes_start": "res://dialog/quests/tomatoes/quest2_tomatoes_start.dtl",
-"quest3_beets_end": "res://dialog/quests/beetroot/quest3_beets_end.dtl",
-"quest3_beets_interim": "res://dialog/quests/beetroot/quest3_beets_interim.dtl",
-"quest3_beets_start": "res://dialog/quests/beetroot/quest3_beets_start.dtl",
-"quest4_dinner": "res://dialog/Scene2_farm_inside/quest4_dinner.dtl",
-"quest5_forest_end": "res://dialog/quests/forest/quest5_forest_end.dtl",
-"quest5_forest_start": "res://dialog/quests/forest/quest5_forest_start.dtl",
+"quest1_ducks_end": "res://dialog/quest1_ducks_end.dtl",
+"quest1_ducks_start": "res://dialog/quest1_ducks_start.dtl",
+"quest2_tomatoes_end": "res://dialog/quest2_tomatoes_end.dtl",
+"quest2_tomatoes_interim": "res://dialog/quest2_tomatoes_interim.dtl",
+"quest2_tomatoes_start": "res://dialog/quest2_tomatoes_start.dtl",
+"quest3_beets_end": "res://dialog/quest3_beets_end.dtl",
+"quest3_beets_interim": "res://dialog/quest3_beets_interim.dtl",
+"quest3_beets_start": "res://dialog/quest3_beets_start.dtl",
+"quest4_dinner": "res://dialog/quest4_dinner.dtl",
+"quest5_forest_end": "res://dialog/quest5_forest_end.dtl",
+"quest5_forest_start": "res://dialog/quest5_forest_start.dtl",
 "semi_cat": "res://dialog/semi_cat.dtl",
 "talk_to_plant": "res://dialog/talk_to_plant.dtl",
-"test_1": "res://dialog/testing/test_1.dtl",
 "test_time_line": "res://dialog/test_time_line.dtl",
-"yeli_intro_01": "res://dialog/Scene1_farm_outside/yeli_intro_01.dtl",
-"yeli_intro_02": "res://dialog/Scene1_farm_outside/yeli_intro_02.dtl",
-"yeli_intro_03": "res://dialog/Scene1_farm_outside/yeli_intro_03.dtl",
-"yeli_intro_04": "res://dialog/Scene1_farm_outside/yeli_intro_04.dtl",
-"yeli_intro_05": "res://dialog/Scene1_farm_outside/yeli_intro_05.dtl",
-"yeli_quest_select": "res://dialog/yeli_quest_select.dtl"
+"yeli_intro_01": "res://dialog/yeli_intro_01.dtl",
+"yeli_intro_02": "res://dialog/yeli_intro_02.dtl",
+"yeli_intro_03": "res://dialog/yeli_intro_03.dtl",
+"yeli_intro_04": "res://dialog/yeli_intro_04.dtl",
+"yeli_intro_05": "res://dialog/yeli_intro_05.dtl"
 }
 variables={
-"ACTIVEQUEST": "none",
 "MAGICWORD": "Hokus Pokus!s",
 "PLAYERMOOD": "Good",
 "SHOW": "IGF"
@@ -109,69 +105,12 @@ translation/id_counter=22
 translation/locales=["de", "en"]
 text/autopauses={}
 glossary/glossary_files=["res://dialog/farming_equipment_glossary.tres"]
-directories/tres_directory={
-"10_fight_the_monsters": "res://resources/quests/demo/10_fight_the_monsters.tres",
-"1_talk_yeli_1": "res://resources/quests/demo/1_talk_yeli_1.tres",
-"2_collect_ducks": "res://resources/quests/demo/2_collect_ducks.tres",
-"3_talk_yeli_2": "res://resources/quests/demo/3_talk_yeli_2.tres",
-"4_collect_tools": "res://resources/quests/demo/4_collect_tools.tres",
-"5_talk_yeli_3": "res://resources/quests/demo/5_talk_yeli_3.tres",
-"6_till_and_water": "res://resources/quests/demo/6_till_and_water.tres",
-"7_talk_yeli_inside_1": "res://resources/quests/demo/7_talk_yeli_inside_1.tres",
-"8_goto_bed": "res://resources/quests/demo/8_goto_bed.tres",
-"9_talk_to_chuga": "res://resources/quests/demo/9_talk_to_chuga.tres",
-"Babushka_NPC_Namebox_background": "res://dialog/Babushka_NPC_Namebox_background.tres",
-"InputFieldsStyle": "res://addons/dialogic/Editor/Events/styles/InputFieldsStyle.tres",
-"MainTheme": "res://addons/dialogic/Editor/Theme/MainTheme.tres",
-"NPC_narrative": "res://dialog/NPC_narrative.tres",
-"New_File": "res://addons/dialogic/New_File.tres",
-"PickerTheme": "res://addons/dialogic/Editor/Theme/PickerTheme.tres",
-"ResourceMenuHover": "res://addons/dialogic/Editor/Events/styles/ResourceMenuHover.tres",
-"ResourceMenuNormal": "res://addons/dialogic/Editor/Events/styles/ResourceMenuNormal.tres",
-"ResourceMenuPanelBackground": "res://addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres",
-"SectionPanel": "res://addons/dialogic/Editor/Events/styles/SectionPanel.tres",
-"SimpleButtonHover": "res://addons/dialogic/Editor/Events/styles/SimpleButtonHover.tres",
-"SimpleButtonNormal": "res://addons/dialogic/Editor/Events/styles/SimpleButtonNormal.tres",
-"TextBackground": "res://addons/dialogic/Editor/Events/styles/TextBackground.tres",
-"TitleBgStylebox": "res://addons/dialogic/Editor/Common/TitleBgStylebox.tres",
-"beet": "res://resources/items/beet.tres",
-"beetRoot": "res://resources/quests/beetRoot.tres",
-"choice_panel_focus": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/choice_panel_focus.tres",
-"choice_panel_hover": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/choice_panel_hover.tres",
-"choice_panel_normal": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/choice_panel_normal.tres",
-"default_bus_layout": "res://audio/default_bus_layout.tres",
-"default_stylebox": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_SpeakerPortraitTextbox/default_stylebox.tres",
-"default_vn_style": "res://addons/dialogic/Modules/DefaultLayoutParts/Style_VN_Default/default_vn_style.tres",
-"farming_equipment_glossary": "res://dialog/farming_equipment_glossary.tres",
-"hoe": "res://resources/items/hoe.tres",
-"inventory_interactable_outline": "res://art/materials/inventory_interactable_outline.tres",
-"preview_character": "res://addons/dialogic/Modules/Character/preview_character.tres",
-"rake": "res://resources/items/rake.tres",
-"scythe": "res://resources/items/scythe.tres",
-"selected_styleboxflat": "res://addons/dialogic/Editor/Events/styles/selected_styleboxflat.tres",
-"shovel": "res://resources/items/shovel.tres",
-"simple_fade": "res://addons/dialogic/Modules/Background/Transitions/Defaults/simple_fade.tres",
-"simple_interactable_outline": "res://art/materials/simple_interactable_outline.tres",
-"simple_swipe_gradient": "res://addons/dialogic/Modules/Background/Transitions/simple_swipe_gradient.tres",
-"speaker_textbox_style": "res://addons/dialogic/Modules/DefaultLayoutParts/Style_SpeakerTextbox/speaker_textbox_style.tres",
-"speechbubble": "res://dialog/speechbubble.tres",
-"test": "res://resources/items/test.tres",
-"test/test_01": "res://resources/quests/test/test_01.tres",
-"test/test_02": "res://resources/quests/test/test_02.tres",
-"test/test_03": "res://resources/quests/test/test_03.tres",
-"textbubble_style": "res://addons/dialogic/Modules/DefaultLayoutParts/Style_TextBubbles/textbubble_style.tres",
-"tomato": "res://resources/items/tomato.tres",
-"tomato_seed": "res://resources/items/tomato_seed.tres",
-"unselected_stylebox": "res://addons/dialogic/Editor/Events/styles/unselected_stylebox.tres",
-"vn_textbox_default_panel": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_default_panel.tres",
-"vn_textbox_name_label_panel": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_name_label_panel.tres",
-"wateringcan": "res://resources/items/wateringcan.tres"
-}
 
 [display]
 
-window/size/viewport_width=1980
-window/size/viewport_height=1020
+window/size/viewport_width=2000
+window/size/viewport_height=1000
+window/size/always_on_top=true
 window/stretch/mode="viewport"
 window/stretch/aspect="keep_height"
 
@@ -185,7 +124,7 @@ movie_writer/movie_file="/home/kaddi/Documents/Repos/Godot/Babushka/_clips/clip.
 
 [editor_plugins]
 
-enabled=PackedStringArray("res://addons/SignalVisualizer/plugin.cfg", "res://addons/anthonyec.camera_preview/plugin.cfg", "res://addons/babushkahelpers/plugin.cfg", "res://addons/dialogic/plugin.cfg")
+enabled=PackedStringArray("res://addons/SignalVisualizer/plugin.cfg", "res://addons/anthonyec.camera_preview/plugin.cfg", "res://addons/dialogic/plugin.cfg")
 
 [file_customization]
 

resources/quests/demo/10_fight_the_monsters.tres

@@ -1,10 +0,0 @@
-[gd_resource type="Resource" script_class="QuestResource" load_steps=2 format=3 uid="uid://cv3wtnn0138ax"]
-
-[ext_resource type="Script" uid="uid://vji5lp4qc8pp" path="res://scripts/CSharp/Common/Quest/QuestResource.cs" id="1_m0nkd"]
-
-[resource]
-script = ExtResource("1_m0nkd")
-id = "10_fight_the_monsters"
-title = "Fight the monsters"
-description = "A dangerous path lies before you. Be brave and slay the monsters to reach the other side."
-metadata/_custom_type_script = "uid://vji5lp4qc8pp"

resources/quests/demo/1_talk_yeli_1.tres

@@ -1,10 +0,0 @@
-[gd_resource type="Resource" script_class="QuestResource" load_steps=2 format=3 uid="uid://cm8kftow8br00"]
-
-[ext_resource type="Script" uid="uid://vji5lp4qc8pp" path="res://scripts/CSharp/Common/Quest/QuestResource.cs" id="1_xjwrv"]
-
-[resource]
-script = ExtResource("1_xjwrv")
-id = "1_talk_yeli_1"
-title = "Talk to Yeli"
-description = ""
-metadata/_custom_type_script = "uid://vji5lp4qc8pp"

resources/quests/demo/2_collect_ducks.tres

@@ -1,10 +0,0 @@
-[gd_resource type="Resource" script_class="QuestResource" load_steps=2 format=3 uid="uid://cy0na3ukvpoou"]
-
-[ext_resource type="Script" uid="uid://vji5lp4qc8pp" path="res://scripts/CSharp/Common/Quest/QuestResource.cs" id="1_wactd"]
-
-[resource]
-script = ExtResource("1_wactd")
-id = "2_collect_ducks"
-title = "Collect the Ducks"
-description = "Collect all 6 ducks running around the farm by aporaching them and pressing [E]"
-metadata/_custom_type_script = "uid://vji5lp4qc8pp"

resources/quests/demo/3_talk_yeli_2.tres

@@ -1,10 +0,0 @@
-[gd_resource type="Resource" script_class="QuestResource" load_steps=2 format=3 uid="uid://mf0rdejw8fuk"]
-
-[ext_resource type="Script" uid="uid://vji5lp4qc8pp" path="res://scripts/CSharp/Common/Quest/QuestResource.cs" id="1_70pjl"]
-
-[resource]
-script = ExtResource("1_70pjl")
-id = "3_talk_yeli_2"
-title = "Talk to Yeli again"
-description = "All ducks are collected. Head back to yeli."
-metadata/_custom_type_script = "uid://vji5lp4qc8pp"

resources/quests/demo/4_collect_tools.tres

@@ -1,10 +0,0 @@
-[gd_resource type="Resource" script_class="QuestResource" load_steps=2 format=3 uid="uid://d2swjixbnqkbw"]
-
-[ext_resource type="Script" uid="uid://vji5lp4qc8pp" path="res://scripts/CSharp/Common/Quest/QuestResource.cs" id="1_e51xd"]
-
-[resource]
-script = ExtResource("1_e51xd")
-id = "4_collect_tools"
-title = "Collect the farm tools"
-description = "Collect the Watering Can next to the well and the Hoe by the fence."
-metadata/_custom_type_script = "uid://vji5lp4qc8pp"

resources/quests/demo/5_talk_yeli_3.tres

@@ -1,10 +0,0 @@
-[gd_resource type="Resource" script_class="QuestResource" load_steps=2 format=3 uid="uid://5t8g0firdif0"]
-
-[ext_resource type="Script" uid="uid://vji5lp4qc8pp" path="res://scripts/CSharp/Common/Quest/QuestResource.cs" id="1_x7fvu"]
-
-[resource]
-script = ExtResource("1_x7fvu")
-id = "5_talk_yeli_3"
-title = "Talk to Yeli again"
-description = "After the long and agonizing task of finding and collecting two tools, go talk to Yeli once again."
-metadata/_custom_type_script = "uid://vji5lp4qc8pp"