@@ -294,7 +294,6 @@ func _ready() -> void:
294294 n ['audio_pickers' ][name ].connect ('data_updated' , self , '_on_audio_data_updated' )
295295
296296 # Character Picker
297- character_picker_update ()
298297 n ['character_picker' ].connect ('item_selected' , self , 'character_picker_selected' )
299298
300299 ## Translation
@@ -312,16 +311,28 @@ func _ready() -> void:
312311
313312
314313func character_picker_update ():
314+ n ['character_picker' ].clear ()
315315 n ['character_picker' ].add_item ('Random Character' )
316316 n ['character_picker' ].set_item_metadata (0 , 'random' )
317317
318318 var characters : Array = DialogicUtil .get_character_list ()
319- var index = 1
319+ var character_array = []
320320 for c in characters :
321+ if c ['data' ]['theme' ] == '' :
322+ character_array .append (c )
323+ elif c ['data' ]['theme' ] == current_theme :
324+ character_array .append (c )
325+ else :
326+ pass
327+
328+ var index = 1
329+ for c in character_array :
321330 n ['character_picker' ].add_item (c ['name' ])
322331 n ['character_picker' ].set_item_metadata (index , c ['file' ])
323332 index += 1
324333
334+
335+
325336
326337func character_picker_selected (index ):
327338 preview_character_selected = n ['character_picker' ].get_item_metadata (index )
@@ -332,6 +343,7 @@ func character_picker_selected(index):
332343func load_theme (filename ):
333344 loading = true
334345 current_theme = filename
346+ character_picker_update ()
335347 var theme = DialogicResources .get_theme_config (filename )
336348 var default_background = 'res://addons/dialogic/Example Assets/backgrounds/background-2.png'
337349 # Settings
@@ -565,16 +577,11 @@ func _on_PreviewButton_pressed() -> void:
565577 if n ['character_picker' ].text == 'Random Character' :
566578 var characters : Array = DialogicUtil .get_character_list ()
567579 var character_array = []
568- # var index = 0
569- # print(current_theme)
570580 for c in characters :
571- # if c['data']['theme'] == current_theme:
581+ if c ['data' ]['theme' ] == '' :
582+ character_array .append (c )
583+ elif c ['data' ]['theme' ] == current_theme :
572584 character_array .append (c )
573- # print('Tiene!')
574- # else:
575- # print('NOOO')
576- # print(c)
577- # index += 1
578585
579586 if character_array .size ():
580587 character_array .shuffle ()
0 commit comments