Fix to choice right after condition

Author: Jowan-Spooner

addons/dialogic/Core/DialogicGameHandler.gd

@@ -210,6 +210,8 @@ func start_timeline(timeline:Variant, label_or_idx:Variant = "") -> void:
 
 	current_timeline = timeline
 	current_timeline_events = current_timeline.events
+	for event in current_timeline_events:
+		event.dialogic = self
 	current_event_idx = -1
 
 	if typeof(label_or_idx) == TYPE_STRING:

addons/dialogic/Modules/Choice/subsystem_choices.gd

@@ -258,7 +258,7 @@ func is_question(index:int) -> bool:
 
 	if dialogic.current_timeline_events[index] is DialogicChoiceEvent:
 		if index != 0 and dialogic.current_timeline_events[index-1] is DialogicEndBranchEvent:
-			if dialogic.current_timeline_events[dialogic.current_timeline_events[index-1].find_opening_index()] is DialogicChoiceEvent:
+			if dialogic.current_timeline_events[dialogic.current_timeline_events[index-1].find_opening_index(index-1)] is DialogicChoiceEvent:
 				return false
 			else:
 				return true

addons/dialogic/Modules/Condition/event_condition.gd

@@ -24,9 +24,9 @@ func _execute() -> void:
 
 	if condition.is_empty(): condition = "true"
 
-	var result :bool= dialogic.Expressions.execute_condition(condition)
+	var result: bool = dialogic.Expressions.execute_condition(condition)
 	if not result:
-		var idx :int = dialogic.current_event_idx
+		var idx: int = dialogic.current_event_idx
 		var ignore := 1
 		while true:
 			idx += 1

addons/dialogic/Modules/Core/event_end_branch.gd

@@ -34,8 +34,8 @@ func find_next_index() -> int:
 	return idx
 
 
-func find_opening_index() -> int:
-	var idx: int = dialogic.current_event_idx
+func find_opening_index(at_index:int) -> int:
+	var idx: int = at_index
 
 	var ignore: int = 1
 	while true: