diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 294ca73b..bba0550c 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -833,25 +833,6 @@ pw_check_and_download_plugins () { return 0 } -check_nvidia_rtx () { - if [[ ! -z $(echo "$LSPCI_VGA" | grep -i "nvidia") ]]; then - # Turing (without nvidia 16XX) - [[ "$LSPCI_VGA" == *TU[0-9]* ]] && [[ "$LSPCI_VGA" != *TU11[6-7]* ]] && return 0 - # Ampere - [[ "$LSPCI_VGA" == *GA[0-9]* ]] && return 0 - # Ada_Lovelace - [[ "$LSPCI_VGA" == *AD[0-9]* ]] || [[ "$LSPCI_VGA" == *2[6-8][0-9]* ]] && return 0 - fi - return 1 -} - -check_hybrid_graphicks () { - if [[ ! -z "$(echo "$LSPCI_VGA" | grep -i nvidia | grep -i -E '(intel|amd)')" ]] - then return 0 - else return 1 - fi -} - pw_init_db () { if [[ -f "${portwine_exe}" ]] ; then export PORTWINE_DB="$(basename "${portwine_exe}" .exe)" @@ -919,13 +900,6 @@ pw_init_db () { export PW_WINE_CPU_TOPOLOGY="8:0,1,2,3,4,5,6,7" print_info "Automatic added fix for unity games: WINE_CPU_TOPOLOGY=8:0,1,2,3,4,5,6,7" fi - - if check_nvidia_rtx ; then - check_variables PW_USE_NVAPI_AND_DLSS "1" - check_variables PW_USE_FAKE_DLSS "0" - check_variables PW_USE_RAY_TRACING "1" - fi - check_hybrid_graphicks && check_variables PW_PRIME_RENDER_OFFLOAD "1" fi [[ "${START_FROM_STEAM}" == 1 ]] && export PW_GUI_DISABLED_CS=1 return 0 diff --git a/data_from_portwine/scripts/portwine_db/lgc b/data_from_portwine/scripts/portwine_db/lgc index 8277d209..68d5f3e1 100755 --- a/data_from_portwine/scripts/portwine_db/lgc +++ b/data_from_portwine/scripts/portwine_db/lgc @@ -12,7 +12,6 @@ export WINEDLLOVERRIDES="" export PW_DLL_INSTALL="lucida" # Install DLL in port prefix (used winetricks) export PW_USE_D3D_EXTRAS="1" export PW_USE_EAC_AND_BE="0" -export PW_PREFIX_NAME="LGC" add_in_start_portwine () { if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml" ]] ; then diff --git a/data_from_portwine/scripts/portwine_db/steam b/data_from_portwine/scripts/portwine_db/steam index e9b5813f..99cafba8 100755 --- a/data_from_portwine/scripts/portwine_db/steam +++ b/data_from_portwine/scripts/portwine_db/steam @@ -3,12 +3,17 @@ #steam.exe #Rating=5 ################################################ -export PW_COMMENT_DB="Steam" +if [ "${update_loc}" = "RUS" ] ; then + export PW_COMMENT_DB="Если у вас моргает интерфейс отключите в настройках Steam всё что связано с аппаратным ускорением или декодированием" +fi +if [ "${update_loc}" = "ENG" ] ; then + export PW_COMMENT_DB="If you have a blinking interface, disable anything related to hardware acceleration or decoding in Steam settings" +fi export PW_WINDOWS_VER="10" -export PW_DLL_INSTALL="vcrun2019 d3dcompiler_46" -export WINEDLLOVERRIDES="OnlineFix64,SteamOverlay64,steam_api,steam_api64,steamclient,steamclient64=n;winmm=n,b" +export PW_DLL_INSTALL="vcrun2022 d3dcompiler_46 physx" +export WINEDLLOVERRIDES="OnlineFix64=n;SteamOverlay64=n;winmm=n,b;dnet=n;steam_api64=n" export LAUNCH_PARAMETERS="-gamepadui -fullscreen -no-dwrite" -export PW_VULKAN_USE="1" +export PW_PREFIX_NAME="STEAM" add_in_start_portwine () { echo "Disabled silent autostart steam." diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LGC b/data_from_portwine/scripts/pw_autoinstall/PW_LGC index 793e7da6..5ec11b12 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LGC @@ -3,7 +3,6 @@ ######################################################################## export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Lesta_Game_Center_Install_RU.exe" -export PW_PREFIX_NAME="LGC" start_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM index 6a3e87af..5c8a49c4 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM +++ b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM @@ -3,6 +3,7 @@ ######################################################################## export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Steam") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SteamSetup.exe" +export PW_PREFIX_NAME="STEAM" start_portwine if try_download_game "https://cdn.cloudflare.steamstatic.com/client/installer/SteamSetup.exe" "${PW_AUTOINSTALL_EXE}" then diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WGC b/data_from_portwine/scripts/pw_autoinstall/PW_WGC index 664a8bd7..2edd11d7 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WGC @@ -4,7 +4,6 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") [ "${update_loc}" = "RUS" ] && export WGC_LOC=RU || export WGC_LOC=EU export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" -export PW_PREFIX_NAME="WGC" start_portwine