From 6b8e52720c706f9a7c75e56e99068783911c9024 Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Tue, 30 May 2023 23:18:01 +0300
Subject: [PATCH] Scripts version 2195

---
 data_from_portwine/changelog_eng              |  5 +++++
 data_from_portwine/changelog_rus              |  5 +++++
 .../scripts/portwine_db/RobloxPlayer          |  2 +-
 .../portwine_db/Rockstar_Games_Launcher       |  4 +++-
 .../scripts/pw_autoinstall/PW_GUILD_WARS_2    |  6 ++++++
 .../scripts/pw_autoinstall/PW_ROBLOX          |  4 ++--
 .../scripts/pw_autoinstall/PW_ROCKSTAR        |  3 ++-
 data_from_portwine/scripts/runlib             | 21 ++++++++++++++-----
 data_from_portwine/scripts/start.sh           | 14 ++++++-------
 data_from_portwine/scripts/var                |  4 ++--
 10 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index 89da529..9090eef 100755
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,11 @@ You can help us in the development of the project on the website: boosty.to/linu
 -----------------------------------------
 Changelog:
 
+###Scripts version 2195### Date: 30.05.2023 / The size of the downloaded update: 16 megabytes.
+* FIX - install Rockstar Games Launcher
+* DELETE - ROBLOX (need use: https://github.com/roblox-linux-wrapper/roblox-linux-wrapper)
+* updated DXR Рё DLSS functions
+
 ###Scripts version 2194### Date: 30.05.2023 / The size of the downloaded update: 9 megabytes.
 * HOTFIX - removed nvml verification in the plugins directory
 
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index 127ec27..56fd36a 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,11 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2195### Дата: 30.05.2023 / Размер скачиваемого обновления: 16 мегабайт.
+* исправлена установка Rockstar Games Launcher
+* временно убран установщик ROBLOX (не работает без https://github.com/roblox-linux-wrapper/roblox-linux-wrapper)
+* улучшена работа DXR и DLSS (рекомендуется выбирать новейшие версии DXVK и VKD3D)
+
 ###Scripts version 2194### Дата: 30.05.2023 / Размер скачиваемого обновления: 9 мегабайт.
 * HOTFIX - убрана проверка nvml в каталоге plugins
 
diff --git a/data_from_portwine/scripts/portwine_db/RobloxPlayer b/data_from_portwine/scripts/portwine_db/RobloxPlayer
index cdce670..fab9c65 100644
--- a/data_from_portwine/scripts/portwine_db/RobloxPlayer
+++ b/data_from_portwine/scripts/portwine_db/RobloxPlayer
@@ -7,4 +7,4 @@
 export PW_WINE_USE="WINE-8.8-STAGING-TKG-AMD64"
 export PW_VULKAN_USE="1"
 export PW_PREFIX_NAME="ROBLOX"
-export DISABLE_CP_DEFPFX=1
+# export DISABLE_CP_DEFPFX=1
diff --git a/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher b/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher
index 95b8b50..c50ee81 100755
--- a/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher
+++ b/data_from_portwine/scripts/portwine_db/Rockstar_Games_Launcher
@@ -8,6 +8,8 @@
 export PW_VULKAN_USE=1
 export PW_DLL_INSTALL="vcrun2019"
 export PW_WINDOWS_VER=10
+export WINEDLLOVERRIDES="vulkan-1=n,b"
+
 add_in_start_portwine () {
-    regdlloverrides "RDR2.exe:vulkan-1=n"
+    regdlloverrides "RDR2.exe:vulkan-1=n,b"
 }
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2 b/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2
index 0b51203..bfa3a86 100644
--- a/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2
@@ -2,6 +2,12 @@
 # Author: Castro Fidel
 ########################################################################
 export LAUNCH_PARAMETERS=("/VERYSILENT")
+export PW_PREFIX_NAME="GW2"
+export WINEDLLOVERRIDES="mscoree,mshtml="
+export PW_MUST_HAVE_DLL=""
+# export PW_WINE_USE="WINE_8.5_LG"
+pw_clear_pfx
+# gui_proton_downloader silent "WINE_8.5_LG"
 
 start_portwine
 mkdir -p "${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX
index f6b33e7..ec81694 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX
@@ -4,8 +4,8 @@
 export LAUNCH_PARAMETERS=("")
 export PW_PREFIX_NAME="ROBLOX"
 export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/roblox_installer.exe"
-# export WINEDLLOVERRIDES="mscoree,mshtml="
-export DISABLE_CP_DEFPFX=1
+export WINEDLLOVERRIDES="mscoree,mshtml="
+# export DISABLE_CP_DEFPFX=1
 export PW_MUST_HAVE_DLL=""
 export PW_WINE_USE="WINE-8.8-STAGING-TKG-AMD64"
 gui_proton_downloader silent "WINE-8.8-STAGING-TKG-AMD64"
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR
index 51d4052..8ad0938 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR
@@ -4,9 +4,10 @@
 export PW_VULKAN_USE="1"
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Rockstar-Games-Launcher.exe"
 start_portwine
-if try_download "https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}"
+if try_download "https://dl-eu.opendataapi.net/lutris/games/GTA/rockstar-games-launcher-1-0-36-344.exe" "${PW_AUTOINSTALL_EXE}"
 then
     pw_start_progress_bar_block "Rockstar-Games-Launcher. ${loc_gui_please_wait} "
+    try_remove_dir "$WINEPREFIX/drive_c/Program Files/Rockstar Games/Launcher"
     pw_kill_autostart RockstarService.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "Launcher.exe" | grep "Rockstar Games/Launcher/Launcher.exe"`
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index f13a90c..3c7d334 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -68,6 +68,7 @@ start_portwine () {
         export WINE_MONO_TRACE="E:System.NotImplementedException"
         export VK_LOADER_DEBUG="warn"
         export VKBASALT_LOG_LEVEL="warn"
+        export DXVK_NVAPI_LOG_LEVEL=warn
     else
         export WINEDEBUG="-all"
         export DXVK_LOG_LEVEL="none"
@@ -75,6 +76,7 @@ start_portwine () {
         export VKD3D_DEBUG="none"
         export DXVK_LOG_PATH="none"
         export VKBASALT_LOG_LEVEL="none"
+        export DXVK_NVAPI_LOG_LEVEL=none
     fi
 
     #default wine-mono override for FNA games
@@ -139,12 +141,21 @@ start_portwine () {
         var_winedlloverride_update "nvngx=n;_nvngx="
         export DXVK_ENABLE_NVAPI=0
         export WINE_HIDE_NVIDIA_GPU=0
-    elif [[ "${PW_USE_NVAPI_AND_DLSS}" == 1 ]] && [[ -d "${WINEDIR}/lib/wine/nvapi/" ]] ; then
-        try_copy_file `find /usr/* -type f -name "nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
-        try_copy_file `find /usr/* -type f -name "_nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"       
-        enabled_fake_nvidia_videocard 1
+        export VKD3D_FEATURE_LEVEL="12_1"
+        # export DXVK_NVAPI_DRIVER_VERSION=
+    elif [[ "${PW_USE_NVAPI_AND_DLSS}" == 1 ]] ; then
+        if ! try_copy_file `find /usr/* -type f -name "nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
+        then try_copy_file "${PW_PLUGINS_PATH}/nvngx/nvngx.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
+        fi
+        if ! try_copy_file `find /usr/* -type f -name "_nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"       
+        then try_copy_file "${PW_PLUGINS_PATH}/nvngx/_nvngx.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
+        fi 
+        enabled_fake_nvidia_videocard 0
         export DXVK_ENABLE_NVAPI=1
         export WINE_HIDE_NVIDIA_GPU=0
+        export VKD3D_FEATURE_LEVEL="12_1"
+        # export DXVK_NVAPI_DRIVER_VERSION=
+        var_winedlloverride_update "nvngx,_nvngx,nvapi,nvapi64=n"
     else
         enabled_fake_nvidia_videocard 0
         export DXVK_ENABLE_NVAPI=0
@@ -178,7 +189,7 @@ start_portwine () {
 
     if [[ "${PW_USE_DXR11}" == 1 ]] || [[ "${PW_USE_DXR10}" == 1 ]] || [[ "${PW_USE_RAY_TRACING}" == 1 ]]; then
         var_vkd3d_config_update dxr
-        var_radv_perftest_config_update rt,gpl
+        var_radv_perftest_config_update rt
         export VKD3D_FEATURE_LEVEL="12_1"
         export WINE_HIDE_NVIDIA_GPU=0
         export DXVK_ENABLE_NVAPI=1
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 5d3b3fb..00704f8 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -747,7 +747,6 @@ else
 
     "${pw_yad_v12_3}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns=3 --align-buttons --keep-icon-size --scroll \
     --field="   Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \
-    --field="   Wargaming Game Center"!"$PW_GUI_ICON_PATH/wgc.png"!"":"FBTN" '@bash -c "button_click PW_WGC"' \
     --field="   vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \
     --field="   Battle.net Launcher"!"$PW_GUI_ICON_PATH/battle_net.png"!"":"FBTN" '@bash -c "button_click PW_BATTLE_NET"' \
     --field="   Epic Games Launcher"!"$PW_GUI_ICON_PATH/epicgames.png"!"":"FBTN" '@bash -c "button_click PW_EPIC"' \
@@ -755,31 +754,32 @@ else
     --field="   Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png"!"":"FBTN" '@bash -c "button_click PW_UBC"' \
     --field="   EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click PW_EVE"' \
     --field="   Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click PW_ROCKSTAR"' \
-    --field="   OSU"!"$PW_GUI_ICON_PATH/osu.png"!"":"FBTN" '@bash -c "button_click PW_OSU"' \
     --field="   League of Legends"!"$PW_GUI_ICON_PATH/lol.png"!"":"FBTN" '@bash -c "button_click PW_LOL"' \
     --field="   Gameforge Client"!"$PW_GUI_ICON_PATH/gameforge.png"!"":"FBTN" '@bash -c "button_click  PW_GAMEFORGE"' \
     --field="   World of Sea Battle (BETA)"!"$PW_GUI_ICON_PATH/wosb.png"!"":"FBTN" '@bash -c "button_click PW_WOSB"' \
     --field="   CALIBER"!"$PW_GUI_ICON_PATH/caliber.png"!"":"FBTN" '@bash -c "button_click PW_CALIBER"' \
-    --field="   ITCH.IO"!"$PW_GUI_ICON_PATH/itch.png"!"":"FBTN" '@bash -c "button_click PW_ITCH"' \
-    --field="   Steam (unstable)"!"$PW_GUI_ICON_PATH/steam.png"!"":"FBTN" '@bash -c "button_click PW_STEAM"' \
     --field="   Crossout"!"$PW_GUI_ICON_PATH/crossout.png"!"":"FBTN" '@bash -c "button_click PW_CROSSOUT"' \
     --field="   Warframe"!"$PW_GUI_ICON_PATH/warframe.png"!"":"FBTN" '@bash -c "button_click PW_WARFRAME"' \
     --field="   Panzar"!"$PW_GUI_ICON_PATH/panzar.png"!"":"FBTN" '@bash -c "button_click PW_PANZAR"' \
     --field="   STALCRAFT"!"$PW_GUI_ICON_PATH/stalcraft.png"!"":"FBTN" '@bash -c "button_click PW_STALCRAFT"' \
-    --field="   ROBLOX"!"$PW_GUI_ICON_PATH/roblox.png"!"":"FBTN" '@bash -c "button_click PW_ROBLOX"' \
     --field="   CONTRACT WARS"!"$PW_GUI_ICON_PATH/cwc.png"!"":"FBTN" '@bash -c "button_click PW_CWC"' \
     --field="   Stalker Online"!"$PW_GUI_ICON_PATH/so.png"!"":"FBTN" '@bash -c "button_click PW_SO"' \
     --field="   Metal War Online"!"$PW_GUI_ICON_PATH/mwo.png"!"":"FBTN" '@bash -c "button_click PW_MWO"' \
     --field="   Ankama Launcher"!"$PW_GUI_ICON_PATH/ankama.png"!"":"FBTN" '@bash -c "button_click PW_ANKAMA"' \
     --field="   Indiegala Client"!"$PW_GUI_ICON_PATH/igclient.png"!"":"FBTN" '@bash -c "button_click PW_IGCLIENT"' \
     --field="   Plarium Play"!"$PW_GUI_ICON_PATH/plariumplay.png"!"":"FBTN" '@bash -c "button_click PW_PLARIUM_PLAY"' \
+    --field="   Wargaming Game Center"!"$PW_GUI_ICON_PATH/wgc.png"!"":"FBTN" '@bash -c "button_click PW_WGC"' \
+    --field="   OSU"!"$PW_GUI_ICON_PATH/osu.png"!"":"FBTN" '@bash -c "button_click PW_OSU"' \
+    --field="   ITCH.IO"!"$PW_GUI_ICON_PATH/itch.png"!"":"FBTN" '@bash -c "button_click PW_ITCH"' \
+    --field="   Steam (unstable)"!"$PW_GUI_ICON_PATH/steam.png"!"":"FBTN" '@bash -c "button_click PW_STEAM"' \
     --field="   Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' &
-
-    # --field="   Electronic Arts App"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"'
+    
+    # --field="   Electronic Arts App"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' 
     # --field="   Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"'
     # --field="   Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click PW_SWL"'
     # --field="   Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click PW_GUILD_WARS_2"'
     # --field="   Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"'
+    # --field="   ROBLOX"!"$PW_GUI_ICON_PATH/roblox.png"!"":"FBTN" '@bash -c "button_click PW_ROBLOX"'
 
     if  [[ `which wmctrl` ]] &>/dev/null ; then
         sleep 2
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index fd8904c..bfaf0b6 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=2194
+#SCRIPTS_NEXT_VERSION=2195
 ########################################################################
 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
@@ -33,7 +33,7 @@ export PW_MANGOHUD_x32="0"
 export PW_USE_EAC_AND_BE="1"
 ###DEFAULT_WINE###
 export PW_WINE_USE="PROTON_LG"
-export PW_PLUGINS_VER="_v11"
+export PW_PLUGINS_VER="_v12"
 export PW_FAKE_DLSS_VER="230506"
 ###WINE_PROTON_LG###
 export PW_LG_VER="7-54"
-- 
2.24.1