Skip to content

Commit 38193d7

Browse files
committed
Dialogic 1.5 last minute fixes
Fixed Boolean logic in update character scene for custom portraits Added a couple missing portrait changed triggers
1 parent 162de97 commit 38193d7

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

addons/dialogic/Nodes/DialogNode.gd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,7 @@ func event_handler(event: Dictionary):
722722
# z_index
723723
$Portraits.move_child(p, get_portrait_z_index_point(event.get('z_index', 0)))
724724
p.z_index = event.get('z_index', 0)
725+
emit_signal("portrait_changed", p)
725726

726727
if (p.get('custom_instance') != null or event.get('animation_wait', false)) and !(event.get('animation', '[No Animation]') in safeAnimations):
727728
yield(p, 'animation_finished')
@@ -773,8 +774,9 @@ func event_handler(event: Dictionary):
773774
event = insert_animation_data(event, 'join', 'fade_in_up.gd')
774775

775776
portrait.animate(event.get('animation', '[No Animation]'), event.get('animation_length', 1), event.get('animation_repeat', 1))
777+
emit_signal("portrait_changed", portrait)
776778

777-
if portrait.get('custom_instance') != null or (event.get('animation_wait', false) and event.get('animation', '[No Animation]') != "[No Animation]"):
779+
if (portrait.get('custom_instance') != null or event.get('animation_wait', false) == true) and event.get('animation', '[No Animation]') != "[No Animation]":
778780
yield(portrait, 'animation_finished')
779781
set_state(state.READY)
780782
_load_next_event()

0 commit comments

Comments
 (0)