From e62ea4c614d4d6cbd26b7b313c611d62b6d9d275 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 4 Aug 2021 16:25:20 -0300
Subject: Fix a couple bugs I introduced recently

---
 game/quest.rpy   | 13 ++++++++++---
 game/recruit.rpy | 20 ++++++++++++++------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/game/quest.rpy b/game/quest.rpy
index 6bb7caf..723fc63 100644
--- a/game/quest.rpy
+++ b/game/quest.rpy
@@ -163,9 +163,16 @@ label quest_selected:
                     del bg_is_showing
 
     # Okay, story-telling time is over: To arms!
-    # 
-    $ TMP_MUSIC=get_sfx(quest["music"])
-    $ TMP_BACKG=quest["bg"]
+    # Prepare music/background or use defaults
+    python:
+        TMP_MUSIC = MUSIC_BATTLE.id()
+        TMP_BACKG = "battle"
+        try:
+            TMP_MUSIC=get_sfx(quest["music"])
+            TMP_BACKG=quest["bg"]
+        except:
+            traceback.print_exc()
+    ## Play the music, free memory, to arms!
     #$ print("Stage music: "+str(TMP_MUSIC))
     play music TMP_MUSIC fadein 0.5
     #play music MUSIC_BATTLE.id() fadein 0.5
diff --git a/game/recruit.rpy b/game/recruit.rpy
index 85dc18a..2b81db6 100644
--- a/game/recruit.rpy
+++ b/game/recruit.rpy
@@ -111,10 +111,15 @@ screen tavern():
             else:
                 pass
 
-            label alltaverns[tavern]["details"]
-            null:
-                height 32
-            label _("%d %s the draw!" % (alltaverns[tavern]["price"], alltaverns[tavern]["currency"]))
+            showif (alltaverns[tavern]["min_quest"] <= Player["quest"]):
+                label alltaverns[tavern]["details"]
+                null:
+                    height 32
+                label _("%d %s the draw!" % (alltaverns[tavern]["price"], alltaverns[tavern]["currency"]))
+            else:
+                label _("This tavern hasn't been unlocked yet.")
+                null height 64
+                label _("Unlocks at quest %d" % alltaverns[tavern]["min_quest"])
 
         vbox:
             box_wrap True
@@ -126,7 +131,8 @@ screen tavern():
             xanchor 0.0
             hbox:
               spacing 24
-              showif alltaverns[tavern]["min_quest"] > 0:
+
+              showif alltaverns[tavern]["min_quest"] >= 0 and alltaverns[tavern]["min_quest"] <= Player["quest"]:
                 button:
                     xmaximum 250 #350
                     yminimum 60  #111
@@ -157,8 +163,10 @@ screen tavern():
                             size 24
                             outlines [(1,"#FFF",0,0)]
                         null width 25
-              else:
+              elif (alltaverns[tavern]["min_quest"] < 0):
                 label _("Coming soon!")
+              else:
+                pass
             null:
                 height 42
             hbox:
-- 
cgit v1.2.3-70-g09d2