###Scripts version 2049###

data_from_portwine/changelog

@@ -2,11 +2,24 @@
 -----------------------------------------
 В планах: 
 * добавить inxi в runtime и его вывод с аргументом -G в log
-* обновить контейнер до актуального состояния
-* обновить поддержку DLSS
 * добавить проверку количества db файлов на один exe
 * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
 -----------------------------------------
+###Scripts version 2049###
+* добавлено скачивание из github нового архива plugins_v1 в котором содержится d3d_extras, beclient, nvml и nvapi (ускоряет первичный запуск PortProton)
+* каталоги с новыми версиями PROTON STEAM и GE не удаляют старые версии
+* обновлён wine для League of Legends до версии WINE_LOL_GE_6.16-3 (исправляет ошибки с обновлением клиента)
+* произведен откат PROTON_STEAM к версии 6.3-7 (более стабильная версия)
+* обновлен PROTON_GE до версии 6.19-5 (6.21-2 всё еще не стабилна)
+* добавлен автоматический перезапуск игры/программы после наполнения префикса с помощью winetricks
+* реализована полная поддержка DLSS (Спасибо VHSgunzo!)
+* отдельного режима DXVK более не существует (режим VULKAN заменяет оба режима: DXVK и VKD3D)
+* добавлена переменная "DX12_DISABLE" в EDIT_DB для принудительного отключения DirectX12 
+* добавлена переменная "USE_WINE_DXGI" в EDIT_DB для принудительного использования встроенной библиотеки DXGI
+* добавлена переменная "MANGOHUD_USER_CONF" для использования системных настроек MANGOHUD (GOverlay и т.п.)
+* для удобства в интерфейсе EDIT_DB удалены приставки "PW_" (название переменных в db файлах остались без изменений)
+* копирование библиотек DXVK и VKD3D заменено созданием символьных ссылок, что немного уменьшает время загрузки порта и увеличивает срок жизни для SSD =) 
+
 ###Scripts version 2048###
 * HOTFIX - востановлена работа контейнера, vkBasalt и mangohud на системах основанных на Debian
 * DLSS работает в играх под DX11+DXVK (скоро будет работать и под DX12)
@@ -583,8 +596,8 @@ PS: не забывает для активации добавить перем
 * добавлена функция pw_clear_pfx для отчистки префикса порта во время обновления без затрагивания игр и программ
 * проверка и настройка переменных для MANGOHUD добавлены функцию pw_mangohud_check
 * версия VKD3D по умолчанию = 2.3
-* добавлена поддержка DXR (RTX) в режиме VKD3D, при условии использования переменной PW_DXR_ON=1
-* переменная PW_DXR_ON добавлена в default db
+* добавлена поддержка DXR (RTX) в режиме VKD3D, при условии использования переменной PW_USE_DXR10=1
+* переменная PW_USE_DXR10 добавлена в default db
 * переменная PW_DXVK_NO_ASYNC переименованна в PW_VULKAN_NO_ASYNC и теперь отключает асинхронные вызовы как в DXVK, так и в VKD3D
 
 ###Scripts version 1039###

data_from_portwine/scripts/lang

@@ -58,8 +58,9 @@ then
 
 	export ENABLE_VKBASALT_INFO='Включить vkBasalt по умолчанию для улучшение графики в играх работающих под Vulkan. (Горячая клавиша HOME отключает vkbasalt)'
 	export PW_NO_ESYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе eventfd. (Рекомендуется не изменять значение)'
-	export PW_NO_FSYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе фьютексов. (Автоматически отключается в системах без FUTEX_WAIT_MULTIPLE поддержки.) (Рекомендуется не изменять значение)'
-	export PW_DXR_ON_INFO='Включить поддержку Ray Tracing'
+	export PW_NO_FSYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе фьютексов. (Автоматически отключается в системах без FUTEX_WAIT_MULTIPLE поддержки) (Рекомендуется не изменять значение)'
+	export PW_USE_DXR10_INFO='Включить поддержку Ray Tracing v.1.0'
+	export PW_USE_DXR11_INFO='Включить поддержку Ray Tracing v.1.1 (бета)'
 	export PW_VULKAN_NO_ASYNC_INFO='Выключить асинхронные вызовы для режимов VULKAN и DXVK'
 	export PW_USE_NVAPI_AND_DLSS_INFO='Включить DLSS на поддерживаемых видеокартах NVIDIA'
 	export PW_OLD_GL_STRING_INFO='Принудительное использование старых версий OpenGL'
@@ -76,6 +77,9 @@ then
 	export PW_USE_RUNTIME_INFO='Использовать контейнерный режим запуска (Рекомендуется не изменять значение)'
 	export PW_MANGOHUD_INFO='Использование мониторинга FPS и нагрузки системы (Включается и выключается сочитанием клавиш - правый Shift + F12)'
 	export PW_USE_GAMEMODE_INFO='Использование автоматической оптимизации системы для увеличения производительности в играх (при условии установленного пакета gamemode в системе)'
+	export PW_DX12_DISABLE_INFO='Принудительное отключение DirectX 12'
+	export PW_USE_WINE_DXGI_INFO='Принудительное использование встроенной библиотеки DXGI (в редких случаях решает проблемы с запуском игр под DX12)'
+	export PW_MANGOHUD_USER_CONF_INFO='Принудительное использование системных настроек MANGOHUD (GOverlay и т.п.)'
 
 	export PW_3DFX_INFO='Имитация старого графического ускорителя 3dfx (добавляет горизонтальные полосы)'
 	export PW_AdaptiveSharpen_INFO='Увеличение резкости, можно использовать совместо с CAS'

data_from_portwine/scripts/portwine_db/Anno4

@@ -10,7 +10,7 @@ export PW_COMMENT_DB="If after the first launch you see a black screen,\njust re
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 export PW_WINE_USE=PROTON_GE
 export PW_VULKAN_USE=dxvk
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/AnomalyLauncher

@@ -10,7 +10,7 @@ export PW_DLL_INSTALL="d3dx10 d3dx11_42 d3dx11_43"               # Install DDL i
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 export PW_WINE_USE=proton_ge
 export PW_VULKAN_USE=dxvk
-export PW_DXR_ON=0
+export PW_USE_DXR10=0
 export PW_VULKAN_NO_ASYNC=0
 export PW_USE_NVAPI_AND_DLSS=0
 export PW_OLD_GL_STRING=0

data_from_portwine/scripts/portwine_db/Arthur

@@ -13,7 +13,7 @@ export PW_VULKAN_USE=dxvk
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
 ##export PW_DXVK_VER=1.8.1 
 ##export PW_VKD3D_VER=2.2
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/Battle.net_Launcher

@@ -5,14 +5,13 @@
 #Battle.net.exe
 #Rating=5
 ################################################
-export PW_COMMENT_DB="We recommend using PROTON_GE + VULKAN!"
+#export PW_COMMENT_DB="We recommend using PROTON_GE + VULKAN!"
 export PW_WINE_USE=PROTON_GE
 export PW_VULKAN_USE=1
 export LAUNCH_PARAMETERS=""
 export WINEDLLOVERRIDES="locationapi="
 export PW_DLL_INSTALL="vcrun2019 d3dx11_42 d3dx11_43"
 export PW_WINDOWS_VER=10
-export PW_USE_NVAPI_AND_DLSS=0
 
 add_in_start_portwine () {
     rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/ProgramData/Agent/data"

data_from_portwine/scripts/portwine_db/Biomutant

@@ -10,7 +10,7 @@ export PW_VULKAN_USE=1
 export PW_DLL_INSTALL="vcrun2019"               # Install DDL in port prefix (used winetricks) 
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/Control_DX11

@@ -15,7 +15,7 @@ export PW_DLL_INSTALL="physx"
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/Control_DX12

@@ -5,7 +5,7 @@
 ########################################################
 export PW_VULKAN_USE=vkd3d
 export PW_COMMENT_DB="Control (DX12)"
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_MANGOHUD=1
 export PW_DLL_INSTALL="physx"
 export WINEDLLOVERRIDES="d3d12,d3d_rmdwin10_f,renderer_rmdwin10_f,app_rmdwin10_f,input_rmdwin10_f,renderer_rmdwin10_f,physics_rmdwin10_f,snd_rmdwin10_f,ui_rmdwin10_f=n"
@@ -15,7 +15,7 @@ export WINEDLLOVERRIDES="d3d12,d3d_rmdwin10_f,renderer_rmdwin10_f,app_rmdwin10_f
 ##export PW_DLL_INSTALL="vcrun2017"               # Install DDL in port prefix (used winetricks) 
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/DaysGone

@@ -10,7 +10,7 @@ export PW_VULKAN_USE=dxvk
 export PW_DLL_INSTALL="vcrun2019"               # Install DDL in port prefix (used winetricks) 
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/EpicGamesLauncher

@@ -3,7 +3,7 @@
 #EpicGamesLauncher.exe
 #Rating=5
 ##############################################
-export PW_COMMENT_DB="PortWINE database file for Epic Games Launcher was found.\nFor GTA5 it is recommended to use DXVK."
+#export PW_COMMENT_DB="PortWINE database file for Epic Games Launcher"
 export PW_WINE_USE=PROTON_GE
 export PW_VULKAN_USE=1
 export LAUNCH_PARAMETERS="-opengl -SkipBuildPatchPrereq"

data_from_portwine/scripts/portwine_db/Esprit_Games

@@ -9,7 +9,7 @@ export PW_WINDOWS_VER=7                        # Set windows version 10, 7 or XP
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_NVAPI_DISABLE=1
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/FL64

@@ -13,7 +13,7 @@ export WINEDLLOVERRIDES="FLEngine,FLEngine_x64=n"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_DXVK_VER=1.8.1 
 ##export PW_VKD3D_VER=2.2
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=0

data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d11

@@ -13,7 +13,7 @@ export PW_DLL_INSTALL="d3dx11_42 d3dx11_43"
 ##export PW_DLL_INSTALL="vcrun2017"               # Install DDL in port prefix (used winetricks) 
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/Far_Cry_3_d3d9

@@ -13,7 +13,7 @@ export PW_VULKAN_USE=0
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/Far_Cry_4

@@ -11,7 +11,7 @@ export PW_DLL_INSTALL="d3dcompiler_43 d3dcompiler_47"               # Install DD
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/League of Legends

@@ -15,10 +15,10 @@ export PW_COMMENT_DB="${TEXT_OPSSL}Dwnload and start League of Legends can take
 ##export PW_DLL_INSTALL="vcrun2017"               # Install DDL in port prefix (used winetricks)
 ##export WINEDLLOVERRIDES="blabla=n,b"
 export LAUNCH_PARAMETERS=("--launch-product=league_of_legends" "--launch-patchline=live")                # Additional launch options
-export PW_WINE_USE=WINE_LOL_GE_6.16-2
+export PW_WINE_USE=WINE_LOL_GE_6.16-3
 export PW_VULKAN_USE=1
 export PW_MUST_HAVE_DLL=""
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1
@@ -37,8 +37,6 @@ export PW_NO_ESYNC=1                            # Do not use eventfd-based in-pr
 ##export PW_WINE_ALLOW_XIM=1                      # Disable XIM support until libx11 >= 1.7 is widespread
 ##export WINEARCH=win32                             # defaut = win64
 ##export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_lol"
-export PW_MONO_VER="6.3.0"
-export PW_GECKO_VER="2.47.2"
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
 ##export PW_USE_TERMINAL=1                        # Force run in terminal
 ##export PW_GUI_DISABLED_CS=1                     # 1 = disabled GUI

data_from_portwine/scripts/portwine_db/MikuMikuDance

@@ -9,7 +9,7 @@
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/NovaRO

@@ -15,7 +15,7 @@ export PW_DLL_INSTALL="d3dcompiler_42 d3dcompiler_43 d3dx9"
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
 ##export PW_DXVK_VER=1.8.1 
 ##export PW_VKD3D_VER=2.2
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/Origin

@@ -13,7 +13,7 @@ export PW_DLL_INSTALL="vcrun2010 vcrun2012 vcrun2019 d3dcompiler_43 d3dcompiler_
 export PW_VULKAN_USE=1                       # dxvk, vkd3d or 0 for OpenGL
 ##export PW_DXVK_VER=1.8.1 
 ##export PW_VKD3D_VER=2.2
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=0

data_from_portwine/scripts/portwine_db/SR2_pc

@@ -8,7 +8,7 @@ export PW_DLL_INSTALL="faudio"               # Install DDL in port prefix (used
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/Sam3

@@ -14,7 +14,7 @@ export PULSE_LATENCY_MSEC=150
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
 ##export PW_DXVK_VER=1.8.1 
 ##export PW_VKD3D_VER=2.2
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/Torchlight

@@ -16,7 +16,7 @@ export PW_VKBASALT_FFX_CAS="1"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_WINE_USE=PROTON_GE                    # PROTON_STEAM or PROTON_GE
 ##export PW_VULKAN_USE=vkd3d                      # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/UNDERTALE

@@ -13,7 +13,7 @@ export PW_VULKAN_USE=dxvk
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_WINE_USE=proton_ge                    # proton_steam or proton_ge
 ##export PW_VULKAN_USE=vkd3d                      # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/default

@@ -12,7 +12,7 @@
 
 ##export PW_WINE_USE=PROTON_GE                    # PROTON_STEAM or PROTON_GE
 ##export PW_VULKAN_USE=1                          # 1 ,dxvk or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_DLSS_ON=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0

data_from_portwine/scripts/portwine_db/fc3_blooddragon_d3d11

@@ -10,7 +10,7 @@ export WINEDLLOVERRIDES=xaudio2_7=n,b
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 export PW_WINE_USE=PROTON_GE
 export PW_VULKAN_USE=dxvk
-export PW_DXR_ON=0
+export PW_USE_DXR10=0
 export PW_VULKAN_NO_ASYNC=0
 export PW_USE_NVAPI_AND_DLSS=0
 export PW_OLD_GL_STRING=0

data_from_portwine/scripts/portwine_db/ghost

@@ -12,7 +12,7 @@ export PW_WINE_USE=proton_ge
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/iw4sp

@@ -18,7 +18,7 @@
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
 ##export PW_DXVK_VER=1.8.1 
 ##export PW_VKD3D_VER=2.2
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=0

data_from_portwine/scripts/portwine_db/osu

@@ -13,7 +13,7 @@ export PW_COMMENT_DB="OSU!"
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_NVAPI_DISABLE=1
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/setup

@@ -8,7 +8,8 @@
 #export PW_COMMENT_DB="blablabla"
 ################################################
 export PW_VULKAN_USE=0 #dxvk or vkd3d
-export PW_WINE_USE=PROTON_STEAM
+export PW_MANGOHUD=0
+#export PW_WINE_USE=PROTON_STEAM
 #export WINEDLLOVERRIDES="blabla=n,b"
 #export PW_LOG=0             # Enable debug mode fo terminal
 export PW_NO_FSYNC=1        # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
@@ -27,5 +28,4 @@ export PW_USE_GAMEMODE=0             # Force disabele gamemod
 #export PULSE_LATENCY_MSEC=60
 export PW_DLL_INSTALL="mfc42 vcrun2012 mfc120 vcrun2013"
 #export LAUNCH_PARAMETERS="-d3d9"
-export PW_GUI_DISABLED_CS=1
 #export PW_WINDOWS_VER=XP                      # Set windows version 10, 7 or XP

data_from_portwine/scripts/portwine_db/sprally2

@@ -14,7 +14,7 @@ export PW_OLD_GL_STRING=1
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_WINE_USE=proton_ge                    # proton_steam or proton_ge
 ##export PW_VULKAN_USE=vkd3d                      # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/trine

@@ -9,7 +9,7 @@ export PW_DLL_INSTALL="physx"               # Install DDL in port prefix (used w
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-##export PW_DXR_ON=1
+##export PW_USE_DXR10=1
 ##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
 ##export PW_USE_NVAPI_AND_DLSS=0
 ##export PW_OLD_GL_STRING=1

data_from_portwine/scripts/portwine_db/witcher3

@@ -2,8 +2,6 @@
 #Author: xuser
 #witcher3.exe
 #Rating=1-5
-########################################################
-export PW_VULKAN_USE=dxvk
 #####################examples###########################
 ##export PW_COMMENT_DB="blablabla"
 ##export PW_WINDOWS_VER=10                        # Set windows version 10, 7 or XP
@@ -11,7 +9,6 @@ export PW_VULKAN_USE=dxvk
 ##export WINEDLLOVERRIDES="blabla=n,b"
 ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')"                # Additional launch options
 ##export PW_VULKAN_USE=dxvk                       # dxvk, vkd3d or 0 for OpenGL
-export PW_DXR_ON=0
 export PW_VULKAN_NO_ASYNC=0
 ##export PW_NVAPI_DISABLE=1
 export PW_OLD_GL_STRING=0

data_from_portwine/scripts/pw_autoinstall/PW_LOL

@@ -4,10 +4,10 @@
 export LAUNCH_PARAMETERS=("/q" )
 export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/live.na.exe"
 export LAUNCH_PARAMETERS=("--launch-product=league_of_legends" "--launch-patchline=live")
-export VERSION_WINE_FOR_LOL="WINE_LOL_GE_6.16-2"
+export VERSION_WINE_FOR_LOL="WINE_LOL_GE_6.16-3"
 export PW_MUST_HAVE_DLL=""
 if [ ! -d "${PORT_WINE_PATH}/data/dist/${VERSION_WINE_FOR_LOL}" ] ; then
-    if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/WINE_LOL_GE_6.16-2/${VERSION_WINE_FOR_LOL}.tar.xz" \
+    if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${VERSION_WINE_FOR_LOL}/${VERSION_WINE_FOR_LOL}.tar.xz" \
     "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_FOR_LOL}.tar.xz" ; then
         if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_FOR_LOL}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then
             try_remove_file "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_FOR_LOL}.tar.xz"
@@ -19,8 +19,8 @@ if [ ! -d "${PORT_WINE_PATH}/data/dist/${VERSION_WINE_FOR_LOL}" ] ; then
     fi
     [[ "${UNPACK_STATUS}" != 0 ]] && exit 1
 fi
-export PW_WINE_USE=WINE_LOL_GE_6.16-2
-export PW_VULKAN_USE=dxvk
+export PW_WINE_USE=WINE_LOL_GE_6.16-3
+export PW_VULKAN_USE=1
 start_portwine
 if try_download "https://lol.secure.dyn.riotcdn.net/channels/public/x/installer/current/live.na.exe" "${PW_AUTOINSTALL_EXE}"
 then

data_from_portwine/scripts/start.sh

@@ -94,8 +94,8 @@ portwine_start_debug () {
     echo "GLIBC version:" >> "${PORT_WINE_PATH}/${portname}.log"
     echo `ldd --version | grep -m1 ldd | awk '{print $NF}'` >> "${PORT_WINE_PATH}/${portname}.log"
     echo "--------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-    if [ "${PW_VULKAN_USE}" = "0" ]; then echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DX9-11 to OpenGL" >> "${PORT_WINE_PATH}/${portname}.log"
-    elif [ "${PW_VULKAN_USE}" = "dxvk" ]; then  echo "PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORT_WINE_PATH}/${portname}.log"
+    if [ "${PW_VULKAN_USE}" = "0" ]
+    then echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DX9-11 to OpenGL" >> "${PORT_WINE_PATH}/${portname}.log"
     else echo "PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORT_WINE_PATH}/${portname}.log"
     fi
     echo "--------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
@@ -203,7 +203,7 @@ pw_winereg () {
 pw_winetricks () {
     update_winetricks
     export PW_USE_TERMINAL=1
-    export PW_WINE_VER="PROTON_STEAM"
+    export PW_WINE_VER="${PW_PROTON_STEAM_VER}"
     init_wine_ver
     cabextract_fix
     start_portwine
@@ -212,9 +212,10 @@ pw_winetricks () {
 }
 
 pw_edit_db () {
-    pw_gui_for_edit_db PW_MANGOHUD ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_DXR_ON PW_VULKAN_NO_ASYNC PW_USE_NVAPI_AND_DLSS \
-    PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_FORCE_USE_VSYNC PW_VIRTUAL_DESKTOP PW_WINEDBG_DISABLE PW_USE_TERMINAL \
-    PW_WINE_ALLOW_XIM PW_HEAP_DELAY_FREE PW_NO_WRITE_WATCH PW_GUI_DISABLED_CS PW_USE_GSTREAMER PW_USE_RUNTIME PW_USE_GAMEMODE
+    pw_gui_for_edit_db PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_DXR10 PW_USE_DXR11 \
+    PW_VULKAN_NO_ASYNC PW_USE_NVAPI_AND_DLSS PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_FORCE_USE_VSYNC PW_VIRTUAL_DESKTOP \
+    PW_WINEDBG_DISABLE PW_USE_TERMINAL PW_WINE_ALLOW_XIM PW_HEAP_DELAY_FREE PW_NO_WRITE_WATCH PW_GUI_DISABLED_CS \
+    PW_USE_GSTREAMER PW_USE_RUNTIME PW_USE_GAMEMODE PW_DX12_DISABLE PW_USE_WINE_DXGI
     if [ "$?" == 0 ] ; then
         /bin/bash -c ${pw_full_command_line[*]} &
         exit 0
@@ -231,16 +232,18 @@ pw_autoinstall_from_db () {
     export PW_NO_WRITE_WATCH=0
     export PW_VULKAN_USE=0
     unset PW_WINE_VER
-    export PW_WINE_USE=PROTON_STEAM
+    export PW_WINE_USE=${PW_PROTON_STEAM_VER}
     export PW_NO_FSYNC=1
     export PW_NO_ESYNC=1
     unset PORTWINE_CREATE_SHORTCUT_NAME
     export PW_DISABLED_CREATE_DB=1
+    export PW_MANGOHUD=0
+    export ENABLE_VKBASALT=0
     . "${PORT_SCRIPTS_PATH}/pw_autoinstall/${PW_YAD_SET}"
 }
 
 ###MAIN###
-PW_ALL_DIST=`ls "${PORT_WINE_PATH}/data/dist/" | sed -e s/"PROTON_GE$//g" | sed -e s/"PROTON_STEAM$//g"`
+PW_ALL_DIST=`ls "${PORT_WINE_PATH}/data/dist/" | sed -e s/"${PW_PROTON_GE_VER}$//g" | sed -e s/"${PW_PROTON_STEAM_VER}$//g"`
 unset DIST_ADD_TO_GUI
 for DAIG in ${PW_ALL_DIST}
 do
@@ -250,24 +253,23 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then
     [ -z "${PW_COMMENT_DB}" ] && PW_COMMENT_DB="PortWINE database file for "\"${PORTWINE_DB}"\" was found."
     if [[ -z "${PW_VULKAN_USE}" || -z "${PW_WINE_USE}" ]] ; then
         unset PW_GUI_DISABLED_CS
-        [ -z "${PW_VULKAN_USE}" ] && export PW_VULKAN_USE=dxvk
-        [ -z "${PW_WINE_USE}" ] && export PW_WINE_USE=PROTON_STEAM
+        [ -z "${PW_VULKAN_USE}" ] && export PW_VULKAN_USE=1
+        [ -z "${PW_WINE_USE}" ] && export PW_WINE_USE=${PW_PROTON_STEAM_VER}
     fi
     case "${PW_VULKAN_USE}" in
-        "dxvk") export PW_DEFAULT_VULKAN_USE='DXVK (DX 9-11 to Vulkan)!VULKAN (DXVK and VKD3D)!OPENGL ' ;;
-            "0") export PW_DEFAULT_VULKAN_USE='OPENGL !VULKAN (DXVK and VKD3D)!DXVK  (DX 9-11 to Vulkan)' ;;
-              *) export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!DXVK  (DX 9-11 to Vulkan)!OPENGL ' ;;
+            "0") export PW_DEFAULT_VULKAN_USE='OPENGL !VULKAN (DXVK and VKD3D)' ;;
+              *) export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!OPENGL ' ;;
     esac
     case "${PW_WINE_USE}" in
-        "PROTON_GE") export PW_DEFAULT_WINE_USE="PROTON_GE  (${PW_GE_VER})!PROTON_STEAM  (${PW_STEAM_VER})${DIST_ADD_TO_GUI}" ;;
-        "PROTON_STEAM") export PW_DEFAULT_WINE_USE="PROTON_STEAM  (${PW_STEAM_VER})!PROTON_GE  (${PW_GE_VER})${DIST_ADD_TO_GUI}" ;;
+        "${PW_PROTON_GE_VER}") export PW_DEFAULT_WINE_USE="${PW_PROTON_GE_VER}!${PW_PROTON_STEAM_VER}${DIST_ADD_TO_GUI}" ;;
+        "${PW_PROTON_STEAM_VER}") export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" ;;
         *)
             export DIST_ADD_TO_GUI=`echo ${DIST_ADD_TO_GUI} | sed -e s/"\!${PW_WINE_USE}$//g"`
-            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!PROTON_STEAM  (${PW_STEAM_VER})!PROTON_GE  (${PW_GE_VER})${DIST_ADD_TO_GUI}" ;;
+            export PW_DEFAULT_WINE_USE="${PW_WINE_USE}!${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" ;;
     esac
 else
-    export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!DXVK  (DX 9-11 to Vulkan)!OPENGL '
-    export PW_DEFAULT_WINE_USE="PROTON_STEAM  (${PW_STEAM_VER})!PROTON_GE  (${PW_GE_VER})${DIST_ADD_TO_GUI}"
+    export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!OPENGL '
+    export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}"
     unset PW_GUI_DISABLED_CS
 fi
 if [ ! -z "${portwine_exe}" ]; then
@@ -355,11 +357,11 @@ else
 
     "${pw_yad}" --plug=${KEY} --tabnum=1 --columns=3 --form --separator=";" \
     --image "$PW_GUI_ICON_PATH/port_proton.png" \
-    --field=":CB" "VULKAN (DXVK and VKD3D)!DXVK  (DX 9-11 to Vulkan)!OPENGL" \
+    --field=":CB" "VULKAN (DXVK and VKD3D)!OPENGL" \
     --field=":LBL" "" \
     --field='DEBUG'!!"${loc_debug}":"BTN" '@bash -c "button_click DEBUG"' \
     --field='WINECFG'!!"${loc_winecfg}":"BTN" '@bash -c "button_click WINECFG"' \
-    --field=":CB" "PROTON_STEAM  (${PW_STEAM_VER})!PROTON_GE  (${PW_GE_VER})${DIST_ADD_TO_GUI}" \
+    --field=":CB" "${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}" \
     --field=":LBL" "" \
     --field='WINEFILE'!!"${loc_winefile}":"BTN" '@bash -c "button_click WINEFILE"' \
     --field='WINECMD'!!"${loc_winecmd}":"BTN" '@bash -c "button_click WINECMD"' \
@@ -385,11 +387,10 @@ else
         try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan"
     fi
 fi
-if [ ! -z "${VULKAN_MOD}" ] ; then
-    if [ "${VULKAN_MOD}" = "DXVK" ] ; then export PW_VULKAN_USE="dxvk"
-    elif [ "${VULKAN_MOD}" = "VULKAN" ]; then export PW_VULKAN_USE="1"
-    elif [ "${VULKAN_MOD}" = "OPENGL" ]; then export PW_VULKAN_USE="0"
-    fi
+
+if [[ ! -z "${VULKAN_MOD}" && "${VULKAN_MOD}" = "OPENGL" ]] 
+then export PW_VULKAN_USE="0"
+else export PW_VULKAN_USE="1"
 fi
 
 init_wine_ver

data_from_portwine/scripts/var

 #!/bin/bash
 #Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_NEXT_VERSION=2048
+#SCRIPTS_NEXT_VERSION=2049
 #PORT_NEXT_VERSION=97
 ########################################################################
 export PW_MANGOHUD=1
@@ -21,7 +21,7 @@ export PW_FORCE_USE_VSYNC=2
 export PW_LOG=0
 export PW_TERM=""
 export PW_USE_TERMINAL=0
-export PW_MUST_HAVE_DLL="d3dx9_43 physx mfc42 vcrun2019 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9"
+export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019"
 export PW_WINEDBG_DISABLE=1
 export PW_WINDOWS_VER="10"
 export WINEARCH="win64"
@@ -33,16 +33,13 @@ export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
 export WINE_WIN_START="start.exe /i /unix"
 ###DEFAULT_WINE###
 export PW_WINE_USE=PROTON_STEAM
+export PW_PLUGINS_VER="_v1"
 ###WINE_PROTON_STEAM###
-export PW_STEAM_VER="6.3-8"
+export PW_STEAM_VER="6.3-7"
 export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}"
-export PW_MONO_VER="6.4.1"
-export PW_GECKO_VER="2.47.2"
 ###WINE_PROTON_GE###
-export PW_GE_VER="6.19-4"
+export PW_GE_VER="6.19-5"
 export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}"
-export PW_MONO_GE_VER="6.4.0"
-export PW_GECKO_GE_VER="2.47.2"
 export WINE_FULLSCREEN_FSR="1"
 export WINE_FULLSCREEN_FSR_STRENGTH="2"
 #################################################################