Prepare to migrate from Moubootaur Legends to The Mana World

aka. Moving from Alpha to Beta

2 files changed, 12 insertions, 11 deletions

diff --git a/game/core.rpy b/game/core.rpy
index 0e09f0b..3072aab 100644
--- a/game/core.rpy
+++ b/game/core.rpy
@@ -151,21 +151,22 @@ init -3 python:
         VAULT_HOST = "https://localhost:13370"
         VAULT_CERT = "http://localhost/launcher/cert.pem"
     else:
-        VAULT_HOST = "https://api.tmw2.org:13370"
-        VAULT_CERT = "https://tmw2.org/launcher/cert.pem"
+        VAULT_HOST = "https://api.themanaworld.org:13370"
+        VAULT_CERT = False#"https://tmw2.org/launcher/cert.pem"
 
     ###################
     # Vault SSL wrapper
     vault=requests.Session()
-    vault.cert = get_path("cert.pem")
-    vault.verify = get_path("cert.pem")
+    if VAULT_CERT:
+        vault.cert = get_path("cert.pem")
+        vault.verify = get_path("cert.pem")
 
     ############################################################################
     ## Retrieve the Vault certificate. Otherwise, we cannot proceed.
     ## From here and until the end of this code block,
     ## ALL ERRORS ARE FATAL
     def build_vault():
-        while True:
+        while VAULT_CERT:
             try:
                 ######################################
                 # Fetch a new PEM Certificate
diff --git a/lite.py b/lite.py
index 7b8506b..38ecff7 100755
--- a/lite.py
+++ b/lite.py
@@ -18,13 +18,14 @@ serverlist = []
 #VAULT_HOST = "https://localhost:13370"
 #VAULT_CERT = "http://localhost/launcher/cert.pem"
 #SERVERLIST = "http://localhost/launcher"
-VAULT_HOST = "https://api.tmw2.org:13370"
-VAULT_CERT = "https://tmw2.org/launcher/cert.pem"
+VAULT_HOST = "https://api.themanaworld.org:13370"
+VAULT_CERT = False #"https://tmw2.org/launcher/cert.pem"
 SERVERLIST = "https://tmw2.org/launcher"
 # Vault SSL wrapper
 vault=requests.Session()
-vault.cert = "cert.pem"
-vault.verify = "cert.pem"
+if VAULT_CERT:
+    vault.cert = "cert.pem"
+    vault.verify = "cert.pem"
 #####################################
 
 def stdout(message, bd=False):
@@ -171,7 +172,7 @@ os.environ["APPIMAGELAUNCHER_DISABLE"]="1"
 #################################################################################
 ## Build the Vault interface (infinite loop)
 
-while True:
+while VAULT_CERT:
     try:
         ######################################
         # Fetch a new PEM Certificate
@@ -232,7 +233,6 @@ try:
             print("exit - Closes the program")
             print("connect <world> - Connects to <world>")
             print("")
-            print("Type the world name and it'll be run.")
             print("You need ManaPlus installed for Evol2 worlds.")
         elif cmd in ["list", "servers"]:
             for w in serverlist: