Merge pull request #81 from AnidemDex/update-event-system-to-1.4

Update event system to 1.4

Author: AnidemDex

addons/event_system_plugin/assets/themes/event_node/event_description_piece.tres

@@ -1,14 +1,54 @@
-[gd_resource type="Theme" load_steps=2 format=2]
+[gd_resource type="Theme" load_steps=6 format=2]
 
-[sub_resource type="StyleBoxEmpty" id=1]
+[sub_resource type="StyleBoxEmpty" id=5]
+
+[sub_resource type="StyleBoxFlat" id=2]
+
+[sub_resource type="StyleBoxFlat" id=3]
+content_margin_left = 8.0
+content_margin_right = 4.0
+content_margin_top = 4.0
+content_margin_bottom = 4.0
+corner_radius_top_left = 32
+corner_radius_bottom_left = 32
+
+[sub_resource type="StyleBoxFlat" id=4]
+content_margin_left = 12.0
+content_margin_right = 8.0
+content_margin_top = 4.0
+content_margin_bottom = 4.0
+corner_radius_top_right = 32
+corner_radius_bottom_right = 32
+shadow_offset = Vector2( 2, 0 )
+
+[sub_resource type="StyleBoxFlat" id=1]
+content_margin_left = 8.0
+content_margin_right = 8.0
+content_margin_top = 4.0
 content_margin_bottom = 4.0
+draw_center = false
+border_width_left = 2
+border_width_top = 2
+border_width_right = 2
+border_width_bottom = 2
+border_color = Color( 0.0980392, 0.113725, 0.156863, 1 )
+corner_radius_top_left = 16
+corner_radius_top_right = 16
+corner_radius_bottom_right = 16
+corner_radius_bottom_left = 16
 
 [resource]
-resource_local_to_scene = true
+Button/styles/disabled = SubResource( 5 )
+Button/styles/focus = SubResource( 5 )
+Button/styles/hover = SubResource( 5 )
+Button/styles/normal = SubResource( 5 )
+Button/styles/pressed = SubResource( 5 )
+EventNode/colors/default = Color( 0.6, 0.6, 0.6, 1 )
+EventNode/colors/event = Color( 0.984314, 0.694118, 0.235294, 1 )
+EventNode/colors/hover = Color( 0.156863, 0.572549, 0.843137, 1 )
+EventNode/colors/outline = Color( 0.0980392, 0.113725, 0.156863, 1 )
+EventNode/styles/bg = SubResource( 2 )
+EventNode/styles/bg_left = SubResource( 3 )
+EventNode/styles/bg_right = SubResource( 4 )
+EventNode/styles/outline = SubResource( 1 )
 HBoxContainer/constants/separation = 0
-Label/colors/font_color = Color( 0, 0, 0, 1 )
-PanelContainer/colors/default = Color( 0.6, 0.6, 0.6, 1 )
-PanelContainer/colors/event = Color( 0.984314, 0.694118, 0.235294, 1 )
-PanelContainer/colors/hover = Color( 0.156863, 0.572549, 0.843137, 1 )
-PanelContainer/colors/outline = Color( 0.0980392, 0.113725, 0.156863, 1 )
-PanelContainer/styles/panel = SubResource( 1 )

addons/event_system_plugin/assets/themes/event_node/event_node.tres

@@ -0,0 +1,48 @@
+[gd_resource type="Theme" load_steps=5 format=2]
+
+[sub_resource type="StyleBoxFlat" id=2]
+
+[sub_resource type="StyleBoxFlat" id=3]
+content_margin_left = 8.0
+content_margin_right = 4.0
+content_margin_top = 4.0
+content_margin_bottom = 4.0
+corner_radius_top_left = 32
+corner_radius_bottom_left = 32
+
+[sub_resource type="StyleBoxFlat" id=4]
+content_margin_left = 12.0
+content_margin_right = 8.0
+content_margin_top = 4.0
+content_margin_bottom = 4.0
+corner_radius_top_right = 32
+corner_radius_bottom_right = 32
+shadow_offset = Vector2( 2, 0 )
+
+[sub_resource type="StyleBoxFlat" id=1]
+content_margin_left = 8.0
+content_margin_right = 8.0
+content_margin_top = 4.0
+content_margin_bottom = 4.0
+draw_center = false
+border_width_left = 2
+border_width_top = 2
+border_width_right = 2
+border_width_bottom = 2
+border_color = Color( 0.0980392, 0.113725, 0.156863, 1 )
+corner_radius_top_left = 16
+corner_radius_top_right = 16
+corner_radius_bottom_right = 16
+corner_radius_bottom_left = 16
+
+[resource]
+EventNode/colors/default = Color( 0.6, 0.6, 0.6, 1 )
+EventNode/colors/event = Color( 0.984314, 0.694118, 0.235294, 1 )
+EventNode/colors/hover = Color( 0.156863, 0.572549, 0.843137, 1 )
+EventNode/colors/outline = Color( 0.0980392, 0.113725, 0.156863, 1 )
+EventNode/styles/bg = SubResource( 2 )
+EventNode/styles/bg_left = SubResource( 3 )
+EventNode/styles/bg_right = SubResource( 4 )
+EventNode/styles/outline = SubResource( 1 )
+PanelContainer/constants/identation = 32
+VBoxContainer/constants/separation = 0

addons/event_system_plugin/assets/themes/event_node/event_title_piece.tres

@@ -0,0 +1,41 @@
+extends Reference
+
+static func get_shortcut(property: String) -> ShortCut:
+	var shortcut:ShortCut = ShortCut.new()
+	match property:
+		"duplicate":
+			shortcut = null
+			if Engine.editor_hint:
+				var plugin = ClassDB.instance("EditorPlugin")
+				var settings:EditorSettings = plugin.get_editor_interface().get_editor_settings()
+#				shortcut = settings.get("scene_tree/duplicate") as ShortCut
+				shortcut = null # We can't get shortcuts for now
+				plugin.free()
+			
+			if shortcut == null:
+				shortcut = ShortCut.new()
+				var input := InputEventKey.new()
+				input.scancode = KEY_D
+				input.control = true
+				input.pressed = true
+				shortcut.shortcut = input
+		
+		"remove","delete":
+			shortcut = null
+			
+			if Engine.editor_hint:
+				var plugin = ClassDB.instance("EditorPlugin")
+				var settings:EditorSettings = plugin.get_editor_interface().get_editor_settings()
+#				shortcut = settings.get("scene_tree/delete") as ShortCut
+				shortcut = null # we can't get shortcuts for now
+				plugin.free()
+			
+			if shortcut == null:
+				shortcut = ShortCut.new()
+				var input := InputEventKey.new()
+				input.scancode = KEY_DELETE
+				input.pressed = true
+				shortcut.shortcut = input
+				
+	
+	return shortcut

addons/event_system_plugin/assets/themes/timeline_editor.tres

@@ -7,7 +7,6 @@ func _init() -> void:
 	event_category = "Node"
 	event_icon = load("res://addons/event_system_plugin/assets/icons/event_icons/call.png") as Texture
 	event_preview_string = "{method} ( {args} ) "
-	node_path = NodePath()
 
 	args = []
 	push_warning("Call event is deprecated. Will be removed in future versions. Consider using EventCallFrom")

addons/event_system_plugin/assets/themes/timeline_editor/timeline_editor_l.tres

@@ -2,7 +2,6 @@ tool
 extends Event
 class_name EventCall
 
-export(NodePath) var node_path:NodePath setget set_node_path
 export(String) var method:String = "" setget set_method
 export(Array) var args:Array = []
 
@@ -17,20 +16,14 @@ func _init() -> void:
 
 
 func _execute() -> void:
-	if node_path == NodePath():
-		if event_node.has_method(method):
-			event_node.callv(method, args)
-	else:
-		var node = event_node.get_tree().current_scene.get_node_or_null(node_path)
-		if node != null:
-			node.callv(method, args)
+	var node:Node = get_event_node()
+	
+	if node.has_method(method):
+		node.callv(method, args)
+	
 	finish()
 
-func set_node_path(value:NodePath) -> void:
-	node_path = value
-	emit_changed()
-	property_list_changed_notify()
-	
+
 func set_method(value:String) -> void:
 	method = value
 	emit_changed()
@@ -41,3 +34,12 @@ func set_args(value:Array) -> void:
 	args = value.duplicate()
 	emit_changed()
 	property_list_changed_notify()
+
+
+func _set(property: String, value) -> bool:
+	if property == "node_path":
+		# This exists because node_path property was removed
+		event_node_path = value
+		emit_changed()
+		return true
+	return false

addons/event_system_plugin/core/shortcuts.gd

@@ -1,6 +1,6 @@
 tool
 extends Event
-class_name EventChangeTimeline
+#class_name EventChangeTimeline
 
 export(String, FILE, "*.tres, *.res") var timeline_path:String = "" setget set_timeline_path
 export(int) var start_from_event = 0 setget set_start_event_idx
@@ -14,9 +14,11 @@ func _init() -> void:
 	event_preview_string = "Jump to: [ {timeline_path} ] and start in event #[ {start_from_event} ]"
 	event_category = "Logic"
 	continue_at_end = true
+	push_warning("Event [%s] is deprecated and will be removed in future versions. Use EventGoto instead."%event_name)
 
 
 func _execute() -> void:
+	push_warning("Event [%s] is deprecated and will be removed in future versions. Use EventGoto instead."%event_name)
 
 	if not timeline and timeline_path:
 		timeline = load(timeline_path) as Timeline
@@ -31,7 +33,7 @@ func _execute() -> void:
 		var _discard = _event_queue.pop_front()
 
 	timeline._event_queue = _event_queue
-	event_manager.start_timeline(timeline)
+	get_event_manager_node().start_timeline(timeline)
 
 
 func set_timeline_path(value:String) -> void:

addons/event_system_plugin/events/call.gd

@@ -1,12 +1,11 @@
 tool
 extends Event
-class_name EventCondition
 
 const _Utils = preload("res://addons/event_system_plugin/core/utils.gd")
 
 export(String) var condition:String = "" setget set_condition
-export(Resource) var events_if = Timeline.new()
-export(Resource) var events_else = Timeline.new()
+export(Resource) var events_if = Timeline.new() setget set_if_events
+export(Resource) var events_else = Timeline.new() setget set_else_events
 
 
 func _init() -> void:
@@ -21,41 +20,13 @@ func _init() -> void:
 	events_if = _get_empty_timeline("Timeline IF")
 
 	events_else = _get_empty_timeline("Timeline ELSE")
+	push_warning("Event condition is deprecated and was replaced by a new one. Will be removed in new versions.")
 
 
-func _execute() -> void:
-	# TODO: replace with node variables
-	var variables:Dictionary = {}
-	
-	var evaluated_condition = _Utils.evaluate(condition, event_node, variables)
-	
-	var timeline:Timeline
-	var current_timeline:Timeline = event_manager.timeline
-		
-	if not current_timeline:
-		finish()
-		return
-	
-	if evaluated_condition and (str(evaluated_condition) != condition):
-		timeline = events_if
-	else:
-		timeline = events_else
-	
-	if timeline:
-		var _events:Array = timeline.get_events()
-		for _event in _events:
-			current_timeline._event_queue.push_front(_event)
-	
-	
-	finish()
-
 
 func _get(property: String):
 	if property == "continue_at_end_ignore":
 		return true
-	
-	if property == "custom_event_node":
-		return load("res://addons/event_system_plugin/nodes/editor/event_node/event_condition/event_node.tscn").instance()
 
 
 func set_condition(value:String) -> void:
@@ -65,13 +36,26 @@ func set_condition(value:String) -> void:
 
 
 func set_if_events(value:Timeline) -> void:
+	if events_if.is_connected("changed", self, "timeline_changed"):
+		events_if.disconnect("changed", self, "timeline_changed")
 	events_if = value
+	if not events_if.is_connected("changed", self, "timeline_changed"):
+		events_if.connect("changed", self, "timeline_changed")
 	emit_changed()
 	property_list_changed_notify()
 
 
 func set_else_events(value:Timeline) -> void:
+	if events_else.is_connected("changed", self, "timeline_changed"):
+		events_else.disconnect("changed", self, "timeline_changed")
 	events_else = value
+	if not events_else.is_connected("changed", self, "timeline_changed"):
+		events_else.connect("changed", self, "timeline_changed")
+	emit_changed()
+	property_list_changed_notify()
+
+
+func timeline_changed() -> void:
 	emit_changed()
 	property_list_changed_notify()
 
@@ -95,4 +79,4 @@ func _get_empty_timeline(with_name:String) -> Timeline:
 	var tmln := Timeline.new()
 	if with_name != "":
 		tmln.resource_name = with_name
-	return tmln
+	return tmln