Added world character behaviours and dialogues

.gitignore

@@ -25,3 +25,6 @@ build/
 
 # Affinity-specific ignores
 *~lock~
+
+# Local design files
+designs/

addons/datatable/scripts/datatable_editor.gd

@@ -174,21 +174,26 @@ func populate_row(index: int, key):
 			if DatatableUtils.validate_datatable_keys(current_dt):
 				ResourceSaver.save(current_dt)
 		refresh_table()
-	var key_props = {"type": current_dt.key_type, "hint": PROPERTY_HINT_NONE, "hint_string": ""}
+	var key_props = {"type": current_dt.key_type, "hint": PROPERTY_HINT_NONE, "hint_string": "", "row": key}
 	var field_control = build_field_control(key, key_props, key_setter_callback, true)
 	grid_container.add_child(field_control)
 
 	for property in row_properties:
 		var setter_callback = func(new_value):
 			row.set(property.name, new_value)
 			ResourceSaver.save(current_dt)
+		property["row"] = key
 		field_control = build_field_control(row.get(property.name), property, setter_callback, false)
 		grid_container.add_child(field_control)
 
 	var menu_btn = MenuButton.new()
 	menu_btn.get_popup().add_item("Delete", 0)
+	menu_btn.get_popup().add_item("Edit", 1)
 	menu_btn.icon = get_theme_icon("GuiTabMenuHl", "EditorIcons")
-	var on_pressed = func(id): if id == 0: on_delete_btn_pressed(key)
+	var on_pressed = func(id):
+		match (id):
+			0: on_delete_btn_pressed(key)
+			1: on_edit_btn_pressed(key)
 	menu_btn.get_popup().id_pressed.connect(on_pressed)
 	grid_container.add_child(menu_btn)
 
@@ -335,6 +340,7 @@ func build_field_control(value: Variant, property: Dictionary, setter_callback:
 		TYPE_ARRAY:
 			field_control = VBoxContainer.new()
 			var properties = DatatableUtils.get_properties_by_hint_string(property.hint_string)
+			properties.row = property.row
 
 			for index in len(value):
 				var item = value[index]
@@ -366,6 +372,10 @@ func build_field_control(value: Variant, property: Dictionary, setter_callback:
 			add_item_btn.button_down.connect(add_item)
 			add_item_btn.icon = get_theme_icon("New", "EditorIcons")
 			field_control.add_child(add_item_btn)
+		TYPE_DICTIONARY:
+			field_control = Button.new()
+			field_control.text = "%d %s" % [value.size(), "entry" if value.size() == 1 else "entries"]
+			field_control.pressed.connect(func(): on_edit_btn_pressed(property.row))
 		_:
 			field_control = Label.new()
 			field_control.size_flags_horizontal = Control.SIZE_EXPAND_FILL
@@ -402,6 +412,10 @@ func on_delete_btn_pressed(row):
 	ResourceSaver.save(current_dt)
 	refresh_table()
 
+func on_edit_btn_pressed(row):
+	var row_data = current_dt.data[row]
+	EditorInterface.get_inspector().resource_selected.emit(row_data, row_data.resource_path)
+
 func on_new_dt_btn_pressed():
 	var editor = EditorInterface.get_editor_main_screen()
 

addons/dialogue/example/example_dialogue.json

@@ -75,37 +75,39 @@
 	},
 	"example_line_04": {
 		"lines": [
+			{
+				"condition": "false",
+				"speaker_id": "estragon",
+				"text": "THIS SHOULD NOT RUN",
+			},
 			{
 				"speaker_id": "estragon",
 				"text": "Me too.",
-				"next": "example_line_06"
 			},
-		],
-	},
-	"example_line_05": {
-		"lines": [
 			{
+				"condition": "not ctx.state.looped",
 				"speaker_id": "vladimir",
-				"text": "LINE!",
-				"next": "example_line_08"
+				"text": "Together again at last! We'll have to celebrate this. But how?",
 			},
-		],
-	},
-	"example_line_06": {
-		"lines": [
 			{
+				"condition": "ctx.state.looped",
 				"speaker_id": "vladimir",
-				"text": "Together again at last! We'll have to celebrate this. But how?",
-				"next": "example_line_06b"
+				"text": "Give me a hug!",
+				"next": "example_line_07"
+			},
+			{
+				"speaker_id": "vladimir",
+				"text": "Get up till I embrace you.",
+				"next": "example_line_07"
 			},
 		],
 	},
-	"example_line_06b": {
+	"example_line_05": {
 		"lines": [
 			{
 				"speaker_id": "vladimir",
-				"text": "Get up till I embrace you.",
-				"next": "example_line_07"
+				"text": "LINE!",
+				"next": "example_line_08"
 			},
 		],
 	},
@@ -194,6 +196,10 @@
 				"speaker_id": "vladimir",
 				"text": "I think let's end it here for today...",
 			},
+			{
+				"speaker_id": "estragon",
+				"text": "Very well",
+			},
 		],
 	},
 }

addons/dialogue/scripts/dialogue_script.gd

@@ -16,6 +16,7 @@ signal advanced_with_option(option_id: int)
 var file_path: String
 var segments: Dictionary = {}
 var current_segment_id: StringName
+var current_line_idx: int
 var context_object: Variant
 
 func _init(file: String):
@@ -43,9 +44,9 @@ func progress_segment():
 		return
 	match(get_segment_type(current_segment)):
 		DialogueScriptSegmentType.LINE:
-			var line = find_first_valid_line(current_segment.lines)
+			var line = find_next_valid_line(current_segment.lines)
 			if not line:
-				push_warning("Failed to find valid line at \"", current_segment_id, "\"")
+				end()
 				return
 			var execution = line.get("execution", null)
 			if execution:
@@ -56,7 +57,12 @@ func progress_segment():
 			if formatting:
 				substitute_format_values(formatting)
 				line.processed_text = line.processed_text.format(formatting)
-			current_segment_id = line.get("next", StringName())
+			if line.has("next"):
+				current_segment_id = line.next
+				current_line_idx = 0
+			else:
+				current_line_idx += 1
+
 			execute_line(line)
 		DialogueScriptSegmentType.OPTION:
 			var valid_options = find_all_valid_options(current_segment.options)
@@ -74,6 +80,9 @@ func progress_segment():
 				if formatting:
 					substitute_format_values(formatting)
 					line.processed_text = line.processed_text.format(formatting)
+				var execution = line.get("execution", null)
+				if execution:
+					run_execution(execution)
 			execute_options(valid_options, line)
 		DialogueScriptSegmentType.UNKNOWN:
 			push_warning("Encountered unknown segment type at \"", current_segment_id, "\"")
@@ -99,6 +108,15 @@ func find_first_valid_line(lines):
 		if not condition or is_condition_valid(condition):
 			return line
 	return null
+
+func find_next_valid_line(lines):
+	for idx in range(current_line_idx, len(lines)):
+		var line = lines[idx]
+		var condition = line.get("condition", null)
+		if not condition or is_condition_valid(condition):
+			current_line_idx = idx
+			return line
+	return null
 
 func find_all_valid_options(options):
 	var valid_options: Dictionary
@@ -143,6 +161,7 @@ func process_text(segment):
 func start() -> bool:
 	if is_active(): return false 
 	current_segment_id = get_intial_segment_id()
+	current_line_idx = 0
 	if not current_segment_id:
 		push_error("Dialogue Error: failed to find intial segment ID for script \"", file_path, "\"")
 		return false
@@ -152,6 +171,7 @@ func start() -> bool:
 
 func end() -> bool:
 	current_segment_id = StringName()
+	current_line_idx = 0
 	ended.emit()
 	return true
 
@@ -167,8 +187,8 @@ func advance():
 
 func advance_with_option(option_id: int):
 	if select_option(option_id):
-		progress_segment()
 		advanced_with_option.emit(option_id)
+		progress_segment()
 
 func is_active() -> bool:
 	return not current_segment_id.is_empty()

addons/dialogue/scripts/dialogue_validator.gd

@@ -47,6 +47,7 @@ const valid_option_line_fields: Array[String] = [
 	"text",
 	"formatting",
 	"data",
+	"execution",
 	"dev_comment",
 ]