From f6bb00053085d736c078919d036ad2fe70f866e7 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Wed, 12 Apr 2023 18:41:07 +0300 Subject: [PATCH] Scripts version 2190 --- data_from_portwine/changelog_eng | 3 +++ data_from_portwine/changelog_rus | 3 +++ .../scripts/portwine_db/League of Legends | 19 ++----------------- .../scripts/pw_autoinstall/PW_LOL | 17 +++-------------- data_from_portwine/scripts/start.sh | 2 +- data_from_portwine/scripts/var | 2 +- 6 files changed, 13 insertions(+), 33 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 2440dee5..602cc176 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2180### +* updated versions: WINE_LOL_GE_7.0-8 (for League of Legend) + ###Scripts version 2179### * compiled and added to GitHub a new version of WINE from our project: WINE_8.5_LG (Atomic Heart videos work) * fixed videos in the Atomic Heart game (it is necessary to reinstall vkPlay from the AUTOINSTALL tab after updating the scripts) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index ca764d8e..9b693d4c 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2180### +* обновлен WINE_LOL_GE_7.0-8 (League of Legend снова работает) + ###Scripts version 2179### * скомпилирована и добавлена на GitHub версия WINE от нашего проекта: WINE_8.5_LG (работаю видеоролики в Atomic Heart) * исправлены видеоролики в игре Atomic Heart (необходимо после обновления скриптов повторно переустановить vkPlay из вкладки АВТОУСТАНОВКА) diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends index 806ad4bb..27e4d396 100755 --- a/data_from_portwine/scripts/portwine_db/League of Legends +++ b/data_from_portwine/scripts/portwine_db/League of Legends @@ -13,7 +13,7 @@ export TEXT_OPSSL="" export PW_COMMENT_DB="${TEXT_OPSSL}Dwnload and start League of Legends can take a long time" export WINEDLLOVERRIDES="mscoree,mshtml=" export LAUNCH_PARAMETERS="--launch-product=league_of_legends --launch-patchline=live" # Additional launch options -export PW_WINE_USE=WINE_LOL_GE_7.0-5 +export PW_WINE_USE=WINE_LOL_GE_7.0-8 export PW_VULKAN_USE=1 export PW_MUST_HAVE_DLL="" export PW_PREFIX_NAME="LEAGUE_OF_LEGENDS" @@ -24,22 +24,7 @@ export PW_USE_D3D_EXTRAS=1 export DXVK_STABLE_VER="1.10.3-28" ##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI -check_download_wine_ver_for_lol () { - if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then - if try_download "github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ - "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then - if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" - UNPACK_STATUS=0 - else - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" - try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" - fi - fi - [[ "${UNPACK_STATUS}" != 0 ]] && exit 1 - fi -} -check_download_wine_ver_for_lol +gui_proton_downloader silent "${PW_WINE_USE}" add_in_start_portwine () { echo "" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LOL b/data_from_portwine/scripts/pw_autoinstall/PW_LOL index b7ae791d..5e0a9055 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL @@ -6,23 +6,12 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/live.na.exe" export LAUNCH_PARAMETERS="--launch-product=league_of_legends --launch-patchline=live" export PW_MUST_HAVE_DLL="" export PW_VULKAN_USE=1 -export PW_WINE_USE=WINE_LOL_GE_7.0-5 +export PW_WINE_USE=WINE_LOL_GE_7.0-8 export WINEDLLOVERRIDES="mscoree,mshtml=" export PW_USE_D3D_EXTRAS=1 -if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then - if try_download "github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ - "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then - if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" - UNPACK_STATUS=0 - else - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" - try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" - fi - fi - [[ "${UNPACK_STATUS}" != 0 ]] && exit 1 -fi +gui_proton_downloader silent "${PW_WINE_USE}" + start_portwine if try_download "lol.secure.dyn.riotcdn.net/channels/public/x/installer/current/live.na.exe" "${PW_AUTOINSTALL_EXE}" then diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 0ae779f9..cbe919c3 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -425,7 +425,7 @@ pw_edit_db () { pw_autoinstall_from_db () { export PW_USER_TEMP="${PORT_WINE_TMP_PATH}" - export PW_FORCE_LARGE_ADDRESS_AWARE=0 + export PW_FORCE_LARGE_ADDRESS_AWARE=1 export PW_USE_GAMEMODE=0 export PW_CHECK_AUTOINSTAL=1 export PW_GUI_DISABLED_CS=1 diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 8cda2ae7..1f949c7f 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2179 +#SCRIPTS_NEXT_VERSION=2180 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt