diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index d728b47a..09b4fc4e 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,14 @@ You can help us in the development of the project on the website: https://linux- ----------------------------------------- Changelog: +###Scripts version 2220### Date: 17.09.2023 / Download update size: 260 megabytes +* HOTFIX: Plarium Play +* HOTFIX: World of Warships +* updated versions: + DXVK_GIT_VER 2.3-5 + VKD3D_GIT_VER 1.1-3622 +* updated PROTON_LG to version 8-15 + ###Scripts version 2219### Date: 03.09.2023 / Download update size: 8 megabytes * HOTFIX: Starfield * FIX: installing dotnet 4.6.1 for Plarium Play diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index a211ed4c..62f00df8 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,14 @@ ----------------------------------------- История изменений: +###Scripts version 2220### Дата: 17.09.2023 / Размер скачиваемого обновления: 260 мегабайт +* HOTFIX: установка Plarium Play перенесена в префикс DOTNET +* HOTFIX: Запуск игры Мир Кораблей (для исправления запустите автоустановку Lesta Game Center) +* обновлены версии: + DXVK_GIT_VER 2.3-5 + VKD3D_GIT_VER 1.1-3622 +* обновлен PROTON_LG до версии 8-15 + ###Scripts version 2219### Дата: 03.09.2023 / Размер скачиваемого обновления: 8 мегабайт * HOTFIX: запуск игры Starfield * исправлена установка dotnet 4.6.1 необходимый для лончера Plarium Play @@ -36,7 +44,7 @@ sniper 0.20230718.55074 * добавлено автоматическое определение видеокарт NVIDIA RTX (спасибо Boria138) * добавлено автоматическое включение поддержки DLSS и RAY TRACING для видеокарт NVIDIA RTX -* добавлена проверка на версию Vulkan API для совместимости с видеокарами без Vulkan API 1.3 +* добавлена проверка на версию Vulkan API для совместимости с видеокартами без Vulkan API 1.3 ###Scripts version 2215### Дата: 18.08.2023 / Размер скачиваемого обновления: 8 мегабайт * добавлено зеркало скриптов: https://gitlab.eterfund.ru/Castro-Fidel/ diff --git a/data_from_portwine/scripts/portwine_db/PlariumPlay b/data_from_portwine/scripts/portwine_db/PlariumPlay index 4713d2bf..f31e228c 100644 --- a/data_from_portwine/scripts/portwine_db/PlariumPlay +++ b/data_from_portwine/scripts/portwine_db/PlariumPlay @@ -4,29 +4,7 @@ #Rating=1-5 #####################examples########################### ##export PW_COMMENT_DB="blablabla" -export PW_WINDOWS_VER="7" -export PW_DLL_INSTALL="" -export LAUNCH_PARAMETERS="" +export PW_WINDOWS_VER="10" export PW_VULKAN_USE="1" -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="" +export PW_PREFIX_NAME="DOTNET" + diff --git a/data_from_portwine/scripts/portwine_db/wgc b/data_from_portwine/scripts/portwine_db/wgc index 66dd609f..3c08e2bf 100755 --- a/data_from_portwine/scripts/portwine_db/wgc +++ b/data_from_portwine/scripts/portwine_db/wgc @@ -7,15 +7,17 @@ #Rating=5 export PW_COMMENT_DB="Wargaming and Lesta Game Centers" ################################################ -export PW_WINE_USE="PROTON_LG" +export PW_WINE_USE="PROTON_LG_8-4" export PW_VULKAN_USE=1 #dxvk, vkd3d or 0 for OpenGL export LAUNCH_PARAMETERS="" # Additional launch options export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP export WINEDLLOVERRIDES="" -export PW_DLL_INSTALL="lucida vcrun2019" # Install DDL in port prefix (used winetricks) +export PW_DLL_INSTALL="lucida" # Install DDL in port prefix (used winetricks) export PW_USE_D3D_EXTRAS="1" export PW_USE_EAC_AND_BE="0" +gui_proton_downloader silent "${PW_WINE_USE}" + 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 sed -i 's% true % false %' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY index f2737918..2fd95841 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY @@ -4,8 +4,8 @@ export LAUNCH_PARAMETERS=("/s" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/plarium_play_setup.exe" export PW_WINDOWS_VER="10" -export PW_DLL_INSTALL="dotnet461" -export PW_PREFIX_NAME="PLARIUM_PLAY" +# export PW_DLL_INSTALL="dotnet461" +export PW_PREFIX_NAME="DOTNET" start_portwine diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 82e820e4..a787e3cf 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -124,23 +124,16 @@ start_portwine () { fi } - if ! try_force_link_file "${WINEDIR}/lib/wine/nvapi/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" ; then - try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x32/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - fi - if ! try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/" ; then - try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x64/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/" - fi + for rm_dll in "nvml.dll" "nvngx.ini" "nvngx.dll" "_nvngx.dll" ; do + try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/$rm_dll" + try_remove_file "${WINEPREFIX}/drive_c/windows/system32/$rm_dll" + done - try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/nvml.dll" - try_remove_file "${WINEPREFIX}/drive_c/windows/system32/nvml.dll" - try_remove_file "${WINEPREFIX}/drive_c/windows/system32/nvngx.ini" - try_remove_file "${WINEPREFIX}/drive_c/windows/system32/nvngx.dll" - try_remove_file "${WINEPREFIX}/drive_c/windows/system32/_nvngx.dll" if [[ "${PW_USE_FAKE_DLSS}" == 1 ]] && [[ -d "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/" ]] ; then try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.ini" "${WINEPREFIX}/drive_c/windows/system32/" enabled_fake_nvidia_videocard 1 - var_winedlloverride_update "nvapi,nvapi64,nvngx=n;_nvngx=" + var_winedlloverride_update "nvapi,nvapi64,nvngx=n;_nvngx=;nvcuda=b" export DXVK_ENABLE_NVAPI=1 export WINE_HIDE_NVIDIA_GPU=0 # export DXVK_NVAPI_DRIVER_VERSION= @@ -155,7 +148,7 @@ start_portwine () { export DXVK_ENABLE_NVAPI=1 export WINE_HIDE_NVIDIA_GPU=0 # export DXVK_NVAPI_DRIVER_VERSION= - var_winedlloverride_update "nvngx,_nvngx,nvapi,nvapi64=n" + var_winedlloverride_update "nvngx,_nvngx,nvapi,nvapi64=n;nvcuda=b" else enabled_fake_nvidia_videocard 0 export DXVK_ENABLE_NVAPI=0 @@ -412,7 +405,7 @@ start_portwine () { print_info "Use DAMAVAND (DirectX to wined3d vulkan)" export WINE_D3D_CONFIG='renderer=vulkan' else - print_info "Use VKD3D-PROTON, DXVK and D8VK (DirectX to vulkan)" + print_info "Use VKD3D-PROTON, DXVK and D8VK (DirectX 8-12 to vulkan)" if [[ "${PW_USE_WINE_DXGI}" == 1 ]] ; then export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxvk_config" # openvr_api_dxvk var_winedlloverride_update dxgi=b @@ -443,8 +436,15 @@ start_portwine () { [[ "$?" == 0 ]] && var_winedlloverride_update "${wine_dxvk_dll}=n" done + try_force_link_file "${PATH_TO_DXVK_FILES}/x32/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" || \ + try_force_link_file "${WINEDIR}/lib/wine/nvapi/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" || \ + try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x32/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + + try_force_link_file "${PATH_TO_DXVK_FILES}/x64/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/" || \ + try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/" || \ + try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x64/nvapi64.dll" "${WINEPREFIX}/drive_c/windows/system32/" + print_info "Try link native VKD3D files..." - # libvkd3d-proton-utils- for wine_vkd3d_dll in d3d12 d3d12core libvkd3d-1 libvkd3d-shader-1; do if [[ -f "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" ]] ; then try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 2a1d9ab9..164074b3 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=2219 +#SCRIPTS_NEXT_VERSION=2220 ######################################################################## 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 @@ -38,7 +38,7 @@ export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v12" export PW_FAKE_DLSS_VER="230506" ###WINE_PROTON_LG### -export PW_LG_VER="8-14" +export PW_LG_VER="8-15" export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}" ###WINE_PROTON_GE### export PW_WINE_LG_VER="8.5" @@ -48,9 +48,9 @@ export PW_WINE_FULLSCREEN_FSR="1" export VKD3D_LIMIT_TESS_FACTORS="32" export D8VK_VER="1.0" export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.2-164" +export DXVK_GIT_VER="2.3-5" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-3556" +export VKD3D_GIT_VER="1.1-3622" ###PREFIX_VERSION### export DOTPFX_VER="48v1" export DEFPFX_VER="v1"