Merge remote-tracking branch 'origin/Nao's-Sounds' into feature/sounds_update

Reviewed-on: #15

Babushka.sln.DotSettings.user

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

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/plugin.gd

@@ -95,6 +95,8 @@ 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

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

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

addons/dialogic_additions/Quest/event_quest_complete.gd

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

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

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

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

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

addons/dialogic_additions/Quest/index.gd

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

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

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/farm/farming/farmobjekte/beetroot/beetroot_icon.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b5ade1s2ijunu"
+path="res://.godot/imported/beetroot_icon.png-aef760d681bd7ef4c12802c6da8d93f5.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/farm/farming/farmobjekte/beetroot/beetroot_icon.png"
+dest_files=["res://.godot/imported/beetroot_icon.png-aef760d681bd7ef4c12802c6da8d93f5.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/farm/farming/farmobjekte/beetroot_00.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://xtci0n8tquc0"
+path="res://.godot/imported/beetroot_00.png-0c2234fc9109ef4b2bb1c7f568ee2fc7.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/farm/farming/farmobjekte/beetroot_00.png"
+dest_files=["res://.godot/imported/beetroot_00.png-0c2234fc9109ef4b2bb1c7f568ee2fc7.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,12 +4,11 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://b3kyrsoobmkhp"
-path="res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"
+valid=false
 
 [deps]
 
 source_file="res://art/mockups/3d/best_house_blender.blend"
-dest_files=["res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"]
 
 [params]
 

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_color": "Color(0.257812, 0.125248, 0.0533752, 1)",
-"global_font_size": "20.0"
+"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": "40.0",
-"text_size": "20.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]