From 2fb4fd495255629a473789938f0191f577f9ba34 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Fri, 19 Jan 2024 18:59:32 +0300 Subject: [PATCH] Scripts version 2245 --- data_from_portwine/changelog_eng | 10 ++++++++++ data_from_portwine/changelog_rus | 8 +++++++- data_from_portwine/scripts/functions_helper | 2 +- data_from_portwine/scripts/portwine_db/Caliber | 9 +++++++++ data_from_portwine/scripts/portwine_db/GalaxyClient | 1 + data_from_portwine/scripts/pw_autoinstall/PW_CALIBER | 6 ++++-- data_from_portwine/scripts/pw_autoinstall/PW_EAAPP | 3 +++ data_from_portwine/scripts/pw_autoinstall/PW_GOG | 1 + data_from_portwine/scripts/start.sh | 5 ----- data_from_portwine/scripts/var | 4 ++-- 10 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 data_from_portwine/scripts/portwine_db/Caliber diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index f14e8c06..5e6043e8 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,16 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2245### Date: 19.01.2024 / Download update size: 350 megabytes +* updated WINE_LG to version 9-0 and added fonts from proton steam +* The libs_v46 container library package has been updated +* updated MANGOHUD to version 0.7.0 in the container (thanks to Boria138) +* fixed the display of gamemode in MANGOHUD (thanks to Boria138) +* improved the functionality of selecting an nvidia graphics card with hybrid graphics +* added auto-installation of the Modern Warships game (thanks to ValoKarDin) +* the auto installer has been updated and the GOG Galaxy launcher has been fixed +* the auto installer has been updated and the operation of the CALIBER game has been fixed + ###Scripts version 2244### Date: 14.01.2024 / Download update size: 8 megabytes * updated PROTON_LG to version 8-25-2 (added fonts from proton steam) * fixed the display of the script version after reinstalling PortProton from the settings of the PortProton itself diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index f1b3251a..562074c5 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,10 +2,16 @@ ----------------------------------------- История изменений: -###Scripts version 2245### Дата: 15.01.2024 / Размер скачиваемого обновления: 8 мегабайт +###Scripts version 2245### Дата: 19.01.2024 / Размер скачиваемого обновления: 350 мегабайт +* обновлен WINE_LG до версии 9-0 и добавлены шрифты из proton steam +* обновлен пакет библиотек контейнера libs_v46 +* обновлен MANGOHUD до версии 0.7.0 в контейнере (спасибо Boria138) +* исправлено отображение работы gamemode в MANGOHUD (спасибо Boria138) * улучшен функционал выбора видеокарты nvidia с гибридной графикой * небольшие улучшения переводов * добавлена автоустановка игры Modern Warships (спасибо ValoKarDin) +* обновлен автоустановщик и исправлена работа лончера GOG Galaxy +* обновлен автоустановщик и исправлена работа игры CALIBER ###Scripts version 2244### Дата: 14.01.2024 / Размер скачиваемого обновления: 8 мегабайт * обновлен PROTON_LG до версии 8-25-2 (добавлены шрифты из proton steam) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 2b1e7ef4..dd4302a7 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -693,7 +693,7 @@ pw_download_libs () { export pw_yad_v12_3="${PW_WINELIB}/portable/bin/yad_v12_3" export pw_zstd="${PW_WINELIB}/portable/bin/zstd" export pw_7z="${PW_WINELIB}/portable/lib/p7zip/7z" - export PW_XTERM="${PW_WINELIB}/runtime/files/bin/xterm -geometry 159x37 -e" + export PW_XTERM="${PW_WINELIB}/portable/bin/xterm -geometry 159x37 -e" return 0 } diff --git a/data_from_portwine/scripts/portwine_db/Caliber b/data_from_portwine/scripts/portwine_db/Caliber new file mode 100644 index 00000000..2007257e --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Caliber @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +#Author: fidel +#caliber_launcher_pp.exe +#Rating=1-5 +#####################examples########################### +export PW_VULKAN_USE="2" +export PW_WINE_USE="WINE_LG_9-0" +export PW_PREFIX_NAME="CALIBER" +export DISABLE_CP_DEFPFX=1 diff --git a/data_from_portwine/scripts/portwine_db/GalaxyClient b/data_from_portwine/scripts/portwine_db/GalaxyClient index 05ea9d3b..0f0f3023 100755 --- a/data_from_portwine/scripts/portwine_db/GalaxyClient +++ b/data_from_portwine/scripts/portwine_db/GalaxyClient @@ -9,6 +9,7 @@ export WINEDLLOVERRIDES="galaxycommunication.exe=n;libglesv2=" export LAUNCH_PARAMETERS="/runWithoutUpdating /deelevated" export PW_PREFIX_NAME="GOG" export DISABLE_CP_DEFPFX=1 +export PW_WINE_USE=PROTON_STEAM_8.0-4 add_in_start_portwine () { diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER index 9120e1f2..7ec15477 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER @@ -4,7 +4,9 @@ export PW_PREFIX_NAME="CALIBER" export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/CaliberSetup.exe" -export PW_WINE_USE=PROTON_STEAM_6.3-8 +export PW_WINE_USE=WINE_LG_9-0 +export DISABLE_CP_DEFPFX=1 +export PORTWINE_CREATE_SHORTCUT_NAME="CALIBER" gui_proton_downloader silent "${PW_WINE_USE}" @@ -15,11 +17,11 @@ then pw_kill_autostart VC_redist.x64.exe 3 & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/1C Game Studios/Caliber/Launcher.exe" + pw_create_unique_exe "caliber_launcher_pp" try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" kill_portwine pw_stop_progress_bar - export PORTWINE_CREATE_SHORTCUT_NAME="CALIBER" portwine_create_shortcut fi stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP index 874e236e..b4fa29fa 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP @@ -4,6 +4,9 @@ export LAUNCH_PARAMETERS=("/silent" "/repair" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EAappInstaller.exe" export PW_VULKAN_USE=1 +# export PW_USE_D3D_EXTRAS="0" +# export DISABLE_CP_DEFPFX=1 +export PW_PREFIX_NAME="EAAPP" start_portwine if try_download_game "https://origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GOG b/data_from_portwine/scripts/pw_autoinstall/PW_GOG index 804dc3da..ef275dad 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG @@ -9,6 +9,7 @@ GOG_VER="$(curl "https://remote-config.gog.com/components/webinstaller?component export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/setup_galaxy_${GOG_VER}.exe" export PW_PREFIX_NAME="GOG" export DISABLE_CP_DEFPFX=1 +export PW_WINE_USE=PROTON_STEAM_8.0-4 start_portwine diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index a73ee00a..fc0ba148 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -502,11 +502,6 @@ export -f gui_credits ###MAIN### -# HOTFIX CALIBRE -if [[ ! -z "$(echo ${1} | grep '/Caliber/')" ]] ; then - export PW_WINE_USE=PROTON_STEAM_6.3-8 -fi - # CLI case "${1}" in '--help' ) diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 5e8a1022..314fde03 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -15,7 +15,7 @@ export PW_USE_TERMINAL="0" export PW_WINEDBG_DISABLE="1" export PW_WINDOWS_VER="10" export WINEARCH="win64" -export PW_LIBS_VER="_v45" +export PW_LIBS_VER="_v46" export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1" export PW_USE_D3D_EXTRAS="1" @@ -39,7 +39,7 @@ export PW_PLUGINS_VER="_v12" export PW_FAKE_DLSS_VER="230506" ###WINE_AND_PROTON_LG### export PW_PROTON_LG_VER="PROTON_LG_8-25-2" -export PW_WINE_LG_VER="WINE_LG_8-18-1" +export PW_WINE_LG_VER="WINE_LG_9-0" export PW_WINE_FULLSCREEN_FSR="1" ###DXVK_AND_VKD3D### export VKD3D_LIMIT_TESS_FACTORS="64"