summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--game/renpy.rpy23
-rw-r--r--game/soul.rpy11
2 files changed, 27 insertions, 7 deletions
diff --git a/game/renpy.rpy b/game/renpy.rpy
index edd36de..f889b39 100644
--- a/game/renpy.rpy
+++ b/game/renpy.rpy
@@ -33,9 +33,24 @@ screen serverdata(server):
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
+ # FIXME
+ if config.developer:
+ fixed:
+ xalign 0.5
+ yalign 0.5
+ viewport:
+ child_size (512, 288) # FIXME
+ draggable True
+ mousewheel True
+ scrollbars "vertical"
+ pagekeys True
+ vbox:
+ textbutton _("Open wiki") action Function(load_wiki, server)
+ label "{color=#fff}[statusmsg]{/color}"
+ else:
+ label "{color=#fff}[statusmsg]{/color}":
+ xalign 0.5
+ yalign 0.5
hbox:
xalign 0.5
yalign 0.8
@@ -119,7 +134,7 @@ label start:
scene black
if persistent.vaultId is None or persistent.vaultId != vaultId:
$ persistent.vaultId = vaultId
- call intro
+ call intro(newuser=True)
scene black with None
show TMW2 at truecenter
with Dissolve(0.5)
diff --git a/game/soul.rpy b/game/soul.rpy
index 498ae88..ccfecea 100644
--- a/game/soul.rpy
+++ b/game/soul.rpy
@@ -328,7 +328,7 @@ init python:
return 0
#################################################################################
-label thevoid:
+label thevoid(loop=True):
$ progress = 0
$ mySoul = None
$ renpy.invoke_in_thread(load_souldata)
@@ -362,7 +362,6 @@ label thevoid:
call ch2intro
## Loop
- $ loop = True
while loop:
call screen souldata()
if isinstance(_return, str):
@@ -527,7 +526,7 @@ label managevault:
$ del vault_loop
return
#################################################################################
-label intro:
+label intro(newuser=False):
$ RPCUpdate("The Void", "launcher")
scene DKBG
show expression (ManaSparkle().sm) as flare
@@ -577,6 +576,12 @@ Be sure to read each subworld specific rules and complete the tutorial to spot t
Attempt to restore your soul as you try to stop the evil which threatens the multiverse.\n\
Soul Level remains constant regardless of the subworld you're at.{/color}{fast}"
scene black
+ if newuser:
+ $ _arg = False
+ call screen confirm(_("{b}Account Linking{/b}\n\nIf you have already played The Mana World before, you might want to import your existing account instead of creating a new one.\n\nDo you want to link existing accounts?"), [SetVariable("_arg", True), Return()], [SetVariable("_arg", False), Return()])
+ if _arg:
+ call thevoid(loop=False)
+ call managevault
return
#################################################################################