Skip to content

Commit d619697

Browse files
committed
Update PortaitsDisplayer
Changed the way that the property is updated.
1 parent 7f9fcaa commit d619697

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

addons/event_system_plugin/core/event_inspector.gd

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ func parse_category(object: Object, category: String) -> void:
2828

2929

3030
func parse_property(object: Object, type: int, path: String, hint: int, hint_text: String, usage: int) -> bool:
31-
var path_ignore = path+"_ignore"
31+
var path_ignore = str(path)+"_ignore"
32+
if object == null:
33+
return false
34+
3235
if (path_ignore in object):
3336
return true
3437

addons/event_system_plugin/resources/registered_events/registered_events.tres

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_resource type="Resource" load_steps=12 format=2]
1+
[gd_resource type="Resource" load_steps=18 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]
@@ -12,7 +12,12 @@
1212
[ext_resource path="res://addons/event_system_plugin/events/hide.gd" type="Script" id=10]
1313
[ext_resource path="res://addons/event_system_plugin/events/call.gd" type="Script" id=11]
1414
[ext_resource path="res://addons/event_system_plugin/events/call_from.gd" type="Script" id=12]
15+
[ext_resource path="res://addons/textalog/events/dialog/text.gd" type="Script" id=13]
16+
[ext_resource path="res://addons/textalog/events/dialog/choice.gd" type="Script" id=14]
17+
[ext_resource path="res://addons/textalog/events/character/change_expression.gd" type="Script" id=15]
18+
[ext_resource path="res://addons/textalog/events/character/join.gd" type="Script" id=16]
19+
[ext_resource path="res://addons/textalog/events/character/leave.gd" type="Script" id=17]
1520

1621
[resource]
1722
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 ) ]
23+
events = [ ExtResource( 3 ), ExtResource( 5 ), ExtResource( 4 ), ExtResource( 2 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 10 ), ExtResource( 9 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ) ]

addons/textalog/events/.gdignore

Whitespace-only changes.

addons/textalog/events/inspector.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ class PortraitsDisplayer extends EditorProperty:
324324
set_bottom_editor(_vb)
325325

326326

327-
func _ready() -> void:
327+
func update_property() -> void:
328328
var portraits:Array = get_edited_object()[get_edited_property()]
329329
portrait_container.edited_object = get_edited_object()
330330

project.godot

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,12 @@ _global_script_class_icons={
171171
[application]
172172

173173
config/name="Godot-DialogPlugin"
174+
run/low_processor_mode=true
174175
config/icon="res://icon.png"
175176

176177
[editor_plugins]
177178

178-
enabled=PoolStringArray( "res://addons/event_system_plugin/plugin.cfg", "res://addons/textalog/plugin.cfg" )
179+
enabled=PoolStringArray( "res://addons/event_system_plugin/plugin.cfg" )
179180

180181
[importer_defaults]
181182

0 commit comments

Comments
 (0)