Get everything hooked up

Author: jonnydgreen

addons/parley/components/dialogue/dialogue_container.gd

@@ -22,4 +22,4 @@ func _ready() -> void:
 func _render() -> void:
 	if dialogue_text_label:
 		var character: ParleyCharacter = dialogue_node.resolve_character()
-		dialogue_text_label.text = "[b]%s[/b] – %s" % [tr(character.name) if character.name != '' else 'Unknown', dialogue_node.text]
+		dialogue_text_label.text = "[b]%s[/b] – %s" % [tr(character.name if character.name != '' else 'Unknown'), dialogue_node.text]

addons/parley/components/dialogue/dialogue_node_editor.gd

@@ -109,10 +109,6 @@ func _on_character_store_changed() -> void:
 	_render_character_options()
 
 
-func _emit_dialogue_node_changed() -> void:
-	dialogue_node_changed.emit(id, character, dialogue, text_translation_key)
-
-
 func _on_translation_key_editor_key_changed(new_key: String) -> void:
 	text_translation_key = new_key
 	_emit_dialogue_node_changed()
@@ -121,4 +117,8 @@ func _on_translation_key_editor_key_changed(new_key: String) -> void:
 func _on_translation_key_editor_key_generation_requested() -> void:
 	text_translation_key = ParleyUtils.translation.generate_key(dialogue, dialogue_sequence_ast, node_ast, 'text')
 	_emit_dialogue_node_changed()
+
+
+func _emit_dialogue_node_changed() -> void:
+	dialogue_node_changed.emit(id, character, dialogue, text_translation_key)
 #endregion

addons/parley/components/dialogue_option/dialogue_option_node_editor.gd

@@ -8,20 +8,23 @@ class_name ParleyDialogueOptionNodeEditor extends ParleyBaseNodeEditor
 var character_store: ParleyCharacterStore: set = _set_character_store
 @export var character: String = "": set = _set_character
 @export var option: String = "": set = _set_option
+@export var text_translation_key: String = "": set = _set_text_translation_key
 
 
 @onready var character_selector: OptionButton = %CharacterSelector
 @onready var option_editor: TextEdit = %OptionEditor
+@onready var text_translation_key_editor: ParleyTranslationKeyEditor = %TranslationKeyEditor
 
 
-signal dialogue_option_node_changed(id: String, character: String, option: String)
+signal dialogue_option_node_changed(id: String, character: String, option: String, text_translation_key: String)
 #endregion
 
 
 #region LIFECYCLE
 func _ready() -> void:
 	set_title()
 	_render_option()
+	_render_text_translation_key_editor(true)
 	_render_character_options()
 	if character_store:
 		ParleyUtils.signals.safe_connect(character_store.changed, _on_character_store_changed)
@@ -48,6 +51,11 @@ func _set_option(new_option: String) -> void:
 func _set_character(new_character: String) -> void:
 	character = new_character
 	_render_character()
+
+
+func _set_text_translation_key(new_text_translation_key: String) -> void:
+	text_translation_key = new_text_translation_key
+	_render_text_translation_key_editor()
 #endregion
 
 
@@ -57,6 +65,14 @@ func _render_option() -> void:
 		option_editor.text = option
 
 
+func _render_text_translation_key_editor(on_ready: bool = false) -> void:
+	if text_translation_key_editor:
+		if text_translation_key_editor.key != text_translation_key:
+			text_translation_key_editor.key = text_translation_key
+		if on_ready:
+			text_translation_key_editor.label = &"Text Translation Key: "
+
+
 func _render_character_options() -> void:
 	if not character_selector:
 		return
@@ -89,10 +105,20 @@ func _on_character_selector_item_selected(index: int) -> void:
 		emit_dialogue_option_node_changed()
 
 
+func _on_translation_key_editor_key_changed(new_key: String) -> void:
+	text_translation_key = new_key
+	emit_dialogue_option_node_changed()
+
+
+func _on_translation_key_editor_key_generation_requested() -> void:
+	text_translation_key = ParleyUtils.translation.generate_key(option, dialogue_sequence_ast, node_ast, 'text')
+	emit_dialogue_option_node_changed()
+
+
 func _on_character_store_changed() -> void:
 	_render_character_options()
 
 
 func emit_dialogue_option_node_changed() -> void:
-	dialogue_option_node_changed.emit(id, character, option)
+	dialogue_option_node_changed.emit(id, character, option, text_translation_key)
 #endregion

addons/parley/components/dialogue_option/dialogue_option_node_editor.tscn

@@ -1,12 +1,14 @@
-[gd_scene load_steps=3 format=3 uid="uid://cnq1fogoewemd"]
+[gd_scene load_steps=4 format=3 uid="uid://cnq1fogoewemd"]
 
 [ext_resource type="Script" uid="uid://dy0x43s04n867" path="res://addons/parley/components/dialogue_option/dialogue_option_node_editor.gd" id="1_3b5a7"]
 [ext_resource type="PackedScene" uid="uid://m3v11vm16l8y" path="res://addons/parley/components/node/node_editor.tscn" id="1_acvks"]
+[ext_resource type="PackedScene" uid="uid://n4t3w6dhkt6a" path="res://addons/parley/components/editor/translation_key.tscn" id="3_yrbg7"]
 
 [node name="DialogueOptionNodeEditor" instance=ExtResource("1_acvks")]
 script = ExtResource("1_3b5a7")
 character = ""
 option = ""
+text_translation_key = ""
 type = 1
 
 [node name="TitleLabel" parent="TitleContainer/TitlePanelContainer/TitleMarginContainer/TitlePartsContainer" index="0"]
@@ -43,5 +45,11 @@ size_flags_vertical = 3
 placeholder_text = "Dialogue goes here.."
 wrap_mode = 1
 
+[node name="TranslationKeyEditor" parent="BodyMarginContainer/BodyScrollContainer/BodyContainer" index="2" instance=ExtResource("3_yrbg7")]
+unique_name_in_owner = true
+layout_mode = 2
+
 [connection signal="item_selected" from="BodyMarginContainer/BodyScrollContainer/BodyContainer/CharacterContainer/CharacterSelector" to="." method="_on_character_selector_item_selected"]
 [connection signal="text_changed" from="BodyMarginContainer/BodyScrollContainer/BodyContainer/VBoxContainer/OptionEditor" to="." method="_on_code_edit_text_changed"]
+[connection signal="key_changed" from="BodyMarginContainer/BodyScrollContainer/BodyContainer/TranslationKeyEditor" to="." method="_on_translation_key_editor_key_changed"]
+[connection signal="key_generation_requested" from="BodyMarginContainer/BodyScrollContainer/BodyContainer/TranslationKeyEditor" to="." method="_on_translation_key_editor_key_generation_requested"]

addons/parley/main_panel.gd

@@ -155,10 +155,10 @@ func _set_node_ast(new_node_ast: ParleyNodeAst) -> void:
 	match new_node_ast.type:
 		ParleyDialogueSequenceAst.Type.DIALOGUE:
 			var dialogue_node_ast: ParleyDialogueNodeAst = new_node_ast
-			_on_dialogue_node_editor_dialogue_node_changed(dialogue_node_ast.id, dialogue_node_ast.character, dialogue_node_ast.text)
+			_on_dialogue_node_editor_dialogue_node_changed(dialogue_node_ast.id, dialogue_node_ast.character, dialogue_node_ast.text, dialogue_node_ast.text_translation_key)
 		ParleyDialogueSequenceAst.Type.DIALOGUE_OPTION:
 			var dialogue_option_node_ast: ParleyDialogueOptionNodeAst = new_node_ast
-			_on_dialogue_option_node_editor_dialogue_option_node_changed(dialogue_option_node_ast.id, dialogue_option_node_ast.character, dialogue_option_node_ast.text)
+			_on_dialogue_option_node_editor_dialogue_option_node_changed(dialogue_option_node_ast.id, dialogue_option_node_ast.character, dialogue_option_node_ast.text, dialogue_option_node_ast.text_translation_key)
 		ParleyDialogueSequenceAst.Type.CONDITION:
 			var condition_node_ast: ParleyConditionNodeAst = new_node_ast
 			_on_condition_node_editor_condition_node_changed(condition_node_ast.id, condition_node_ast.description, condition_node_ast.combiner, condition_node_ast.conditions)
@@ -425,7 +425,7 @@ func _on_graph_view_scroll_offset_changed(offset: Vector2) -> void:
 
 
 # TODO: remove ast stuff
-func _on_dialogue_node_editor_dialogue_node_changed(id: String, new_character: String, new_dialogue_text: String) -> void:
+func _on_dialogue_node_editor_dialogue_node_changed(id: String, new_character: String, new_dialogue_text: String, new_text_translation_key: String) -> void:
 	if not dialogue_ast:
 		return
 	var _ast_node: ParleyNodeAst = dialogue_ast.find_node_by_id(id)
@@ -434,7 +434,7 @@ func _on_dialogue_node_editor_dialogue_node_changed(id: String, new_character: S
 		return
 	if _ast_node is ParleyDialogueNodeAst:
 		var ast_node: ParleyDialogueNodeAst = _ast_node
-		ast_node.update(new_character, new_dialogue_text)
+		ast_node.update(new_character, new_dialogue_text, new_text_translation_key)
 	# TODO: move into graph view
 	if _selected_node is ParleyDialogueNode:
 		var selected_node: ParleyDialogueNode = _selected_node
@@ -443,7 +443,7 @@ func _on_dialogue_node_editor_dialogue_node_changed(id: String, new_character: S
 
 
 # TODO: remove ast stuff
-func _on_dialogue_option_node_editor_dialogue_option_node_changed(id: String, new_character: String, new_option_text: String) -> void:
+func _on_dialogue_option_node_editor_dialogue_option_node_changed(id: String, new_character: String, new_option_text: String, new_text_translation_key: String) -> void:
 	if not dialogue_ast:
 		return
 	var _ast_node: ParleyNodeAst = dialogue_ast.find_node_by_id(id)
@@ -452,7 +452,7 @@ func _on_dialogue_option_node_editor_dialogue_option_node_changed(id: String, ne
 		return
 	if _ast_node is ParleyDialogueOptionNodeAst:
 		var ast_node: ParleyDialogueOptionNodeAst = _ast_node
-		ast_node.update(new_character, new_option_text)
+		ast_node.update(new_character, new_option_text, new_text_translation_key)
 	# TODO: move into graph view
 	if _selected_node is ParleyDialogueOptionNode:
 		var selected_node: ParleyDialogueOptionNode = _selected_node

addons/parley/models/dialogue_node_ast.gd

@@ -22,23 +22,26 @@ class_name ParleyDialogueNodeAst extends ParleyNodeAst
 ## Create a new instance of a Dialogue Node AST.
 ## Example: ParleyDialogueNodeAst.new("1", Vector2.ZERO, "Alice", "I need some coffee.")
 func _init(
-	_id: String = "",
-	_position: Vector2 = Vector2.ZERO,
-	_character: String = "",
-	_text: String = ""
+	p_id: String = "",
+	p_position: Vector2 = Vector2.ZERO,
+	p_character: String = "",
+	p_text: String = "",
+	p_text_translation_key: String = ""
 ) -> void:
 	type = ParleyDialogueSequenceAst.Type.DIALOGUE
-	id = _id
-	position = _position
-	character = _character
-	text = _text
+	id = p_id
+	position = p_position
+	character = p_character
+	text = p_text
+	text_translation_key = p_text_translation_key
 
 
 ## Update a Dialogue Node AST.
 ## Example: node.update("Alice", "I need some coffee.")
-func update(_character: String, _text: String) -> void:
-	character = _character
-	text = _text
+func update(p_character: String, p_text: String, p_text_translation_key: String) -> void:
+	character = p_character
+	text = p_text
+	text_translation_key = p_text_translation_key
 
 
 static func get_colour() -> Color:
@@ -51,7 +54,8 @@ func to_resolved(resolved_text: String) -> ParleyDialogueNodeAst:
 		id,
 		position,
 		character,
-		resolved_text
+		resolved_text,
+		text_translation_key
 	)
 
 

addons/parley/models/dialogue_option_node_ast.gd

@@ -25,20 +25,23 @@ func _init(
 	p_id: String = "",
 	p_position: Vector2 = Vector2.ZERO,
 	p_character: String = "",
-	p_text: String = ""
+	p_text: String = "",
+	p_text_translation_key: String = ""
 ) -> void:
 	type = ParleyDialogueSequenceAst.Type.DIALOGUE_OPTION
 	id = p_id
 	position = p_position
 	character = p_character
 	text = p_text
+	text_translation_key = p_text_translation_key
 
 
 ## Update a Dialogue Option Node AST.
 ## Example: node.update("Alice", "Slurp some coffee.")
-func update(p_character: String, p_text: String) -> void:
+func update(p_character: String, p_text: String, p_text_translation_key: String) -> void:
 	character = p_character
 	text = p_text
+	text_translation_key = p_text_translation_key
 
 
 static func get_colour() -> Color:
@@ -51,7 +54,8 @@ func to_resolved(resolved_text: String) -> ParleyDialogueOptionNodeAst:
 		id,
 		position,
 		character,
-		resolved_text
+		resolved_text,
+		text_translation_key
 	)
 
 

addons/parley/models/dialogue_sequence_ast.gd

@@ -74,11 +74,13 @@ func add_ast_node(node: Dictionary) -> void:
 		Type.DIALOGUE:
 			var character: String = node.get('character', '')
 			var text: String = node.get('text', '')
-			ast_node = ParleyDialogueNodeAst.new(id, position, character, text)
+			var text_translation_key: String = node.get('text_translation_key', '')
+			ast_node = ParleyDialogueNodeAst.new(id, position, character, text, text_translation_key)
 		Type.DIALOGUE_OPTION:
 			var character: String = node.get('character', '')
 			var text: String = node.get('text', '')
-			ast_node = ParleyDialogueOptionNodeAst.new(id, position, character, text)
+			var text_translation_key: String = node.get('text_translation_key', '')
+			ast_node = ParleyDialogueOptionNodeAst.new(id, position, character, text, text_translation_key)
 		Type.CONDITION:
 			var combiner: ParleyConditionNodeAst.Combiner = ParleyConditionNodeAst.Combiner.get(node.get('combiner'), ParleyConditionNodeAst.Combiner.ALL)
 			var description: String = node.get('description', '')

addons/parley/views/parley_node.gd

@@ -112,6 +112,7 @@ func _render_dialogue_option_node_editor() -> void:
 	dialogue_option_node_editor.id = dialogue_option_node_ast.id
 	dialogue_option_node_editor.character = dialogue_option_node_ast.character
 	dialogue_option_node_editor.option = dialogue_option_node_ast.text
+	dialogue_option_node_editor.text_translation_key = dialogue_option_node_ast.text_translation_key
 	ParleyUtils.signals.safe_connect(dialogue_option_node_editor.dialogue_option_node_changed, _on_dialogue_option_node_editor_dialogue_option_node_changed)
 	ParleyUtils.signals.safe_connect(dialogue_option_node_editor.delete_node_button_pressed, _on_delete_node_button_pressed)
 	node_editor_container.add_child(dialogue_option_node_editor)
@@ -267,11 +268,12 @@ func _on_delete_node_button_pressed(id: String) -> void:
 	delete_node_button_pressed.emit(id)
 
 
-func _on_dialogue_option_node_editor_dialogue_option_node_changed(_id: String, character: String, option: String) -> void:
+func _on_dialogue_option_node_editor_dialogue_option_node_changed(_id: String, character: String, option: String, text_translation_key: String) -> void:
 	# TODO: we should probably just update the resource here - it would make things way easier!
 	var new_node_ast: ParleyDialogueOptionNodeAst = node_ast.duplicate(true)
 	new_node_ast.character = character
 	new_node_ast.text = option
+	new_node_ast.text_translation_key = text_translation_key
 	node_changed.emit(new_node_ast)