Skip to content

Commit 2779321

Browse files
committed
Make EventCallFrom default EventCall event.
This commit deprecates EventCall, replacing it with EventCallFrom. It'll use event_node if the nodepath is empty. Fix #22
1 parent ffd33b3 commit 2779321

File tree

3 files changed

+15
-19
lines changed

3 files changed

+15
-19
lines changed

events/call.gd

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
tool
2-
extends Event
3-
class_name EventCall
4-
5-
export(String) var method:String = "" setget set_method
6-
export(Array) var args:Array = []
2+
extends "res://addons/event_system_plugin/events/call_from.gd"
73

84
func _init() -> void:
95
event_color = Color("EB5E55")
106
event_name = "Call"
117
event_category = "Node"
128
event_icon = load("res://addons/event_system_plugin/assets/icons/event_icons/call.png") as Texture
139
event_preview_string = "{method} ( {args} ) "
10+
node_path = NodePath()
1411

1512
args = []
16-
17-
18-
func _execute() -> void:
19-
event_node.callv(method, args)
20-
finish()
13+
push_warning("Call event is deprecated. Will be removed in future versions. Consider using EventCallFrom")
2114

2215

2316
func set_method(value:String) -> void:

events/call_from.gd

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
tool
22
extends Event
3-
class_name EventCallFrom
3+
class_name EventCall
44

55
export(NodePath) var node_path:NodePath setget set_node_path
66
export(String) var method:String = "" setget set_method
77
export(Array) var args:Array = []
88

99
func _init() -> void:
10-
event_color = Color("5AA0EB")
11-
event_name = "Call From"
10+
event_color = Color("EB5E55")
11+
event_name = "Call"
1212
event_category = "Node"
1313
event_icon = load("res://addons/event_system_plugin/assets/icons/event_icons/call.png") as Texture
1414
event_preview_string = "{node_path} {method} ( {args} ) "
@@ -17,9 +17,13 @@ func _init() -> void:
1717

1818

1919
func _execute() -> void:
20-
var node = event_node.get_tree().current_scene.get_node_or_null(node_path)
21-
if node != null:
22-
node.callv(method, args)
20+
if node_path == NodePath():
21+
if event_node.has_method(method):
22+
event_node.callv(method, args)
23+
else:
24+
var node = event_node.get_tree().current_scene.get_node_or_null(node_path)
25+
if node != null:
26+
node.callv(method, args)
2327
finish()
2428

2529
func set_node_path(value:NodePath) -> void:

resources/registered_events/registered_events.tres

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_resource type="Resource" load_steps=13 format=2]
1+
[gd_resource type="Resource" load_steps=12 format=2]
22

33
[ext_resource path="res://addons/event_system_plugin/resources/registered_events/_.gd" type="Script" id=1]
44
[ext_resource path="res://addons/event_system_plugin/events/comment.gd" type="Script" id=2]
@@ -10,9 +10,8 @@
1010
[ext_resource path="res://addons/event_system_plugin/events/condition.gd" type="Script" id=8]
1111
[ext_resource path="res://addons/event_system_plugin/events/show.gd" type="Script" id=9]
1212
[ext_resource path="res://addons/event_system_plugin/events/hide.gd" type="Script" id=10]
13-
[ext_resource path="res://addons/event_system_plugin/events/call.gd" type="Script" id=11]
1413
[ext_resource path="res://addons/event_system_plugin/events/call_from.gd" type="Script" id=12]
1514

1615
[resource]
1716
script = ExtResource( 1 )
18-
events = [ ExtResource( 3 ), ExtResource( 5 ), ExtResource( 4 ), ExtResource( 2 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 10 ), ExtResource( 9 ), ExtResource( 11 ), ExtResource( 12 ) ]
17+
events = [ ExtResource( 3 ), ExtResource( 5 ), ExtResource( 4 ), ExtResource( 2 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 10 ), ExtResource( 9 ), ExtResource( 12 ) ]

0 commit comments

Comments
 (0)