diff --git a/addons/inkgd/ink_player.gd b/addons/inkgd/ink_player.gd index dd00eebc..a8b3179c 100644 --- a/addons/inkgd/ink_player.gd +++ b/addons/inkgd/ink_player.gd @@ -359,7 +359,7 @@ func continue_story() -> String: var text: String = "" if self.can_continue: - _story.continue() + _story.continue_story() text = self.current_text diff --git a/addons/inkgd/runtime/ink_path.gd b/addons/inkgd/runtime/ink_path.gd index 3340a637..dd4f4835 100644 --- a/addons/inkgd/runtime/ink_path.gd +++ b/addons/inkgd/runtime/ink_path.gd @@ -102,7 +102,7 @@ func get_tail(): return InkPath().new_with_components(tail_comps) else: - return InkPath().self() + return InkPath().new_self() var length setget , get_length # int func get_length(): @@ -141,7 +141,7 @@ func _init_with_components_string(components_string): self.components_string = components_string # () -> InkPath -static func self(): +static func new_self(): var path = InkPath().new() path.is_relative = true return path diff --git a/addons/inkgd/runtime/story.gd b/addons/inkgd/runtime/story.gd index d2bc35a8..750faaa0 100644 --- a/addons/inkgd/runtime/story.gd +++ b/addons/inkgd/runtime/story.gd @@ -288,7 +288,7 @@ func switch_to_default_flow() -> void: self.state.switch_to_default_flow_internal() -func continue() -> String: +func continue_story() -> String: self.continue_async(0) return self.current_text @@ -514,7 +514,7 @@ func continue_maximally() -> String: var _str = "" while (self.can_continue): - _str += self.continue() + _str += self.continue_story() return _str @@ -1199,7 +1199,7 @@ func async_we_cant(activity_str): if self._async_continue_active: Utils.throw_exception( "Can't %s. Story is in the middle of a ContinueAsync(). " % activity_str + - "Make more ContinueAsync() calls or a single Continue() call beforehand." + "Make more ContinueAsync() calls or a single continue_story() call beforehand." ) return _async_continue_active @@ -1268,7 +1268,7 @@ func evaluate_function( var string_output = "" while self.can_continue: - string_output += self.continue() + string_output += self.continue_story() var text_output = string_output @@ -1295,7 +1295,7 @@ func evaluate_expression(expr_container: InkContainer) -> InkObject: var eval_stack_height = self.state.evaluation_stack.size() - self.continue() + self.continue_story() _temporary_evaluation_container = null diff --git a/test/integration/runtime/test_bindings.gd b/test/integration/runtime/test_bindings.gd index 46c9b281..b0e99d9c 100644 --- a/test/integration/runtime/test_bindings.gd +++ b/test/integration/runtime/test_bindings.gd @@ -17,9 +17,9 @@ func test_external_binding(): story.bind_external_function("multiply", self, "_external_binding_multiply") story.bind_external_function("times", self, "_external_binding_times") - assert_eq(story.continue(), "15\n") + assert_eq(story.continue_story(), "15\n") - assert_eq(story.continue(), "knock knock knock\n") + assert_eq(story.continue_story(), "knock knock knock\n") assert_eq(_test_external_binding_message, "MESSAGE: hello world") @@ -65,7 +65,7 @@ func test_variable_observer(): assert_eq(story.current_choices.size(), 1) story.choose_choice_index(0) - story.continue() + story.continue_story() assert_eq(self._test_variable_observer_current_var_value, 25) assert_eq(self._test_variable_observer_observer_call_count, 2) diff --git a/test/integration/runtime/test_booleans.gd b/test/integration/runtime/test_booleans.gd index 896a8d3b..5d737e89 100644 --- a/test/integration/runtime/test_booleans.gd +++ b/test/integration/runtime/test_booleans.gd @@ -12,43 +12,43 @@ extends "res://test/integration/runtime/test_base.gd" func test_false_plus_false(): var story = Story.new(load_file("false_plus_false")) - assert_eq(story.continue(), "0\n") + assert_eq(story.continue_story(), "0\n") func test_list_hasnt(): var story = Story.new(load_file("list_hasnt")) - assert_eq(story.continue(), "true\n") + assert_eq(story.continue_story(), "true\n") func test_not_one(): var story = Story.new(load_file("not_one")) - assert_eq(story.continue(), "false\n") + assert_eq(story.continue_story(), "false\n") func test_not_true(): var story = Story.new(load_file("not_true")) - assert_eq(story.continue(), "false\n") + assert_eq(story.continue_story(), "false\n") func test_three_greater_than_one(): var story = Story.new(load_file("three_greater_than_one")) - assert_eq(story.continue(), "true\n") + assert_eq(story.continue_story(), "true\n") func test_true_equals_one(): var story = Story.new(load_file("true_equals_one")) - assert_eq(story.continue(), "true\n") + assert_eq(story.continue_story(), "true\n") func test_true_plus_one(): var story = Story.new(load_file("true_plus_one")) - assert_eq(story.continue(), "2\n") + assert_eq(story.continue_story(), "2\n") func test_true_plus_true(): var story = Story.new(load_file("true_plus_true")) - assert_eq(story.continue(), "2\n") + assert_eq(story.continue_story(), "2\n") func test_true(): var story = Story.new(load_file("true")) - assert_eq(story.continue(), "true\n") + assert_eq(story.continue_story(), "true\n") func test_two_plus_true(): var story = Story.new(load_file("two_plus_true")) - assert_eq(story.continue(), "3\n") + assert_eq(story.continue_story(), "3\n") # ############################################################################ # diff --git a/test/integration/runtime/test_builtins.gd b/test/integration/runtime/test_builtins.gd index 19e6ec35..4be823df 100644 --- a/test/integration/runtime/test_builtins.gd +++ b/test/integration/runtime/test_builtins.gd @@ -74,7 +74,7 @@ func test_turns(): var i = 0 while i < 10: - assert_eq(story.continue(), str(i, "\n")) + assert_eq(story.continue_story(), str(i, "\n")) story.choose_choice_index(0) i += 1 @@ -82,7 +82,7 @@ func test_turns(): func test_visit_count_bug_due_to_nested_containers(): var story = Story.new(load_file("visit_count_bug_due_to_nested_containers")) - assert_eq(story.continue(), "1\n") + assert_eq(story.continue_story(), "1\n") story.choose_choice_index(0) assert_eq(story.continue_maximally(), "choice\n1\n") @@ -98,7 +98,7 @@ func test_visit_counts_when_choosing(): assert_eq(story.state.visit_count_at_path_string("TestKnot"), 1) assert_eq(story.state.visit_count_at_path_string("TestKnot2"), 0) - story.continue() + story.continue_story() assert_eq(story.state.visit_count_at_path_string("TestKnot"), 1) assert_eq(story.state.visit_count_at_path_string("TestKnot2"), 0) @@ -108,7 +108,7 @@ func test_visit_counts_when_choosing(): assert_eq(story.state.visit_count_at_path_string("TestKnot"), 1) assert_eq(story.state.visit_count_at_path_string("TestKnot2"), 0) - story.continue() + story.continue_story() assert_eq(story.state.visit_count_at_path_string("TestKnot"), 1) assert_eq(story.state.visit_count_at_path_string("TestKnot2"), 1) diff --git a/test/integration/runtime/test_callstack.gd b/test/integration/runtime/test_callstack.gd index a19c8f31..afc87b6e 100644 --- a/test/integration/runtime/test_callstack.gd +++ b/test/integration/runtime/test_callstack.gd @@ -12,12 +12,12 @@ extends "res://test/integration/runtime/test_base.gd" func test_callstack_evaluation(): var story = Story.new(load_file("callstack_evaluation")) - assert_eq(story.continue(), "8\n") + assert_eq(story.continue_story(), "8\n") func test_clean_callstack_reset_on_path_choice(): var story = Story.new(load_file("clean_callstack_reset_on_path_choice")) - assert_eq("The first line.\n", story.continue()) + assert_eq("The first line.\n", story.continue_story()) story.choose_path_string("SomewhereElse") diff --git a/test/integration/runtime/test_choices.gd b/test/integration/runtime/test_choices.gd index 7922bd0a..c3246459 100644 --- a/test/integration/runtime/test_choices.gd +++ b/test/integration/runtime/test_choices.gd @@ -12,32 +12,32 @@ extends "res://test/integration/runtime/test_base.gd" func test_choice_count(): var story = Story.new(load_file("choice_count")) - assert_eq(story.continue(), "2\n") + assert_eq(story.continue_story(), "2\n") func test_choice_diverts_to_done(): var story = Story.new(load_file("choice_diverts_to_done")) - story.continue() + story.continue_story() assert_eq(story.current_choices.size(), 1) story.choose_choice_index(0) - assert_eq(story.continue(), "choice") + assert_eq(story.continue_story(), "choice") assert_false(story.has_error) # Removed in ink 1.0.0 but kept here for now. func test_choice_with_brackets_only(): var story = Story.new(load_file("choice_with_brackets_only")) - story.continue() + story.continue_story() assert_eq(story.current_choices.size(), 1) assert_eq(story.current_choices[0].text, "Option") story.choose_choice_index(0) - assert_eq(story.continue(), "Text\n") + assert_eq(story.continue_story(), "Text\n") func test_choice_thread_forking(): var story = Story.new(load_file("choice_thread_forking")) - story.continue() + story.continue_story() var saved_state = story.state.to_json() story = Story.new(load_file("choice_thread_forking")) @@ -61,11 +61,11 @@ func test_conditional_choices(): func test_default_choice(): var story = Story.new(load_file("default_choices")) - assert_eq(story.continue(), "") + assert_eq(story.continue_story(), "") assert_eq(story.current_choices.size(), 2) story.choose_choice_index(0) - assert_eq(story.continue(), "After choice\n") + assert_eq(story.continue_story(), "After choice\n") assert_eq(story.current_choices.size(), 1) @@ -74,21 +74,21 @@ func test_default_choice(): func test_default_simple_gather(): var story = Story.new(load_file("default_simple_gather")) - assert_eq(story.continue(), "x\n") + assert_eq(story.continue_story(), "x\n") func test_fallback_choice_on_thread(): var story = Story.new(load_file("fallback_choice_on_thread")) - assert_eq(story.continue(), "Should be 1 not 0: 1.\n") + assert_eq(story.continue_story(), "Should be 1 not 0: 1.\n") func test_gather_choice_same_line(): var story = Story.new(load_file("gather_choice_same_line")) - story.continue() + story.continue_story() assert_eq(story.current_choices[0].text, "hello") story.choose_choice_index(0) - story.continue() + story.continue_story() assert_eq(story.current_choices[0].text, "world") @@ -111,10 +111,10 @@ func test_logic_in_choices(): func test_non_text_in_choice_inner_content(): var story = Story.new(load_file("non_text_in_choice_inner_content")) - story.continue() + story.continue_story() story.choose_choice_index(0) - assert_eq(story.continue(), "option text. Conditional bit. Next.\n") + assert_eq(story.continue_story(), "option text. Conditional bit. Next.\n") func test_once_only_choices_can_link_back_to_self(): var story = Story.new(load_file("once_only_choices_can_link_back_to_self")) @@ -168,8 +168,8 @@ func test_should_not_gather_due_to_choice(): func test_state_rollback_over_default_choice(): var story = Story.new(load_file("state_rollback_over_default_choice")) - assert_eq(story.continue(), "Text.\n"); - assert_eq(story.continue(), "5\n"); + assert_eq(story.continue_story(), "Text.\n"); + assert_eq(story.continue_story(), "5\n"); func test_sticky_choices_stay_sticky(): var story = Story.new(load_file("sticky_choices_stay_sticky")) diff --git a/test/integration/runtime/test_conditions.gd b/test/integration/runtime/test_conditions.gd index def122dc..a5af3291 100644 --- a/test/integration/runtime/test_conditions.gd +++ b/test/integration/runtime/test_conditions.gd @@ -12,7 +12,7 @@ extends "res://test/integration/runtime/test_base.gd" func test_all_switch_branches_fail_is_clean(): var story = Story.new(load_file("all_switch_branches_fail_is_clean")) - story.continue() + story.continue_story() assert_eq(story.state.evaluation_stack.size(), 0) @@ -26,11 +26,11 @@ func test_else_branches(): func test_empty_multiline_conditional_branch(): var story = Story.new(load_file("empty_multiline_conditional_branch")) - assert_eq(story.continue(), "") + assert_eq(story.continue_story(), "") func test_trivial_condition(): var story = Story.new(load_file("trivial_condition")) - story.continue() + story.continue_story() assert_false(story.has_error) # Removed in ink 1.0.0 but kept here for now. diff --git a/test/integration/runtime/test_diverts.gd b/test/integration/runtime/test_diverts.gd index dc2ecf20..962170b1 100644 --- a/test/integration/runtime/test_diverts.gd +++ b/test/integration/runtime/test_diverts.gd @@ -13,7 +13,7 @@ extends "res://test/integration/runtime/test_base.gd" func test_basic_tunnel(): var story = Story.new(load_file("basic_tunnel")) - assert_eq(story.continue(), "Hello world\n") + assert_eq(story.continue_story(), "Hello world\n") func test_compare_divert_targets(): var story = Story.new(load_file("compare_divert_targets")) @@ -48,10 +48,10 @@ func test_done_stops_thread(): func test_path_to_self(): var story = Story.new(load_file("path_to_self")) - story.continue() + story.continue_story() story.choose_choice_index(0) - story.continue() + story.continue_story() story.choose_choice_index(0) assert_true(story.can_continue) @@ -59,7 +59,7 @@ func test_path_to_self(): func test_same_line_divert_is_inline(): var story = Story.new(load_file("same_line_divert_is_inline")) - assert_eq(story.continue(), "We hurried home to Savile Row as fast as we could.\n") + assert_eq(story.continue_story(), "We hurried home to Savile Row as fast as we could.\n") func test_tunnel_onwards_after_tunnel(): var story = Story.new(load_file("tunnel_onwards_after_tunnel")) diff --git a/test/integration/runtime/test_evaluation.gd b/test/integration/runtime/test_evaluation.gd index 971f0c2b..34c11e58 100644 --- a/test/integration/runtime/test_evaluation.gd +++ b/test/integration/runtime/test_evaluation.gd @@ -21,18 +21,18 @@ func test_basic_string_literals(): func test_evaluating_function_variable_state_bug(): var story = Story.new(load_file("evaluating_function_variable_state_bug")) - assert_eq(story.continue(), "Start\n") - assert_eq(story.continue(), "In tunnel.\n") + assert_eq(story.continue_story(), "Start\n") + assert_eq(story.continue_story(), "In tunnel.\n") var func_result = story.evaluate_function("function_to_evaluate") assert_eq(func_result, "RIGHT") - assert_eq(story.continue(), "End\n") + assert_eq(story.continue_story(), "End\n") func test_evaluating_ink_functions_from_game(): var story = Story.new(load_file("evaluating_ink_functions_from_game")) - story.continue() + story.continue_story() var returned_divert_target = story.evaluate_function("test") @@ -47,19 +47,19 @@ func test_evaluating_ink_functions_from_game_2(): assert_eq(func_result["output"], "This is a function\n") assert_eq(func_result["result"], 5) - assert_eq(story.continue(), "One\n") + assert_eq(story.continue_story(), "One\n") func_result = story.evaluate_function("func2", null, true) assert_eq(func_result["output"], "This is a function without a return value\n") assert_eq(func_result["result"], null) - assert_eq(story.continue(), "Two\n") + assert_eq(story.continue_story(), "Two\n") func_result = story.evaluate_function("add", [1, 2], true) assert_eq(func_result["output"], "x = 1, y = 2\n") assert_eq(func_result["result"], 3) - assert_eq(story.continue(), "Three\n") + assert_eq(story.continue_story(), "Three\n") func test_evaluation_stack_leaks(): var story = Story.new(load_file("evaluation_stack_leaks")) diff --git a/test/integration/runtime/test_glue.gd b/test/integration/runtime/test_glue.gd index bcfe6fc3..11696c48 100644 --- a/test/integration/runtime/test_glue.gd +++ b/test/integration/runtime/test_glue.gd @@ -13,7 +13,7 @@ extends "res://test/integration/runtime/test_base.gd" func test_implicit_inline_glue(): var story = Story.new(load_file("implicit_inline_glue")) - assert_eq(story.continue(), "I have five eggs.\n") + assert_eq(story.continue_story(), "I have five eggs.\n") func test_implicit_inline_glue_b(): var story = Story.new(load_file("implicit_inline_glue_b")) @@ -33,7 +33,7 @@ func test_left_right_glue_matching(): func test_simple_glue(): var story = Story.new(load_file("simple_glue")) - assert_eq(story.continue(), "Some content with glue.\n") + assert_eq(story.continue_story(), "Some content with glue.\n") # ############################################################################ # diff --git a/test/integration/runtime/test_knots.gd b/test/integration/runtime/test_knots.gd index 03f11a40..52cf4671 100644 --- a/test/integration/runtime/test_knots.gd +++ b/test/integration/runtime/test_knots.gd @@ -13,7 +13,7 @@ extends "res://test/integration/runtime/test_base.gd" func test_knot_do_not_gather(): var story = Story.new(load_file("knot_do_not_gather")) - assert_eq(story.continue(), "g\n") + assert_eq(story.continue_story(), "g\n") func test_knot_stitch_gather_counts(): var story = Story.new(load_file("knot_stitch_gather_counts")) @@ -30,8 +30,8 @@ func test_knot_thread_interaction(): assert_true(story.current_choices[1].text.find("wigwag") != -1) story.choose_choice_index(1) - assert_eq(story.continue(), "wigwag\n") - assert_eq(story.continue(), "THE END\n") + assert_eq(story.continue_story(), "wigwag\n") + assert_eq(story.continue_story(), "THE END\n") assert_false(story.has_error) # Removed in ink 1.0.0 but kept here for now. func test_knot_thread_interaction_2(): diff --git a/test/integration/runtime/test_lists.gd b/test/integration/runtime/test_lists.gd index ffdf5cde..d91ed705 100644 --- a/test/integration/runtime/test_lists.gd +++ b/test/integration/runtime/test_lists.gd @@ -34,7 +34,7 @@ func test_list_random(): var story = Story.new(load_file("list_random")) while story.can_continue: - var result = story.continue() + var result = story.continue_story() assert_true(result == "B\n" || result == "C\n" || result == "D\n") func test_list_range(): diff --git a/test/integration/runtime/test_misc.gd b/test/integration/runtime/test_misc.gd index 6ad1c3cd..2c37db68 100644 --- a/test/integration/runtime/test_misc.gd +++ b/test/integration/runtime/test_misc.gd @@ -38,7 +38,7 @@ func test_escape_character(): func test_hello_world(): var story = Story.new(load_file("hello_world")) - assert_eq(story.continue(), "Hello world\n") + assert_eq(story.continue_story(), "Hello world\n") func test_identifiers_can_start_with_number(): var story = Story.new(load_file("identifiers_can_start_with_number")) diff --git a/test/integration/runtime/test_multiflow.gd b/test/integration/runtime/test_multiflow.gd index 5209bc29..c4a6e8aa 100644 --- a/test/integration/runtime/test_multiflow.gd +++ b/test/integration/runtime/test_multiflow.gd @@ -15,30 +15,30 @@ func test_multi_flow_basics(): story.switch_flow("First") story.choose_path_string("knot1") - assert_eq(story.continue(), "knot 1 line 1\n") + assert_eq(story.continue_story(), "knot 1 line 1\n") story.switch_flow("Second") story.choose_path_string("knot2") - assert_eq(story.continue(), "knot 2 line 1\n") + assert_eq(story.continue_story(), "knot 2 line 1\n") story.switch_flow("First") - assert_eq(story.continue(), "knot 1 line 2\n") + assert_eq(story.continue_story(), "knot 1 line 2\n") story.switch_flow("Second") - assert_eq(story.continue(), "knot 2 line 2\n") + assert_eq(story.continue_story(), "knot 2 line 2\n") func test_multi_flow_save_load_threads(): var story = Story.new(load_file("multi_flow_save_load_threads")) - assert_eq(story.continue(), "Default line 1\n") + assert_eq(story.continue_story(), "Default line 1\n") story.switch_flow("Blue Flow") story.choose_path_string("blue") - assert_eq(story.continue(), "Hello I'm blue\n") + assert_eq(story.continue_story(), "Hello I'm blue\n") story.switch_flow("Red Flow") story.choose_path_string("red") - assert_eq(story.continue(), "Hello I'm red\n") + assert_eq(story.continue_story(), "Hello I'm red\n") story.switch_flow("Blue Flow") assert_eq("Hello I'm blue\n", story.current_text) @@ -70,7 +70,7 @@ func test_multi_flow_save_load_threads(): assert_eq("Thread 2 blue choice\nAfter thread 2 choice (blue)\n", story.continue_maximally()) story.remove_flow("Blue Flow") - assert_eq(story.continue(), "Default line 2\n") + assert_eq(story.continue_story(), "Default line 2\n") # ############################################################################ # diff --git a/test/integration/runtime/test_newlines.gd b/test/integration/runtime/test_newlines.gd index 0056c2ff..9869c8f2 100644 --- a/test/integration/runtime/test_newlines.gd +++ b/test/integration/runtime/test_newlines.gd @@ -20,12 +20,12 @@ func test_newline_consistency(): assert_eq(story.continue_maximally(), "hello world\n") story = Story.new(load_file("newline_consistency_2")) - story.continue() + story.continue_story() story.choose_choice_index(0) assert_eq(story.continue_maximally(), "hello world\n") story = Story.new(load_file("newline_consistency_3")) - story.continue() + story.continue_story() story.choose_choice_index(0) assert_eq(story.continue_maximally(), "hello\nworld\n") diff --git a/test/integration/runtime/test_sequences.gd b/test/integration/runtime/test_sequences.gd index 775cd260..6a1f3ff0 100644 --- a/test/integration/runtime/test_sequences.gd +++ b/test/integration/runtime/test_sequences.gd @@ -22,17 +22,17 @@ func test_empty_sequence_content(): func test_gather_read_count_with_initial_sequence(): var story = Story.new(load_file("gather_read_count_with_initial_sequence")) - assert_eq(story.continue(), "seen test\n") + assert_eq(story.continue_story(), "seen test\n") func test_leading_newline_multiline_sequence(): var story = Story.new(load_file("leading_newline_multiline_sequence")) - assert_eq(story.continue(), "a line after an empty line\n") + assert_eq(story.continue_story(), "a line after an empty line\n") func test_shuffle_stack_muddying(): var story = Story.new(load_file("shuffle_stack_muddying")) - story.continue() + story.continue_story() assert_eq(story.current_choices.size(), 2) diff --git a/test/integration/runtime/test_strings.gd b/test/integration/runtime/test_strings.gd index 52f8a044..db723dec 100644 --- a/test/integration/runtime/test_strings.gd +++ b/test/integration/runtime/test_strings.gd @@ -13,7 +13,7 @@ extends "res://test/integration/runtime/test_base.gd" func test_string_constants(): var story = Story.new(load_file("string_constants")) - assert_eq(story.continue(), "hi\n") + assert_eq(story.continue_story(), "hi\n") func test_string_contains(): var story = Story.new(load_file("string_contains")) @@ -34,7 +34,7 @@ func test_string_in_choices(): assert_eq(story.current_choices[0].text, "test1 \"test2 test3\"") story.choose_choice_index(0) - assert_eq(story.continue(), "test1 test4\n") + assert_eq(story.continue_story(), "test1 test4\n") # ############################################################################ # diff --git a/test/integration/runtime/test_tags.gd b/test/integration/runtime/test_tags.gd index e2b54187..545b05a4 100644 --- a/test/integration/runtime/test_tags.gd +++ b/test/integration/runtime/test_tags.gd @@ -19,25 +19,25 @@ func test_tags(): var stitch_tags = ["stitch tag"] assert_eq(story.global_tags, global_tags) - assert_eq(story.continue(), "This is the content\n") + assert_eq(story.continue_story(), "This is the content\n") assert_eq(story.current_tags, global_tags) assert_eq(story.tags_for_content_at_path("knot"), knot_tags) assert_eq(story.tags_for_content_at_path("knot.stitch"), stitch_tags) story.choose_path_string("knot") - assert_eq(story.continue(), "Knot content\n") + assert_eq(story.continue_story(), "Knot content\n") assert_eq(story.current_tags, knot_tags) - assert_eq(story.continue(), "") + assert_eq(story.continue_story(), "") assert_eq(story.current_tags, knot_tag_when_continued_twice_tags) func test_tags_on_choice(): var story = Story.new(load_file("tags_on_choice")) - story.continue() + story.continue_story() story.choose_choice_index(0) - var txt = story.continue() + var txt = story.continue_story() var tags = story.current_tags assert_eq(txt, "Hello") diff --git a/test/integration/runtime/test_threads.gd b/test/integration/runtime/test_threads.gd index 21b9f918..1e9eb8d3 100644 --- a/test/integration/runtime/test_threads.gd +++ b/test/integration/runtime/test_threads.gd @@ -26,12 +26,12 @@ func test_thread_done(): func test_thread_in_logic(): var story = Story.new(load_file("thread_in_logic")) - assert_eq(story.continue(), "Content\n") + assert_eq(story.continue_story(), "Content\n") func test_top_flow_terminator_should_not_kill_thread_choices(): var story = Story.new(load_file("top_flow_terminator_should_not_kill_thread_choices")) - assert_eq(story.continue(), "Limes\n") + assert_eq(story.continue_story(), "Limes\n") assert_eq(story.current_choices.size(), 1) # ############################################################################ # diff --git a/test/integration/runtime/test_variables.gd b/test/integration/runtime/test_variables.gd index 16c0ad5a..95813044 100644 --- a/test/integration/runtime/test_variables.gd +++ b/test/integration/runtime/test_variables.gd @@ -35,17 +35,17 @@ func after_each(): func test_const(): var story = Story.new(load_file("const")) - assert_eq(story.continue(), "5\n") + assert_eq(story.continue_story(), "5\n") func test_multiple_constant_references(): var story = Story.new(load_file("multiple_constant_references")) - assert_eq(story.continue(), "success\n") + assert_eq(story.continue_story(), "success\n") func test_set_non_existent_variable(): var story = Story.new(load_file("set_non_existant_variable")) - assert_eq(story.continue(), "Hello world.\n") + assert_eq(story.continue_story(), "Hello world.\n") story.variables_state.set("y", "earth") @@ -54,7 +54,7 @@ func test_set_non_existent_variable(): func test_temp_global_conflict(): var story = Story.new(load_file("temp_global_conflict")) - assert_eq(story.continue(), "0\n") + assert_eq(story.continue_story(), "0\n") func test_temp_not_found(): var story = Story.new(load_file("temp_not_found")) @@ -66,7 +66,7 @@ func test_temp_not_found(): func test_temp_usage_in_options(): var story = Story.new(load_file("temp_usage_in_options")) - story.continue() + story.continue_story() assert_eq(story.current_choices.size(), 1) assert_eq(story.current_choices[0].text, "1") @@ -79,17 +79,17 @@ func test_temp_usage_in_options(): func test_temporaries_at_global_scope(): var story = Story.new(load_file("temporaries_at_global_scope")) - assert_eq(story.continue(), "54\n") + assert_eq(story.continue_story(), "54\n") func test_variable_declaration_in_conditional(): var story = Story.new(load_file("variable_declaration_in_conditional")) - assert_eq(story.continue(), "5\n") + assert_eq(story.continue_story(), "5\n") func test_variable_divert_target(): var story = Story.new(load_file("variable_divert_target")) - assert_eq(story.continue(), "Here.\n") + assert_eq(story.continue_story(), "Here.\n") func test_variable_get_set_api(): var story = Story.new(load_file("variable_get_set_api")) @@ -120,7 +120,7 @@ func test_variable_get_set_api(): func test_variable_pointer_ref_from_knot(): var story = Story.new(load_file("variable_pointer_ref_from_knot")) - assert_eq(story.continue(), "6\n") + assert_eq(story.continue_story(), "6\n") func test_variable_swap_recurse(): var story = Story.new(load_file("variable_swap_recurse")) diff --git a/test/integration/runtime/test_weave.gd b/test/integration/runtime/test_weave.gd index c2b68443..0a3f66bc 100644 --- a/test/integration/runtime/test_weave.gd +++ b/test/integration/runtime/test_weave.gd @@ -24,7 +24,7 @@ func test_conditional_choice_in_weave(): func test_conditional_choice_in_weave_2(): var story = Story.new(load_file("conditional_choice_in_weave_2")) - assert_eq(story.continue(), "first gather\n") + assert_eq(story.continue_story(), "first gather\n") assert_eq(story.current_choices.size(), 2) story.choose_choice_index(0) @@ -75,12 +75,12 @@ func test_weave_options(): assert_eq(story.current_choices[0].text, "Hello.") story.choose_choice_index(0) - assert_eq(story.continue(), "Hello, world.\n") + assert_eq(story.continue_story(), "Hello, world.\n") func test_weave_within_sequence(): var story = Story.new(load_file("weave_within_sequence")) - story.continue() + story.continue_story() assert_eq(story.current_choices.size(), 1)