Merge branch 'main' into improve-vectors-and-numbers

Author: Jowan-Spooner

addons/dialogic/Core/DialogicGameHandler.gd

@@ -281,6 +281,18 @@ func end_timeline(skip_ending := false) -> void:
 	timeline_ended.emit()
 
 
+## Method to check if timeline exists.
+## @timeline can be either a loaded timeline resource or a path to a timeline file.
+func timeline_exists(timeline:Variant) -> bool:
+	if typeof(timeline) == TYPE_STRING:
+		if "://" in timeline and ResourceLoader.exists(timeline):
+			return load(timeline) is DialogicTimeline
+		else:
+			return DialogicResourceUtil.timeline_resource_exists(timeline)
+
+	return timeline is DialogicTimeline
+
+
 ## Handles the next event.
 func handle_next_event(_ignore_argument: Variant = "") -> void:
 	handle_event(current_event_idx+1)

addons/dialogic/Core/DialogicResourceUtil.gd

@@ -87,6 +87,15 @@ static func get_resource_from_identifier(identifier:String, extension:String) ->
 	return null
 
 
+## Returns a boolean that expresses whether the resource exists.
+## The expected extension is needed to use the right directory.
+static func resource_exists_from_identifier(identifier:String, extension:String) -> bool:
+	var value: Variant = get_directory(extension).get(identifier, '')
+	if typeof(value) == TYPE_STRING:
+		return ResourceLoader.exists(value)
+	return value is Resource
+
+
 ## Editor Only
 static func change_unique_identifier(file_path:String, new_identifier:String) -> void:
 	var directory := get_directory(file_path.get_extension())
@@ -325,6 +334,10 @@ static func get_timeline_directory() -> Dictionary:
 	return get_directory('dtl')
 
 
+static func timeline_resource_exists(timeline_identifier:String) -> bool:
+	return resource_exists_from_identifier(timeline_identifier, 'dtl')
+
+
 static func get_timeline_resource(timeline_identifier:String) -> DialogicTimeline:
 	return get_resource_from_identifier(timeline_identifier, 'dtl')
 

addons/dialogic/Core/DialogicUtil.gd

@@ -436,6 +436,7 @@ static func setup_script_property_edit_node(property_info: Dictionary, value:Var
 				input = load("res://addons/dialogic/Editor/Events/Fields/field_number.tscn").instantiate()
 				input.property_name = property_info['name']
 				input.use_int_mode()
+
 				if ',' in property_info.hint_string:
 					input.min_value = int(property_info.hint_string.get_slice(',', 0))
 					input.max_value = int(property_info.hint_string.get_slice(',', 1))
@@ -445,6 +446,7 @@ static func setup_script_property_edit_node(property_info: Dictionary, value:Var
 					input.step = 1
 					input.max_value = INF
 					input.min_value = -INF
+
 				if value != null:
 					input.set_value(value)
 				input.value_changed.connect(DialogicUtil._on_export_number_submitted.bind(property_changed))

addons/dialogic/Editor/Common/broken_reference_manager.gd

@@ -205,7 +205,7 @@ func display_search_results(finds:Array[Dictionary]) -> void:
 ## Inspired by how godot highlights stuff in its search results
 func _custom_draw(item:TreeItem, rect:Rect2) -> void:
 	var text := item.get_text(2)
-	var find := item.get_metadata(0)
+	var find: Dictionary = item.get_metadata(0)
 
 	var font: Font = %ReferenceTree.get_theme_font("font")
 	var font_size: int = %ReferenceTree.get_theme_font_size("font_size")

addons/dialogic/Editor/Common/sidebar.gd

@@ -391,7 +391,7 @@ func _on_resources_tree_item_clicked(_pos: Vector2, mouse_button_index: int) ->
 
 
 func _on_resources_tree_item_collapsed(item:TreeItem) -> void:
-	var collapsed_info := DialogicUtil.get_editor_setting("resource_list_collapsed_info", [])
+	var collapsed_info: Array = DialogicUtil.get_editor_setting("resource_list_collapsed_info", [])
 	if item.get_text(0) in collapsed_info:
 		if not item.collapsed:
 			collapsed_info.erase(item.get_text(0))

addons/dialogic/Example Assets/bbcode_transitions/bbcode_transition_effect.gd

@@ -0,0 +1,84 @@
+@tool
+class_name DialogicRichTextTransitionEffect
+extends RichTextEffect
+
+var visible_characters := -1
+
+@export var bbcode := "animate_in"
+var cache := []
+
+@export_range(0.0, 5.0, 0.01) var time := 0.2
+@export_group("Color", "color")
+@export var color_modulate: Gradient = null
+@export var color_replace: Gradient = null
+@export_group("Scale", "scale")
+@export var scale_enabled := false
+@export var scale_curve := Curve.new()
+@export var scale_pivot := Vector2()
+@export_group("Position", "position")
+@export var position_enabled := false
+@export var position_x_curve := Curve.new()
+@export var position_y_curve := Curve.new()
+
+@export_group("Test", "test")
+@export_range(-0.1, 1.0, 0.1) var test_value := -0.1
+
+var was_skipped := false
+var was_reset := false
+
+
+func reset() -> void:
+	was_reset = true
+	was_skipped = false
+	cache.clear()
+
+
+func skip() -> void:
+	was_skipped = true
+
+
+func _process_custom_fx(char_fx: CharFXTransform) -> bool:
+	var char_age :float = 0.0
+	if test_value >= 0:
+		char_age = test_value
+
+	else:
+		if visible_characters == 0:
+			cache.clear()
+			return false
+		if was_reset:
+			if visible_characters != -1:
+				was_reset = false
+			else:
+				return false
+
+		if len(cache) < visible_characters or visible_characters == -1 or was_skipped:
+			if char_fx.range.x >= len(cache):
+				cache.append(char_fx.elapsed_time)
+
+		if was_skipped:
+			for i in range(len(cache)):
+				cache[i] = char_fx.elapsed_time-time
+
+		if len(cache) > char_fx.range.x:
+			char_age = char_fx.elapsed_time - cache[char_fx.range.x]
+
+	var text_server := TextServerManager.get_primary_interface()
+	var trans: float = clamp(char_age, 0.0, time)/time
+
+	if color_replace:
+		var c := color_replace.sample(trans)
+		c.a = 1
+		char_fx.color = char_fx.color.lerp(c, color_replace.sample(trans).a)
+	if color_modulate:
+		char_fx.color *= color_modulate.sample(trans)
+	if char_fx.font.is_valid():
+		var glyph_size := text_server.font_get_glyph_size(char_fx.font, Vector2i(16,1), char_fx.glyph_index)
+		if scale_enabled:
+			char_fx.transform = char_fx.transform.translated_local(scale_pivot*glyph_size*Vector2(1, -1)*(1-scale_curve.sample(trans)))
+			char_fx.transform = char_fx.transform.scaled_local(Vector2.ONE*scale_curve.sample(trans))
+
+		if position_enabled:
+			char_fx.transform = char_fx.transform.translated_local(Vector2(position_x_curve.sample(trans), position_y_curve.sample(trans))*glyph_size)
+
+	return true

addons/dialogic/Example Assets/bbcode_transitions/bbcode_transition_effect.gd.uid

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

addons/dialogic/Example Assets/bbcode_transitions/fade_in.tres

@@ -0,0 +1,17 @@
+[gd_resource type="RichTextEffect" script_class="DialogicRichTextTransitionEffect" load_steps=3 format=3 uid="uid://qegqrr4g2riu"]
+
+[ext_resource type="Script" uid="uid://wf7hpguw17ex" path="res://addons/dialogic/Example Assets/bbcode_transitions/bbcode_transition_effect.gd" id="1_5w3vn"]
+
+[sub_resource type="Gradient" id="Gradient_5w3vn"]
+colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 1)
+
+[resource]
+script = ExtResource("1_5w3vn")
+bbcode = "fade_in"
+time = 0.2
+color_modulate = SubResource("Gradient_5w3vn")
+scale_enabled = false
+scale_pivot = Vector2(0, 0)
+position_enabled = false
+test_value = -0.1
+metadata/_custom_type_script = "uid://wf7hpguw17ex"

addons/dialogic/Example Assets/bbcode_transitions/fade_scale_in.tres

@@ -0,0 +1,24 @@
+[gd_resource type="RichTextEffect" script_class="DialogicRichTextTransitionEffect" load_steps=4 format=3 uid="uid://hx8qyt5ry3h0"]
+
+[ext_resource type="Script" uid="uid://wf7hpguw17ex" path="res://addons/dialogic/Example Assets/bbcode_transitions/bbcode_transition_effect.gd" id="1_rsak6"]
+
+[sub_resource type="Gradient" id="Gradient_rsak6"]
+offsets = PackedFloat32Array(0, 0.6351706)
+colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 1)
+
+[sub_resource type="Curve" id="Curve_oitc5"]
+_limits = [0.0, 2.0, 0.0, 1.0]
+_data = [Vector2(0, 2), 0.0, 0.0, 0, 0, Vector2(0.40294844, 1.0066038), -0.13865282, 0.0, 0, 0]
+point_count = 2
+
+[resource]
+script = ExtResource("1_rsak6")
+bbcode = "fade_scale_in"
+time = 0.30000000000000004
+color_modulate = SubResource("Gradient_rsak6")
+scale_enabled = true
+scale_curve = SubResource("Curve_oitc5")
+scale_pivot = Vector2(0.5, 0.5)
+position_enabled = false
+test_value = -0.1
+metadata/_custom_type_script = "uid://wf7hpguw17ex"

addons/dialogic/Example Assets/bbcode_transitions/fancy_in.tres

@@ -0,0 +1,35 @@
+[gd_resource type="RichTextEffect" script_class="DialogicRichTextTransitionEffect" load_steps=6 format=3 uid="uid://c8b884puc720d"]
+
+[ext_resource type="Script" uid="uid://wf7hpguw17ex" path="res://addons/dialogic/Example Assets/bbcode_transitions/bbcode_transition_effect.gd" id="1_n3lqs"]
+
+[sub_resource type="Gradient" id="Gradient_n3lqs"]
+offsets = PackedFloat32Array(0, 0.45292622)
+colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 1)
+
+[sub_resource type="Gradient" id="Gradient_lhhwu"]
+interpolation_mode = 1
+offsets = PackedFloat32Array(0, 0.6666667, 0.86513996)
+colors = PackedColorArray(0.5208, 0.76631993, 0.93, 0, 0.5242275, 0.76595265, 0.93170327, 1, 0.5208, 0.76631993, 0.93, 0)
+
+[sub_resource type="Curve" id="Curve_lhhwu"]
+_data = [Vector2(0.002457004, 1), 0.0, -1.993977, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="Curve" id="Curve_4i73d"]
+_limits = [0.0, 1.5, 0.0, 1.0]
+_data = [Vector2(0, 0.6627359), 0.0, 1.7969435, 0, 0, Vector2(0.4987715, 1.0308962), -1.6188686, -1.6188686, 0, 0, Vector2(0.66093373, 1), -0.34929827, 0.0, 0, 0]
+point_count = 3
+
+[resource]
+script = ExtResource("1_n3lqs")
+bbcode = "fancy_in"
+time = 0.4
+color_modulate = SubResource("Gradient_n3lqs")
+color_replace = SubResource("Gradient_lhhwu")
+scale_enabled = true
+scale_curve = SubResource("Curve_4i73d")
+scale_pivot = Vector2(0.5, 0)
+position_enabled = true
+position_x_curve = SubResource("Curve_lhhwu")
+test_value = -0.1
+metadata/_custom_type_script = "uid://wf7hpguw17ex"