And that's it - Tmwa linking, as poor as it can be. I disabled unlinking.

1 files changed, 10 insertions, 6 deletions

diff --git a/game/soul.rpy b/game/soul.rpy
index 00c0c6a..ad06017 100644
--- a/game/soul.rpy
+++ b/game/soul.rpy
@@ -266,7 +266,11 @@ screen accountdata():
                         textbutton _("Unlink"):
                             background Frame("gui/frame.png", 0, 0)
                             xysize (200, 40)
-                            action Return(["unlink", srv])
+                            ## FIXME: Omitted?
+                            if srv["Type"] != "tmwathena":
+                                action Return(["unlink", srv])
+                            else:
+                                action None
                             tooltip _("Removes a Vault account for manual login")
                     null height 40 # Padding
         frame:
@@ -430,7 +434,7 @@ label managevault:
                 $ uedit["mail"] = ""
                 $ uedit["pasd"] = ""
                 if _arg["Type"] == "tmwathena":
-                    call screen notice(_("{b}DISCLAIMER{/b}\n\nTmwAthena does not support username changes. If the vault already created an account for you, it'll always take precedence and {b}will never be truly unlinked{/b}.\nIf the Vault already created an account for you, linking will not work adequately.")))
+                    call screen notice(_("{b}DISCLAIMER{/b}\n\nTmwAthena does not support username changes. If the vault already created an account for you, it'll always take precedence and {b}will never be truly unlinked{/b}.\nIf the Vault already created an account for you, linking will not work adequately."))
                 call screen soul_linking(_("{b}External Account Linking{/b}\n\n{size=-3}Use this if you used an account with ManaVerse or ManaPlus previously, and want to use it with the Mana Launcher. Keep in mind that if you already have an account with the Launcher, nothing will happen. Both the launcher and the game account must have valid email addresses, but they don't need to be the same. Once linked, you'll no longer be able to login using ManaPlus or ManaVerse directly. The home world account cannot be (un)linked from the Vault. Once done, you'll receive an email with further instructions. To cancel, empty any of the fields.{/size}"))
                 #call screen notice(_("Sorry, not yet implemented!\n\nMail: %s\nUser: %s\nWorld: %s" % (uedit["mail"], uedit["pasd"], world)))
                 #call screen soulmsg(_("Currently, you cannot link external accounts. Keep in mind that if you already have an account, nothing will happen."))
@@ -438,7 +442,7 @@ label managevault:
                   sCode=400
                   try:
                     assert len(uedit["mail"]) > 4
-                    assert len(uedit["pasd"]) > 4
+                    assert len(uedit["pasd"]) > 3
                     assert "@" in uedit["mail"]
                     auth = {"vaultId": vaultId,
                             "token": vaultToken,
@@ -476,7 +480,7 @@ label managevault:
                 $ uedit["mail"] = ""
                 $ uedit["pasd"] = ""
                 if _arg["Type"] == "tmwathena":
-                    call screen notice(_("{b}DISCLAIMER{/b}\n\nTmwAthena does not support username changes. If the vault already created an account for you, it'll always take precedence and {b}will never be truly unlinked{/b}.\nUnlinking a TmwAthena account will disable some Mirror Lake features, but will NOT prevent the Launcher from logging in!")))
+                    call screen notice(_("{b}DISCLAIMER{/b}\n\nTmwAthena does not support username changes. If the vault already created an account for you, it'll always take precedence and {b}will never be truly unlinked{/b}.\nUnlinking a TmwAthena account will disable some Mirror Lake features, but will NOT prevent the Launcher from logging in!"))
                 call screen soul_linking(_("{b}World Account Unlinking{/b}\n\n{size=-3}This allows you to unlink a game account from your Vault account. Keep in mind that if you do not have an account with the Launcher, nothing will happen. Once unlinked, a new password will be made and sent to the supplied email. You must agree to the {a=%s}Terms of Service{/a}. To cancel, empty any of the fields.{/size}" % (_arg["Policy"])))
                 #call screen notice(_("Sorry, not yet implemented!\n\nMail: %s\nUser: %s\nWorld: %s" % (uedit["mail"], uedit["pasd"], world)))
                 #call screen soulmsg(_("Currently, you cannot unlink accounts. Keep in mind that if you do not have an account, nothing will happen."))
@@ -484,7 +488,7 @@ label managevault:
                   sCode=400
                   try:
                     assert len(uedit["mail"]) > 4
-                    assert len(uedit["pasd"]) > 4
+                    assert len(uedit["pasd"]) > 3
                     assert "@" in uedit["mail"]
                     auth = {"vaultId": vaultId,
                             "token": vaultToken,
@@ -501,7 +505,7 @@ label managevault:
                     sCode=502
                     traceback.print_exc()
                 if sCode == 200:
-                    call screen soulmsg(_("A link was sent to your email.\n\nPlease follow it before trying to access the world in the Launcher.\nIf you don't, THEN LINKING WILL BE RENDERED IMPOSSIBLE.\n\nAfter a successful linking, an Error Response 200 OK will be shown on your browser."))
+                    call screen soulmsg(_("Account was unlinked successfully!\n\nYou should go to your servers' password reset page and use the email you just informed to login using M+ again.\n\nIt is no longer possible to access the unlinked account with the Mana Launcher."))
                 elif sCode == 400:
                     call screen soulmsg(_("An error on the client happened and the request was rejected. Are you logged in, and using the latest version?"))
                 elif sCode == 403: