diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 7220ecb0..5697d33a 100755 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -7,6 +7,13 @@ * добавить проверку количества db файлов на один exe * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2041### +* убран аргумент "-с" для функций скачивания (исправляет редкие проблемы со скачиванием на некоторых системах) +* отключен D3D12 при запуске в режимах DXVK и OpenGL +* улучшен эффект Curves.fx (менее тёмная картинка, при достаточном контрасте) +* улучшен эффект Bloom.fx (менее выраженный эффект и более естественные засветы) + + ###Scripts version 2040### * возвращен прогресс бар для запуска League of Legends * исправлено постоянное обновление префикса при запуске (при условии использовании одной версии WINE) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 03295de1..a3f05e2d 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -95,23 +95,40 @@ check_process () { try_download () { set -o pipefail - wget --no-check-certificate --content-disposition -c -t 5 -T 3 "$1" --output-document="$2" 2>&1 | \ + wget --no-check-certificate --content-disposition -t 5 -T 3 "$1" --output-document="$2" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 - [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 + if [ "${PIPESTATUS[0]}" != 0 ] ; then + print_error "failed to download $1. Skipping." + try_remove_file "$2" + return 1 + else + return 0 + fi } try_download_to_path () { set -o pipefail - wget --no-check-certificate --content-disposition -c -t 5 -T 3 "$1" --directory-prefix="$2" 2>&1 | \ + wget --no-check-certificate --content-disposition -t 5 -T 3 "$1" --directory-prefix="$2" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 - [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 + if [ "${PIPESTATUS[0]}" != 0 ] ; then + print_error "failed to download $1. Skipping." + return 1 + else + return 0 + fi } try_download_silent () { wget --no-check-certificate --content-disposition -t 2 -T 10 "$1" --output-document="$2" - [ "$?" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 + if [ "${PIPESTATUS[0]}" != 0 ] ; then + print_error "failed to download $1. Skipping." + try_remove_file "$2" + return 1 + else + return 0 + fi } zenity_error_download () { @@ -182,6 +199,8 @@ pw_vkbasalt_check () { sed -ri "s/casSharpness .*/casSharpness = ${PW_VKBASALT_FFX_CAS}/g" "${PORT_WINE_PATH}/data/vkBasalt.conf" export VKBASALT_CONFIG_FILE="${PORT_WINE_PATH}/data/vkBasalt.conf" sed -i s/'> = 0.05;'/'> = 0.035;'/ "${PW_WINELIB}/runtime/local/share/reshade/shaders/FilmGrain2.fx" + sed -i s/'> = 0.65;'/'> = 0.4;'/ "${PW_WINELIB}/runtime/local/share/reshade/shaders/Curves.fx" + sed -i s/'> = 0.8;'/'> = 0.9;'/ "${PW_WINELIB}/runtime/local/share/reshade/shaders/Bloom.fx" else export DISABLE_VKBASALT=1 fi diff --git a/data_from_portwine/scripts/portwine_db/MassEffect b/data_from_portwine/scripts/portwine_db/MassEffect index ca8dc5f6..543436ad 100755 --- a/data_from_portwine/scripts/portwine_db/MassEffect +++ b/data_from_portwine/scripts/portwine_db/MassEffect @@ -1,9 +1,10 @@ #!/bin/bash #Author: xuser - #MassEffect.exe + #MassEffect.exe + #MassEffectConfig.exe #Rating=1-5 #####################examples########################### -##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL ##export WINEDLLOVERRIDES="blabla=n,b" export PW_DLL_INSTALL="physx d3dx9" # Install DDL in port prefix (used winetricks) ##export PW_LOG=0 # Enable debug mode fo terminal @@ -23,10 +24,8 @@ export PW_DLL_INSTALL="physx d3dx9" # Install DDL in port prefi ##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue,dxr ##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP ##export PW_VIRTUAL_DESKTOP=1 ##export DXVK_HUD=fps,devinfo ##export PW_HEAP_DELAY_FREE=0 -##export PW_DXGI_FROM_DXVK=0 ##add_in_start_portwine () { commands ; } diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 3ca3b2e3..f4dd657f 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -334,7 +334,7 @@ start_portwine () { then try_copy_file "${WINEDIR}/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" fi done - var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi=b" + var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi=b;d3d12=" elif [ "${PW_VULKAN_USE}" = "1" ] ; then echo "Use VKD3D-PROTON and DXVK (DX 9-12 to vulkan)" export CP_DXVK_FILES="d3d11 d3d10 d3d10core d3d10_1 d3d9" @@ -361,6 +361,7 @@ start_portwine () { try_copy_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" var_winedlloverride_update "${wine_dxvk_dll}=n" done + var_winedlloverride_update "d3d12=" fi create_new_dir "${PORT_WINE_TMP_PATH}/dxvk_cache" export DXVK_STATE_CACHE_PATH="${PORT_WINE_TMP_PATH}"/dxvk_cache diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 7960bf55..c79fd7c1 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2040 +#SCRIPTS_NEXT_VERSION=2041 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=0