Skip to content

Commit bf5d27a

Browse files
committed
Merge branch 'main' into tool
# Conflicts: # wiki
2 parents e5d2d77 + 1eeaa70 commit bf5d27a

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

.vscode/NQTR-Quest.code-snippets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
},
2121
"DRincs Next Stage Only it is completed": {
2222
"scope": "renpy",
23-
"prefix": "DR_QuestNextStageIfIsCompleted",
23+
"prefix": "DR_QuestNextStageIfCompleted",
2424
"body": [
25-
"$ quest_next_stage_only_is_completed(\"${1:quest_id}\")",
25+
"$ quest_next_stage_only_if_completed(\"${1:quest_id}\")",
2626
"",
2727
],
2828
"description": "Next Stage Only it is completed"

game/nqtr_screens/screens_memo.rpy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ screen menu_memo(close_actions = [ Hide("menu_memo") ]):
9696
text quest_menu.advice size gui.dr_big_normal_text_size
9797
for item in quest_menu.goals:
9898
text item.description size gui.dr_big_normal_text_size
99-
if current_quest_stages[cur_task_menu].completed and (cur_quest_menu+1) == len(quests[cur_task_menu].stage_ids):
99+
if quests[cur_task_menu].is_completed(current_quest_stages, number_stages_completed_in_quest):
100100
if quests[cur_task_menu].development:
101101
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
102102
else:

game/nqtr_tool/quest_fun.rpy

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,18 @@ init python:
8989
notify_add(new_quest_notify)
9090
return True
9191

92-
def quest_next_stage_only_is_completed(id: str) -> bool:
93-
"""Wiki: https://github.com/DRincs-Productions/NQTR-toolkit/wiki/Quest#next-stage-only-it-is-completed """
94-
log_info("quest_nextStageOnlyIsCompleted", renpy.get_filename_line())
92+
def quest_next_stage_only_if_completed(id: str) -> None:
93+
"""Wiki: https://github.com/DRincs-Productions/NQTR-toolkit/wiki/Quest#next-stage-only-if-is-completed """
9594
if (id in current_task_stages):
9695
if (not current_task_stages[id].is_completed(number_stages_completed_in_quest, tm, flags)):
97-
return False
96+
log_info(" The stage is not completed, so it is not possible to go to the next stage.", renpy.get_filename_line())
97+
return
9898
elif (id in current_quest_stages):
9999
if (not current_task_stages[id].is_completed(number_stages_completed_in_quest, tm, flags)):
100-
return False
100+
log_info(" The stage is not completed, so it is not possible to go to the next stage.", renpy.get_filename_line())
101+
return
101102
quest_next_stage(id)
102-
return True
103+
return
103104

104105
def quest_next_stage(id: str) -> None:
105106
"""Wiki: https://github.com/DRincs-Productions/NQTR-toolkit/wiki/Quest#next-stage """

game/renpy_utility_tool

pythonpackages/renpy_utility

0 commit comments

Comments
 (0)