diff --git a/.vscode/NQTR-Quest.code-snippets b/.vscode/NQTR-Quest.code-snippets index a47c250..1ce11ee 100644 --- a/.vscode/NQTR-Quest.code-snippets +++ b/.vscode/NQTR-Quest.code-snippets @@ -20,9 +20,9 @@ }, "DRincs Next Stage Only it is completed": { "scope": "renpy", - "prefix": "DR_QuestNextStageIfIsCompleted", + "prefix": "DR_QuestNextStageIfCompleted", "body": [ - "$ quest_next_stage_only_is_completed(\"${1:quest_id}\")", + "$ quest_next_stage_only_if_completed(\"${1:quest_id}\")", "", ], "description": "Next Stage Only it is completed" diff --git a/game/nqtr_screens/screens_memo.rpy b/game/nqtr_screens/screens_memo.rpy index 1248679..8c10a4d 100644 --- a/game/nqtr_screens/screens_memo.rpy +++ b/game/nqtr_screens/screens_memo.rpy @@ -96,7 +96,7 @@ screen menu_memo(close_actions = [ Hide("menu_memo") ]): text quest_menu.advice size gui.dr_big_normal_text_size for item in quest_menu.goals: text item.description size gui.dr_big_normal_text_size - if current_quest_stages[cur_task_menu].completed and (cur_quest_menu+1) == len(quests[cur_task_menu].stage_ids): + if quests[cur_task_menu].is_completed(current_quest_stages, number_stages_completed_in_quest): if quests[cur_task_menu].development: text _("It is currently the end of this story, unfortunately you have to wait for an update to continue this story.") size gui.dr_big_normal_text_size else: diff --git a/game/nqtr_tool/quest_fun.rpy b/game/nqtr_tool/quest_fun.rpy index 2360902..2b4a48c 100644 --- a/game/nqtr_tool/quest_fun.rpy +++ b/game/nqtr_tool/quest_fun.rpy @@ -89,17 +89,18 @@ init python: notify_add(new_quest_notify) return True - def quest_next_stage_only_is_completed(id: str) -> bool: - """Wiki: https://github.com/DRincs-Productions/NQTR-toolkit/wiki/Quest#next-stage-only-it-is-completed """ - log_info("quest_nextStageOnlyIsCompleted", renpy.get_filename_line()) + def quest_next_stage_only_if_completed(id: str) -> None: + """Wiki: https://github.com/DRincs-Productions/NQTR-toolkit/wiki/Quest#next-stage-only-if-is-completed """ if (id in current_task_stages): if (not current_task_stages[id].is_completed(number_stages_completed_in_quest, tm, flags)): - return False + log_info(" The stage is not completed, so it is not possible to go to the next stage.", renpy.get_filename_line()) + return elif (id in current_quest_stages): if (not current_task_stages[id].is_completed(number_stages_completed_in_quest, tm, flags)): - return False + log_info(" The stage is not completed, so it is not possible to go to the next stage.", renpy.get_filename_line()) + return quest_next_stage(id) - return True + return def quest_next_stage(id: str) -> None: """Wiki: https://github.com/DRincs-Productions/NQTR-toolkit/wiki/Quest#next-stage """ diff --git a/game/renpy_utility_tool b/game/renpy_utility_tool index 15d40b6..abcded0 160000 --- a/game/renpy_utility_tool +++ b/game/renpy_utility_tool @@ -1 +1 @@ -Subproject commit 15d40b62b5cb4b382abe3ae8a9ca43582d8ece46 +Subproject commit abcded08547fcda75ca26a9690ca2fe2f7dcf668 diff --git a/game/screens_style b/game/screens_style index 7e0c1a5..2916db0 160000 --- a/game/screens_style +++ b/game/screens_style @@ -1 +1 @@ -Subproject commit 7e0c1a500181291aed063c0be921298c3abed1c4 +Subproject commit 2916db01a74f07723bb6746dba2d12a201d10314 diff --git a/pythonpackages/renpy_utility b/pythonpackages/renpy_utility index 870cad6..62ad440 160000 --- a/pythonpackages/renpy_utility +++ b/pythonpackages/renpy_utility @@ -1 +1 @@ -Subproject commit 870cad6b7d7554896fa63a5aa66a84a80eb9ae59 +Subproject commit 62ad440019810e8d4282251bfeff4ef9df489df0