Prompt player to fill preferences on first login.

Do not use Vault Login as a fallback if Steam Login is disabled.

3 files changed, 28 insertions, 3 deletions

diff --git a/game/core.rpy b/game/core.rpy
index 0f3feca..e2adc96 100644
--- a/game/core.rpy
+++ b/game/core.rpy
@@ -135,13 +135,15 @@ label splashscreen:
         if persistent.hello is None:
             p1=2.5
             p2=1.5
-            persistent.hello=True
         else:
             p1=0.5
             p2=0.5
     pause p1
     hide TMW2 with Dissolve(p2)
     call before_main_menu
+    if persistent.hello is None:
+        call screen preferences
+        $ persistent.hello=True
     return
 
 label die:
diff --git a/game/screens.rpy b/game/screens.rpy
index b8e872c..88f3046 100644
--- a/game/screens.rpy
+++ b/game/screens.rpy
@@ -461,7 +461,8 @@ screen game_menu(title, scroll=None, yinitial=0.0):
 
                     transclude
 
-    use navigation
+    if persistent.hello is not None:
+        use navigation
 
     textbutton _("Return"):
         style "return_button"
@@ -735,6 +736,20 @@ screen preferences():
                             action Preference("all mute", "toggle")
                             style "mute_all_button"
 
+    if persistent.hello is None:
+        fixed:
+            xalign 0.60
+            yalign 0.92
+            xmaximum 320
+            ymaximum 40
+            button:
+                action Return()
+                add Frame("gui/button/choice_hover_background.png", 0, 0)
+                text _("Start!"):
+                    color "#FFF"
+                    xalign 0.5
+                    yalign 0.5
+
 
 style pref_label is gui_label
 style pref_label_text is gui_label_text
diff --git a/game/update.rpy b/game/update.rpy
index 6b47e2f..609e63d 100644
--- a/game/update.rpy
+++ b/game/update.rpy
@@ -197,6 +197,7 @@ init python:
                 raise Exception("Vault returned code %d" % r.status_code)
 
             ## Receive the Vault Token
+            status_update("Waiting for Vault reply...", 90)
             stdout("Steam result: (%d) %s" % (r.status_code, ifte(config.developer, r.text, accId)))
             auth2 = r.json()
             vaultId = auth2["vaultId"]
@@ -210,7 +211,14 @@ init python:
             time.sleep(0.1)
         except:
             traceback.print_exc()
-            status_update("Steam auth failed, trying Vault...", 90)
+            # NO FALLBACK: if Steam Login is on, do not try vault (no multiacc)
+            if persistent.steam:
+                status_update("{color=#f00}{b}STEAM AUTHENTICATION ERROR.\nIf the issue persists, try closing the app and opening again.{/b}{/color}")
+                responsive=False
+                return
+
+            # Prepare to do Vault authentication
+            status_update("Steam auth disabled, trying Vault...", 80)
             time.sleep(1.0)
             vaultId = 0
             vaultToken = "ERROR"