From 1b98adb80d7e26d5a3d0a26c0ddf0f623490b1c3 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 3 Sep 2023 20:23:42 +0300 Subject: [PATCH] Scripts version 2219 --- data_from_portwine/changelog_eng | 6 ++++- data_from_portwine/changelog_rus | 4 +++ data_from_portwine/scripts/functions_helper | 1 + .../scripts/pw_autoinstall/PW_PLARIUM_PLAY | 27 +++---------------- data_from_portwine/scripts/runlib | 3 +-- data_from_portwine/scripts/var | 2 +- 6 files changed, 15 insertions(+), 28 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index fc900aa..d728b47 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,7 +2,11 @@ You can help us in the development of the project on the website: https://linux- ----------------------------------------- Changelog: -###Scripts version 2218### Date: 02.09.2023 / Download update size: 8 megabytes +###Scripts version 2219### Date: 03.09.2023 / Download update size: 8 megabytes +* HOTFIX: Starfield +* FIX: installing dotnet 4.6.1 for Plarium Play + +###Scripts version 2218### Date: 03.09.2023 / Download update size: 8 megabytes * improved verification of RTX 4000 series video cards * added a check for NVIDIA + intel/amd hybrid graphics (thanks to Boria138) * added the variable __VK_LAYER_NV_optimus=NVIDIA_only when PRIME_RENDER_OFFLOAD is enabled (thanks to Boria138) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index e63080c..a211ed4 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2219### Дата: 03.09.2023 / Размер скачиваемого обновления: 8 мегабайт +* HOTFIX: запуск игры Starfield +* исправлена установка dotnet 4.6.1 необходимый для лончера Plarium Play + ###Scripts version 2218### Дата: 03.09.2023 / Размер скачиваемого обновления: 8 мегабайт * улучшена проверка RTX видеокарт * добавлена проверка на гибридную графику NVIDIA + intel/amd (спасибо Boria138) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index f626bd1..b047b53 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1004,6 +1004,7 @@ update_winetricks () { sed -i 's/w_metadata vcrun2015 dlls \\/w_metadata !dont_use_2015! dlls \\/' "${PORT_WINE_TMP_PATH}/winetricks" sed -i 's/w_metadata vcrun2017 dlls \\/w_metadata !dont_use_2017! dlls \\/' "${PORT_WINE_TMP_PATH}/winetricks" sed -i 's/w_metadata vcrun2019 dlls \\/w_metadata !dont_use_2019! dlls \\/' "${PORT_WINE_TMP_PATH}/winetricks" + sed -i 's/w_set_winver win2k3/w_set_winver win7/' "${PORT_WINE_TMP_PATH}/winetricks" fi return 0 } diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY index dea9177..f273791 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY @@ -3,31 +3,10 @@ ######################################################################## export LAUNCH_PARAMETERS=("/s" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/plarium_play_setup.exe" -export PW_WINDOWS_VER="7" -export PW_DLL_INSTALL="" -export LAUNCH_PARAMETERS="" +export PW_WINDOWS_VER="10" +export PW_DLL_INSTALL="dotnet461" export PW_PREFIX_NAME="PLARIUM_PLAY" -export PW_MANGOHUD="0" -export PW_MANGOHUD_x32="0" -export PW_MANGOHUD_USER_CONF="0" -export ENABLE_VKBASALT="0" -export PW_NO_ESYNC="1" -export PW_NO_FSYNC="1" -export PW_WINE_FULLSCREEN_FSR="0" -export PW_HIDE_NVIDIA_GPU="0" -export PW_VIRTUAL_DESKTOP="0" -export PW_USE_TERMINAL="0" -export PW_GUI_DISABLED_CS="0" -export PW_USE_GAMEMODE="0" -export PW_DX12_DISABLE="1" -export PW_USE_D3D_EXTRAS="0" -export PW_FIX_VIDEO_IN_GAME="0" -export PW_USE_GSTREAMER="0" -export PW_FORCE_LARGE_ADDRESS_AWARE="1" -export PW_USE_SHADER_CACHE="0" -export PW_USE_WINE_DXGI="0" -export PW_USE_EAC_AND_BE="0" -export WINEDLLOVERRIDES="" + start_portwine if try_download "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 0701226..82e820e 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -421,16 +421,15 @@ start_portwine () { else export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxgi dxvk_config" # openvr_api_dxvk fi + check_variables VKD3D_FEATURE_LEVEL "12_0" if [[ "${PW_VULKAN_USE}" == "1" ]] ; then PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_STABLE_VER}" - export VKD3D_FEATURE_LEVEL="12_0" print_info "DXVK v.${DXVK_STABLE_VER} in use" print_info "VKD3D-PROTON v.${VKD3D_STABLE_VER} in use" elif [[ "${PW_VULKAN_USE}" == "2" ]] ; then PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" - export VKD3D_FEATURE_LEVEL="12_2" print_info "DXVK v.${DXVK_GIT_VER} in use" print_info "VKD3D-PROTON v.${VKD3D_GIT_VER} in use" fi diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index ed8644f..2a1d9ab 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=2218 +#SCRIPTS_NEXT_VERSION=2219 ######################################################################## 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