maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-20 01:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated dialogic

Browse source
This commit is contained in:
MaddoScientisto 2026-01-05 16:00:41 +01:00
commit cbb82512ee
483 changed files with 5743 additions and 2177 deletions
Download patch file Download diff file Expand all files Collapse all files

29
addons/dialogic/Modules/Character/event_character.gd
View file

@ -82,14 +82,14 @@ var character_identifier: String:
if character_identifier == '--All--':
return '--All--'
if character:
var identifier := DialogicResourceUtil.get_unique_identifier(character.resource_path)
var identifier := character.get_identifier()
if not identifier.is_empty():
return identifier
return character_identifier
set(value):
character_identifier = value
character = DialogicResourceUtil.get_character_resource(value)
if character and not character.portraits.has(portrait):
if (not character) or (character and not character.portraits.has(portrait)):
portrait = ""
ui_update_needed.emit()
@ -154,10 +154,10 @@ func _execute() -> void:
finish()
return
dialogic.Portraits.change_character_extradata(character, extra_data)
if set_portrait:
dialogic.Portraits.change_character_portrait(character, portrait, fade_animation, fade_length)
await dialogic.Portraits.change_character_portrait(character, portrait, fade_animation, fade_length)
dialogic.Portraits.change_character_extradata(character, extra_data)
if set_mirrored:
dialogic.Portraits.change_character_mirror(character, mirrored)
@ -225,7 +225,7 @@ func to_text() -> String:
if action == Actions.LEAVE and character_identifier == '--All--':
result_string += "--All--"
elif character:
var name := DialogicResourceUtil.get_unique_identifier(character.resource_path)
var name := character.get_character_name()
if name.count(" ") > 0:
name = '"' + name + '"'
@ -302,7 +302,7 @@ func get_shortcode_parameters() -> Dictionary:
{'value':Actions.JOIN},
'Leave':{'value':Actions.LEAVE},
'Update':{'value':Actions.UPDATE}}},
"character" : {"property": "character_identifier", "default": "", "custom_stored":true,},
"character" : {"property": "character_identifier", "default": "", "custom_stored":true, "ext_file":true},
"portrait" : {"property": "portrait", "default": "", "custom_stored":true,},
"transform" : {"property": "transform", "default": "center", "custom_stored":true,},
@ -478,8 +478,8 @@ func get_fade_suggestions(search_text:String='') -> Dictionary:
func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:String, _word:String, symbol:String) -> void:
var line_until_caret: String = CodeCompletionHelper.get_line_untill_caret(line)
if symbol == ' ' and line_until_caret.count(' ') == 1:
CodeCompletionHelper.suggest_characters(TextNode, CodeEdit.KIND_MEMBER)
if symbol == ' ' and line_until_caret.count(" ") == 1:
CodeCompletionHelper.suggest_characters(TextNode, CodeEdit.KIND_MEMBER, self)
if line.begins_with('leave'):
TextNode.add_code_completion_option(CodeEdit.KIND_MEMBER, 'All', '--All-- ', event_color, TextNode.get_theme_icon("GuiEllipsis", "EditorIcons"))
@ -487,10 +487,11 @@ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:Str
var completion_character := regex.search(line).get_string('name')
CodeCompletionHelper.suggest_portraits(TextNode, completion_character)
elif not '[' in line_until_caret and symbol == ' ':
elif not '[' in line_until_caret and symbol == ' ' and line_until_caret.split(" ", false).size() > 1:
if not line.begins_with("leave"):
for position in get_position_suggestions():
TextNode.add_code_completion_option(CodeEdit.KIND_MEMBER, position, position+' ', TextNode.syntax_highlighter.normal_color)
if not line_until_caret.split(" ", false)[-1] in get_position_suggestions():
for position in get_position_suggestions():
TextNode.add_code_completion_option(CodeEdit.KIND_MEMBER, position, position+' ', TextNode.syntax_highlighter.normal_color)
# Shortcode Part
if '[' in line_until_caret:
@ -504,8 +505,10 @@ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:Str
if line.begins_with('update'):
suggest_parameter("repeat", line, TextNode)
if line.begins_with("update"):
for param in ["move_time", "move_trans", "move_ease"]:
for param in ["move_time", "move_trans", "move_ease", "fade"]:
suggest_parameter(param, line, TextNode)
if "fade=" in line_until_caret:
suggest_parameter("fade_length", line, TextNode)
if not line.begins_with('leave'):
for param in ["mirrored", "z_index", "extra_data"]:
suggest_parameter(param, line, TextNode)