diff options
| -rw-r--r-- | game/3rdparty/manaplus.rpy | 14 | ||||
| -rw-r--r-- | game/3rdparty/manaverse.rpy | 8 | ||||
| -rw-r--r-- | game/screens.rpy | 5 |
3 files changed, 13 insertions, 14 deletions
diff --git a/game/3rdparty/manaplus.rpy b/game/3rdparty/manaplus.rpy index f3aea16..0afe9b8 100644 --- a/game/3rdparty/manaplus.rpy +++ b/game/3rdparty/manaplus.rpy @@ -56,14 +56,14 @@ init 1 python: execute("chmod +x \"%s\"" % installdir+"/ManaPlus.AppImage", shell=True) status_update("Installation successful!", 75) ######################################################### - elif renpy.windows: - if not download_manaplus("ManaPlus.zip"): - return False + #elif renpy.windows: + # if not download_manaplus("ManaPlus.zip"): + # return False - status_update("Unzipping file...", 72) - with zipfile.ZipFile(installdir+"/ManaPlus.zip", 'r') as zip_ref: - zip_ref.extractall(installdir) - status_update("Installation successful!", 75) + # status_update("Unzipping file...", 72) + # with zipfile.ZipFile(installdir+"/ManaPlus.zip", 'r') as zip_ref: + # zip_ref.extractall(installdir) + # status_update("Installation successful!", 75) ######################################################### #elif renpy.android: #elif renpy.macintosh: diff --git a/game/3rdparty/manaverse.rpy b/game/3rdparty/manaverse.rpy index a71704f..7ae498a 100644 --- a/game/3rdparty/manaverse.rpy +++ b/game/3rdparty/manaverse.rpy @@ -49,11 +49,11 @@ init 1 python: ## Detect your plataform ######################################################### if renpy.linux: - if not download_manaplus("ManaPlus.AppImage"): + if not download_manaplus("ManaVerse.AppImage"): return False status_update("Marking as executable...", 72) - execute("chmod +x \"%s\"" % installdir+"/ManaPlus.AppImage", shell=True) + execute("chmod +x \"%s\"" % installdir+"/ManaVerse.AppImage", shell=True) status_update("Installation successful!", 75) ######################################################### elif renpy.windows: @@ -77,7 +77,7 @@ init 1 python: ############################### def cli_manaverse(launch=False, download=True): global SCR_PROMPT, SCR_RESULT - ## Check if ManaPlus is already installed + ## Check if ManaPlus or ManaVerse is already installed try: MANAPLUS=os.path.exists(get_path("manaplus")) except: @@ -113,7 +113,7 @@ init 1 python: if launch: if renpy.linux: os.environ["APPIMAGELAUNCHER_DISABLE"]="1" - pathy=get_path("manaplus")+"/ManaPlus.AppImage" + pathy=get_path("manaplus")+"/ManaVerse.AppImage" return pathy.replace(" ", "\\ ") elif renpy.windows: pathy=get_path("manaplus")+"/Mana/manaplus.exe" diff --git a/game/screens.rpy b/game/screens.rpy index 4d134fe..b7dc2be 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -682,9 +682,8 @@ screen preferences(): text _("Evol2 Game Servers"): size 16 null height 5 - if not renpy.macintosh: - textbutton _("ManaVerse"): - action SetVariable("persistent.evol2cli", "manaverse") + textbutton _("ManaVerse"): + action SetVariable("persistent.evol2cli", "manaverse") textbutton _("ManaPlus"): action SetVariable("persistent.evol2cli", "manaplus") |