From b979228ca08cb6c5ce67298f471673568c3b607b Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sun, 20 Dec 2020 16:48:08 -0300 Subject: Update client for later™ patch for multiple worlds. But for time begin, only "Main" world is supported. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game/battle.rpy | 3 ++- game/quest.rpy | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/game/battle.rpy b/game/battle.rpy index c5600f0..28f3c26 100644 --- a/game/battle.rpy +++ b/game/battle.rpy @@ -122,7 +122,7 @@ label results: # TODO: Use small icons python: # Save current quest to 'quest' variable (wasn't it set before?) - quest=dl_search(allquests, "quest_id", Battle["quest_id"]) + quest=dl_search(allquests[Battle["world"]], "quest_id", Battle["quest_id"]) if (quest == ERR_INVALID): raise Exception("ERROR, QUEST NOT FOUND, %d" % Battle["quest_id"]) @@ -169,6 +169,7 @@ label results: qid=Battle["quest_id"] # WAIT THERE! Perhaps we have some sort of history to show?! + # TODO: Memory if Player["quest"] < qid: story=dl_search(allstory, "quest_id", qid) diff --git a/game/quest.rpy b/game/quest.rpy index de01117..d5d65a0 100644 --- a/game/quest.rpy +++ b/game/quest.rpy @@ -66,7 +66,7 @@ label quest_select: qid=quest["quest_id"] # We also want to show cost and requeriments - entry=dl_search(allquests, "quest_id", qid) + entry=dl_search(allquests["Main"], "quest_id", qid) if entry != ERR_INVALID: cost=entry["cost"] req=entry["requeriment"] @@ -94,12 +94,12 @@ label quest_select: label quest_selected: # Get quest data python: - quest=dl_search(allquests, "quest_id", qid) + quest=dl_search(allquests["Main"], "quest_id", qid) # Uhm, how did this happen? Means client-data is not fully updated! if (quest == ERR_INVALID): renpy.call_screen("msgbox", "ERROR:\n\nRequested Quest does not exist client-side\nAn update is required. We'll now close the app.") - raise KeyboardInterrupt() + renpy.quit(relaunch=True) # Confirm the quest cost $apmsg=_("Quest cost: %d/%d AP" % (quest["cost"], Player["ap"])) -- cgit v1.2.3-70-g09d2