From 9e07d5bc974bfc98c354d5a3869979dd677ab8e5 Mon Sep 17 00:00:00 2001 From: Castro_Fidel Date: Sat, 23 Jul 2022 11:59:50 +0300 Subject: [PATCH] Scripts version 2121 --- data_from_portwine/changelog_eng | 5 +++++ data_from_portwine/changelog_rus | 5 +++++ data_from_portwine/scripts/pw_autoinstall/PW_WGC | 3 +-- data_from_portwine/scripts/var | 4 ++-- data_from_portwine/scripts/zen_yad_gui | 2 ++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 6b3b696e..3d05b8c6 100644 --- 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/port ----------------------------------------- Changelog: +###Scripts version 2121### +* updated "PROTON_GE" to version 7-26 +* fixed creation of shortcuts for WGC (to automatically fix existing shortcuts, just run the WGC installer from PortProton) +* Added automatic activation of MANGOHUD when using FPS limit + ###Scripts version 2120### * updated "PROTON_GE" to version 7-21 * updated "libs_v32" (Steam Runtime Snipers) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index fb5791f0..7ecdade5 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,11 @@ ----------------------------------------- История изменений: +###Scripts version 2121### +* обновлен "PROTON_GE" до версии 7-26 +* исправлено создание ярлыков для WGC (для атоматического исправления уже существующих ярлыков, просто запустите установщик WGC из PortProton) +* добавлено автоматическое включение MANGOHUD при использовании ограничения FPS + ###Scripts version 2120### * обновлен "PROTON_GE" до версии 7-21 * обновлен "libs_v32" (Steam Runtime Snipers) diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WGC b/data_from_portwine/scripts/pw_autoinstall/PW_WGC index 641eeebc..b754ba48 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WGC @@ -19,8 +19,7 @@ then pw_start_progress_bar_block "Starting WGC installation..." pw_kill_autostart wgc.exe & pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe="$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/wgc_api/wgc_api.exe" - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + portwine_exe="$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/api/wgc_api.exe" export PORTWINE_CREATE_SHORTCUT_NAME="Wargaming Game Center" try_remove_file "${PW_AUTOINSTALL_EXE}" kill_portwine diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 20011e39..8210f9a1 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2120 +#SCRIPTS_NEXT_VERSION=2121 ######################################################################## 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_PLUGINS_VER="_v5" export PW_STEAM_VER="7.0-3" export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}" ###WINE_PROTON_GE### -export PW_GE_VER="7-21" +export PW_GE_VER="7-26" export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" export PW_WINE_FULLSCREEN_FSR="0" ###WINE_PROTON_PW_FOR_GALLIUM_NINE### diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 2a2524b6..46a8e664 100644 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -218,6 +218,7 @@ pw_gui_for_edit_db () { if [ "${FPS_LIMIT}" != 0 ] ; then export MANGOHUD_CONFIG=${MANGOHUD_CONFIG},fps_limit=${FPS_LIMIT} + export PW_MANGOHUD=1 fi echo "pw_gui_for_edit_db PORTWINE_DB_FILE=$PORTWINE_DB_FILE" edit_db_from_gui $@ MANGOHUD_CONFIG LAUNCH_PARAMETERS PW_WINDOWS_VER PW_DLL_INSTALL WINEDLLOVERRIDES @@ -401,6 +402,7 @@ gui_vkBasalt () { portwine_create_shortcut () { pw_create_gui_png name_desktop="${PORTPROTON_NAME}" + try_remove_file "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Name=${PORTPROTON_NAME}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" if [ -z "${PW_CHECK_AUTOINSTAL}" ]