Skip to content

Commit 68b2aae

Browse files
committed
Make event set extends from EventCallFrom.
This commit makes that events `hide`, `set` and `show` to extends from `EventCallFrom`, allowing using an absolute node path to set values. Fix #21
1 parent 2779321 commit 68b2aae

File tree

3 files changed

+27
-14
lines changed

3 files changed

+27
-14
lines changed

events/hide.gd

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
tool
2-
extends Event
2+
extends "res://addons/event_system_plugin/events/call_from.gd"
33
class_name EventHide
44

55
func _init() -> void:
66
event_color = Color("EB5E55")
77
event_name = "Hide"
88
event_category = "Node"
99
event_icon = load("res://addons/event_system_plugin/assets/icons/event_icons/hidden.png") as Texture
10+
method = "set"
11+
args = ["visible", false]
12+
event_preview_string = "{node_path}"
1013

1114

12-
func _execute() -> void:
13-
event_node.set("visible", false)
14-
finish()
15+
func _get(property: String):
16+
if property == "method_ignore":
17+
return true
18+
if property == "args_ignore":
19+
return true

events/set.gd

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tool
2-
extends Event
2+
extends "res://addons/event_system_plugin/events/call_from.gd"
33
class_name EventSet
44

55
export(String) var variable_name:String = "" setget set_var_name
@@ -12,25 +12,28 @@ func _init() -> void:
1212
event_icon = load("res://addons/event_system_plugin/assets/icons/event_icons/set_variable.png") as Texture
1313
event_preview_string = "Set [ {variable_name} ] to be [ {variable_value} ]"
1414
continue_at_end = true
15-
16-
17-
func _execute() -> void:
18-
event_node.set(variable_name, variable_value)
19-
finish()
15+
method = "set"
16+
args = ["",""]
2017

2118

2219
func set_var_name(value:String) -> void:
2320
variable_name = value
21+
args[0] = variable_name
2422
emit_changed()
2523
property_list_changed_notify()
2624

2725

2826
func set_var_value(value:String) -> void:
2927
variable_value = value
28+
args[1] = variable_value
3029
emit_changed()
3130
property_list_changed_notify()
3231

3332

3433
func _get(property: String):
3534
if property == "continue_at_end_ignore":
3635
return true
36+
if property == "method_ignore":
37+
return true
38+
if property == "args_ignore":
39+
return true

events/show.gd

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
tool
2-
extends Event
2+
extends "res://addons/event_system_plugin/events/call_from.gd"
33
class_name EventShow
44

55
func _init() -> void:
66
event_color = Color("EB5E55")
77
event_name = "Show"
88
event_category = "Node"
99
event_icon = load("res://addons/event_system_plugin/assets/icons/event_icons/visible.png") as Texture
10+
method = "set"
11+
args = ["visible", true]
12+
event_preview_string = "{node_path}"
1013

1114

12-
func _execute() -> void:
13-
event_node.set("visible", true)
14-
finish()
15+
func _get(property: String):
16+
if property == "method_ignore":
17+
return true
18+
if property == "args_ignore":
19+
return true

0 commit comments

Comments
 (0)