From f647836a8d8268136543c0f0713f510cb1835f04 Mon Sep 17 00:00:00 2001
From: Black Ram <67595890+BlackRam-oss@users.noreply.github.com>
Date: Tue, 2 Apr 2024 09:17:16 +0200
Subject: [PATCH 1/6] Fix conditional statement in menu_memo screen

---
 game/nqtr_screens/screens_memo.rpy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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:

From 34a29e3881720a6f499ec24147747a090ec8b9b7 Mon Sep 17 00:00:00 2001
From: Black Ram <67595890+BlackRam-oss@users.noreply.github.com>
Date: Tue, 2 Apr 2024 09:25:48 +0200
Subject: [PATCH 2/6] Fix quest_next_stage_only_is_completed function name and
 add log messages

---
 .vscode/NQTR-Quest.code-snippets |  4 ++--
 game/nqtr_tool/quest_fun.rpy     | 13 +++++++------
 wiki                             |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

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_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/wiki b/wiki
index 0d1ba1d..b36ba14 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 0d1ba1d0abed640c212d9aa55f96f4c1ab612d15
+Subproject commit b36ba14418ced35fec8a4cb79910fa79123b38c2

From 691e369a32dcbf0680447004bea1432a5f6c3ae3 Mon Sep 17 00:00:00 2001
From: Black Ram <67595890+BlackRam-oss@users.noreply.github.com>
Date: Tue, 2 Apr 2024 09:29:26 +0200
Subject: [PATCH 3/6] Update subproject commit hash

---
 wiki | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wiki b/wiki
index b36ba14..9eea0f3 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit b36ba14418ced35fec8a4cb79910fa79123b38c2
+Subproject commit 9eea0f3ab1b244e0a1e387c1c5ca8464270e1199

From cd7b43232fc8273506b9b60cfdbe80cb9dff4913 Mon Sep 17 00:00:00 2001
From: Black Ram <67595890+BlackRam-oss@users.noreply.github.com>
Date: Tue, 2 Apr 2024 09:38:19 +0200
Subject: [PATCH 4/6] Update subproject commit hash

---
 wiki | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wiki b/wiki
index 9eea0f3..31f5543 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 9eea0f3ab1b244e0a1e387c1c5ca8464270e1199
+Subproject commit 31f55439fe53659998d14a6b6e28371174198067

From d2ae8d621e097ea9d1f8a36c62c4dcb4e4920572 Mon Sep 17 00:00:00 2001
From: Black Ram <67595890+BlackRam-oss@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:31:21 +0200
Subject: [PATCH 5/6] Update subproject commit hashes

---
 game/renpy_utility_tool      | 2 +-
 game/screens_style           | 2 +-
 game/tl                      | 2 +-
 pythonpackages/renpy_utility | 2 +-
 wiki                         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

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/game/tl b/game/tl
index 2a78635..9c285bb 160000
--- a/game/tl
+++ b/game/tl
@@ -1 +1 @@
-Subproject commit 2a78635eb3b6ccdc991bf278bc648b9bc072a43c
+Subproject commit 9c285bb433678c3dc4e92845ed90fece7a1f8559
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
diff --git a/wiki b/wiki
index 31f5543..8c70384 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 31f55439fe53659998d14a6b6e28371174198067
+Subproject commit 8c703847d6b256bfc13bf4253c0268ce77427e75

From 1eeaa707aea856a6d9a85bae87819997ae94dcab Mon Sep 17 00:00:00 2001
From: Black Ram <67595890+BlackRam-oss@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:36:18 +0200
Subject: [PATCH 6/6] Update subproject commit hash in game/tl

---
 game/tl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/tl b/game/tl
index 9c285bb..2a78635 160000
--- a/game/tl
+++ b/game/tl
@@ -1 +1 @@
-Subproject commit 9c285bb433678c3dc4e92845ed90fece7a1f8559
+Subproject commit 2a78635eb3b6ccdc991bf278bc648b9bc072a43c