Merge branch 'main' into improve-goto

Author: AnidemDex

addons/event_system_plugin/core/event_inspector.gd

@@ -34,4 +34,9 @@ func parse_property(object: Object, type: int, path: String, hint: int, hint_tex
 	if (path_ignore in object):
 		return true
 
+	if path == "next_event":
+		var node = InspectorTools.InspectorEventSelector.new()
+		add_property_editor(path, node)
+		return true
+	
 	return false

addons/event_system_plugin/core/inspector_tools.gd

@@ -1,5 +1,4 @@
 tool
-extends EditorInspector
 
 class InspectorCategory extends Control:
 	var icon:Texture
@@ -52,5 +51,77 @@ class InspectorCategory extends Control:
 			bg_color = get_color("prop_category", "Editor")
 			update()
 
-func get_category_instance() -> InspectorCategory:
-	return InspectorCategory.new()
+
+class InspectorEventSelector extends EditorProperty:
+	var event_selector:Button
+	var popup:ConfirmationDialog
+	var reset_button:Button
+	var updating:bool = false
+	func _init() -> void:
+		event_selector = Button.new()
+		event_selector.text = "Select event"
+		event_selector.connect("pressed",self,"_on_button_pressed")
+		event_selector.size_flags_horizontal = SIZE_EXPAND_FILL
+		
+		reset_button = Button.new()
+		reset_button.connect("pressed", self, "_on_reset_pressed")
+		
+		var hb = HBoxContainer.new()
+		add_child(hb)
+		hb.add_child(event_selector)
+		hb.add_child(reset_button)
+		
+		popup = load("res://addons/event_system_plugin/nodes/editor/event_selector/event_selector.tscn").instance()
+		popup.connect("event_selected", self, "_on_event_selected")
+		add_child(popup)
+	
+	func _ready():
+		reset_button.icon = get_icon("Remove", "EditorIcons")
+		update_property()
+	
+	
+	func update_property():
+		var data:Array = str(get_edited_object()[get_edited_property()]).split(";", false)
+		if data.empty():
+			return
+		
+		var event_idx = data[0]
+		var timeline_path = ""
+		if data.size() >= 2:
+			timeline_path = data[1]
+		
+		var timeline = null
+		if timeline_path != "":
+			timeline = load(timeline_path)
+		
+		if not timeline:
+			timeline = Engine.get_meta("EventSystem").timeline_editor._edited_sequence
+		
+		if not timeline:
+			return
+		
+		var event = timeline.get("event/"+event_idx)
+		updating = true
+		if event:
+			event_selector.text = event.get("event_name")
+		updating = false
+		
+	
+	func _on_button_pressed() -> void:
+		var timeline = Engine.get_meta("EventSystem").timeline_editor._edited_sequence
+		if timeline:
+			popup.build_timeline(timeline)
+			popup.call_deferred("popup_centered_ratio", 0.45)
+	
+	
+	func _on_event_selected(event_idx, path) -> void:
+		if updating:
+			return
+		var value = "{idx};{path}".format({"idx":event_idx, "path":path})
+		emit_changed(get_edited_property(), value)
+	
+	func _on_reset_pressed() -> void:
+		if updating:
+			return
+		
+		emit_changed(get_edited_property(), null)

addons/event_system_plugin/events/goto.gd

@@ -2,6 +2,9 @@ tool
 extends Event
 class_name EventGoTo
 
+# The next event hint of this event. "<index>;<timeline>"
+var next_event:String = "" setget set_next_event
+
 func _init() -> void:
 	event_name = "Go to Event"
 	event_color = Color("#FBB13C")
@@ -11,6 +14,12 @@ func _init() -> void:
 	event_category = "Logic"
 	event_hint = "Helper event to define the next event after this event"
 
+func set_next_event(value:String) -> void:
+	next_event = value
+	emit_changed()
+	property_list_changed_notify()
+
+
 func _get(property):
 	if property == "event_node_path_ignore":
 		return true

addons/event_system_plugin/events/new_condition.gd

@@ -11,15 +11,19 @@ var events_else:String setget _set_else_timeline
 var _events_if:Resource setget set_if_timeline, get_if_timeline
 var _events_else:Resource setget set_else_timeline, get_else_timeline
 
+var next_event
+
 func _execute() -> void:
 	var variables:Dictionary = _Utils.get_property_values_from(get_event_node())
 
 	var evaluated_condition = _Utils.evaluate(condition, get_event_node(), variables)
 
 	if evaluated_condition and (str(evaluated_condition) != condition):
-		next_event = get_if_timeline().get("event/0")
+		get_event_manager_node().set("timeline", get_if_timeline())
 	else:
-		next_event = get_else_timeline().get("event/0")
+		get_event_manager_node().set("timeline", get_else_timeline())
+	
+	next_event = "0"
 
 	finish()
 

addons/event_system_plugin/nodes/editor/event_selector/event_selector.gd

@@ -0,0 +1,92 @@
+tool
+extends ConfirmationDialog
+
+signal event_selected(event, timeline_path)
+
+var tree:Tree
+var root:TreeItem
+
+var last_selected_item = null
+var external_path:String = ""
+var used_timeline:Resource = null
+
+func _notification(what):
+	if what == NOTIFICATION_POPUP_HIDE:
+		if not visible:
+			set_deferred("external_path", "")
+			set_deferred("used_timeline", null)
+
+func build_timeline(timeline) -> void:
+	external_path = ""
+	if root:
+		root.free()
+	
+	tree = $VBoxContainer/Tree
+	root = tree.create_item()
+	root.set_text(0, "Timeline")
+	root.disable_folding = true
+	get_ok().disabled = true
+	
+	for event in timeline.get_events():
+		var item:TreeItem = tree.create_item(root)
+		item.set_text(0, str(event.get("event_name")))
+		item.set_icon(0, event.get("event_icon"))
+		item.set_meta("event", event)
+	
+	used_timeline = timeline
+
+
+func get_selected_event() -> Resource:
+	var item:TreeItem = tree.get_selected()
+	var selected_event:Resource = null
+	
+	if item.has_meta("event"):
+		selected_event = item.get_meta("event")
+	
+	return selected_event
+
+
+func _on_Tree_item_selected():
+	get_ok().disabled = false
+	
+	if last_selected_item == get_selected_event():
+		_on_Tree_item_double_clicked()
+		return
+	
+	last_selected_item = get_selected_event()
+
+
+func _on_Tree_item_double_clicked():
+	get_ok().grab_click_focus()
+
+
+func _on_ConfirmationDialog_confirmed():
+	var event = get_selected_event()
+	var events:Array = used_timeline.get_events()
+	var event_idx = events.find(event)
+	
+	emit_signal("event_selected", event_idx, external_path)
+
+
+func _on_External_pressed():
+	if Engine.editor_hint:
+		var popup:EditorFileDialog = EditorFileDialog.new()
+		popup.display_mode = EditorFileDialog.DISPLAY_LIST
+		popup.mode = EditorFileDialog.MODE_OPEN_FILE
+		popup.add_filter("*.tres; Timeline")
+		popup.connect("file_selected", self, "_on_external_file_selected")
+		
+		add_child(popup)
+		popup.popup_exclusive = true
+		popup.popup_centered_ratio()
+
+
+const TimelineClass = preload("res://addons/event_system_plugin/resources/timeline_class/timeline_class.gd")
+func _on_external_file_selected(path:String) -> void:
+	var res:TimelineClass = load(path) as TimelineClass
+	if not res:
+		push_warning("Invalid resource!")
+		return
+	
+	build_timeline(res)
+	external_path = path

addons/event_system_plugin/nodes/editor/event_selector/event_selector.tscn

@@ -0,0 +1,54 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://addons/event_system_plugin/nodes/editor/event_selector/event_selector.gd" type="Script" id=1]
+
+[node name="ConfirmationDialog" type="ConfirmationDialog"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+rect_min_size = Vector2( 150, 52.5 )
+popup_exclusive = true
+window_title = "Event Selector"
+script = ExtResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = 8.0
+margin_top = 8.0
+margin_right = -8.0
+margin_bottom = -36.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
+margin_right = 1008.0
+margin_bottom = 20.0
+
+[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer"]
+margin_top = 3.0
+margin_right = 152.0
+margin_bottom = 17.0
+text = "Please, select an event:"
+
+[node name="External" type="Button" parent="VBoxContainer/HBoxContainer"]
+margin_left = 844.0
+margin_right = 1008.0
+margin_bottom = 20.0
+size_flags_horizontal = 10
+text = "Use a different timeline"
+
+[node name="Tree" type="Tree" parent="VBoxContainer"]
+margin_top = 24.0
+margin_right = 1008.0
+margin_bottom = 556.0
+size_flags_vertical = 3
+allow_reselect = true
+
+[connection signal="confirmed" from="." to="." method="_on_ConfirmationDialog_confirmed"]
+[connection signal="pressed" from="VBoxContainer/HBoxContainer/External" to="." method="_on_External_pressed"]
+[connection signal="item_double_clicked" from="VBoxContainer/Tree" to="." method="_on_Tree_item_double_clicked"]
+[connection signal="item_selected" from="VBoxContainer/Tree" to="." method="_on_Tree_item_selected"]

addons/event_system_plugin/nodes/event_manager/event_manager.gd

@@ -15,6 +15,7 @@ export(bool) var start_on_ready:bool = false
 
 var timeline
 var current_event
+var current_idx:int = -1
 
 func _ready() -> void:
 	if Engine.editor_hint:
@@ -37,23 +38,38 @@ func start_timeline(timeline_resource:Timeline=timeline) -> void:
 
 func go_to_next_event() -> void:
 	var event
-	if not current_event:
-		if not timeline:
-			_notify_timeline_end()
-			return
-		event = timeline.get("event/0")
-	else:
-		event = current_event.get("next_event")
-		if not event:
-			_notify_timeline_end()
 
+	if current_event:
+		if "next_event" in current_event and current_event["next_event"] != "":
+			var data = current_event.get("next_event").split(";")
+			current_idx = int(data[0])
+			var new_timeline = ""
+			if data.size() > 1:
+				new_timeline = data[1]
+			
+			if new_timeline != "":
+				new_timeline = load(new_timeline) as Timeline
+				if new_timeline:
+					timeline = new_timeline
+		else:
+			current_idx += 1
+	
+	if current_idx < 0:
+		current_idx = 0
+	
+	event = timeline.get("event/{idx}".format({"idx":current_idx}))
 	current_event = event
 
+	if current_event == null:
+		_notify_timeline_end()
+		return
+	
 	_execute_event(event)
 
 
 func _execute_event(event:Event) -> void:
 	if event == null:
+		assert(false)
 		return
 
 	var node:Node = self if event_node_fallback_path == @"." else get_node(event_node_fallback_path)

addons/event_system_plugin/resources/event_class/event_class.gd

@@ -28,8 +28,6 @@ export(bool) var continue_at_end:bool = true setget _set_continue
 
 var event_node_path:NodePath setget _set_event_node_path
 
-var next_event:Resource setget set_next_event, get_next_event
-
 # deprecated. Use get_event_node() instead
 var event_node
 
@@ -80,25 +78,6 @@ func finish() -> void:
 func _execute() -> void:
 	finish()
 
-func set_next_event(event:Resource) -> void:
-	if event:
-		var other:Resource = event.get("next_event")
-		if other == self:
-			push_error("Can't cross reference events. Make a new event as pointer and use that instead.")
-			next_event = null
-			emit_changed()
-			property_list_changed_notify()
-			return
-	
-	next_event = event
-	emit_changed()
-	property_list_changed_notify()
-	
-
-
-func get_next_event() -> Resource:
-	return next_event
-
 
 func get_event_name() -> String:
 	if event_name != resource_name and resource_name != "":

addons/event_system_plugin/resources/timeline_class/timeline_class.gd

@@ -99,15 +99,6 @@ func _set(property:String, value) -> bool:
 		else:
 			_events.insert(event_idx, value)
 
-		var prev_idx:int = event_idx-1
-		
-		if prev_idx > -1:
-			var prev_ev:Resource = _events[prev_idx]
-			var ev_next_pointer:Resource = null
-			if prev_ev:
-				ev_next_pointer = prev_ev.get("next_event")
-				if not ev_next_pointer:
-					prev_ev.set("next_event", value)
 		has_property = true
 		emit_changed()