Skip to content

Commit

Permalink
Merge branch 'main' into tool
Browse files Browse the repository at this point in the history
# Conflicts:
#	wiki
  • Loading branch information
BlackRam-oss committed Apr 15, 2024
2 parents e5d2d77 + 1eeaa70 commit bf5d27a
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .vscode/NQTR-Quest.code-snippets
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion game/nqtr_screens/screens_memo.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 7 additions & 6 deletions game/nqtr_tool/quest_fun.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -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 """
Expand Down
2 changes: 1 addition & 1 deletion game/renpy_utility_tool
2 changes: 1 addition & 1 deletion game/screens_style
2 changes: 1 addition & 1 deletion pythonpackages/renpy_utility

0 comments on commit bf5d27a

Please sign in to comment.