It's incredible how simple things can make it look Okay-ish

2 files changed, 34 insertions, 3 deletions

diff --git a/game/client.rpy b/game/client.rpy
index 19aa8d2..0214678 100644
--- a/game/client.rpy
+++ b/game/client.rpy
@@ -50,6 +50,7 @@ init 2 python:
             elif r.status_code == 403:
                 stdout("Warning: Connection was refused (Vault logout?)")
                 statusmsg=_("You're not logged in.")
+                time.sleep(1.0)
                 responsive = False
                 return
             ## We are rate-limited, try again
@@ -70,7 +71,7 @@ init 2 python:
         except:
             traceback.print_exc()
             statusmsg=_("TMW Vault Error.")
-            #time.sleep(2.5)
+            time.sleep(2.5)
             progress = 100
             return
 
@@ -105,6 +106,7 @@ init 2 python:
         ########################################################################
         ## Cleanup
         statusmsg=_("Thanks for playing!")
+        # time.sleep(0.1) ## TODO: Ensure the world finishes updating Vault
         progress=100
 
         # Clean discord RPC and go back to world selection menu
diff --git a/game/renpy.rpy b/game/renpy.rpy
index a94dba1..d207b82 100644
--- a/game/renpy.rpy
+++ b/game/renpy.rpy
@@ -29,6 +29,34 @@ screen loading():
             xalign 0.5
             yalign 0.55
 
+screen serverdata(server):
+    zorder 100
+
+    fixed:
+        frame:
+            xfill True
+            yfill True
+            background Frame("images/default.png", 0, 0)
+        label "{b}%s{/b}" % persistent.serverlist[server]["Name"]:
+            xalign 0.5
+            yalign 0.2
+        label "{color=#fff}[statusmsg]{/color}":
+            xalign 0.5
+            yalign 0.5
+        hbox:
+            xalign 0.5
+            yalign 0.8
+            text _("{a=%s}Website{/a}" % persistent.serverlist[server]["Link"])
+            null width 20
+            text "|"
+            null width 20
+            text _("{a=%s}Support{/a}" % persistent.serverlist[server]["Help"])
+            null width 20
+            text _("{a=%s}News{/a}" % persistent.serverlist[server]["News"])
+            null width 20
+            text _("{a=%s}Terms of Use{/a}" % persistent.serverlist[server]["Policy"])
+
+
 # The game starts here.
 label start:
     $ statusmsg="Validating SSL Certificates..."
@@ -110,8 +138,8 @@ label start_loop:
         scene black
         # FIXME: Improve this waiting screen
         # Possibly retrieve messages from the thread
-        $ statusmsg=""
-        show expression Text("{color=#FFF}"+_("Game in session:\n%s" % (persistent.serverlist[_return]["Name"]))+"{/color}") at truecenter
+        $ statusmsg="Now loading..."
+        show screen serverdata(_return)
         with None
         pause 0.01
         python:
@@ -130,6 +158,7 @@ label start_loop:
                 Return(True), Return(False))
                     SCR_PROMPT = None
 
+        hide screen serverdata
         # Kill the program instead of looping back
         if not responsive:
             scene black