diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 15e6cc7..5b54c7f 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,7 +2,11 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: -###Scripts version 2188### +###Scripts version 2190### +* added auto-detection of the path to the file to be launched after selecting automatic installation ITCH.IO +* the FULCRUM GAMES launcher has been completely removed from PortProton due to the transition of all their PC games to the STEAM launcher + +###Scripts version 2189### * accelerated the launch of Metal War Online when the game is restarted. (ALT bug 46275) To apply the fix, you need to run the MWO auto-installation again * fixed the display of Panzar game icons (ALT bug 46273) * fixed the display of World of Sea Battle game icons (ALT bug 46274) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 3311ec6..589cf61 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2190### +* добавлено автоопределение пути до запускаемого файла после выбора автоматической установки ITCH.IO (ALT bug 46278) +* полностью удален лончер FULQRUM GAMES из PortProton в связи с переходом всех их ПК игр в лончер STEAM (ALT bug 46279) + ###Scripts version 2189### * ускорен запуск Metal War Online при повторном запуске игры. Добавлен комментарий: На данный момент игра работает, но долго запускаеться из Лаунчера. После установки игры, при повторном запуске, игра будет запускаться быстро. (ALT bug 46275) Для применения исправления требуется снова запустить автоустановку MWO * исправлено отображение иконок игры Panzar (ALT bug 46273) diff --git a/data_from_portwine/img/gui/Rockstar.png b/data_from_portwine/img/gui/Rockstar.png old mode 100755 new mode 100644 index be4c136..f01ee14 Binary files a/data_from_portwine/img/gui/Rockstar.png and b/data_from_portwine/img/gui/Rockstar.png differ diff --git a/data_from_portwine/img/gui/fulqrumgames.png b/data_from_portwine/img/gui/fulqrumgames.png deleted file mode 100644 index 7c01a8b..0000000 Binary files a/data_from_portwine/img/gui/fulqrumgames.png and /dev/null differ diff --git a/data_from_portwine/img/gui/itch.png b/data_from_portwine/img/gui/itch.png old mode 100755 new mode 100644 index aa156d0..9cad18d Binary files a/data_from_portwine/img/gui/itch.png and b/data_from_portwine/img/gui/itch.png differ diff --git a/data_from_portwine/img/gui/roblox.png b/data_from_portwine/img/gui/roblox.png old mode 100755 new mode 100644 index da42339..30a7b91 Binary files a/data_from_portwine/img/gui/roblox.png and b/data_from_portwine/img/gui/roblox.png differ diff --git a/data_from_portwine/img/gui/wosb.png b/data_from_portwine/img/gui/wosb.png old mode 100755 new mode 100644 index 12a6fa8..fbb7a2c Binary files a/data_from_portwine/img/gui/wosb.png and b/data_from_portwine/img/gui/wosb.png differ diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index a72fa6f..935c354 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -385,6 +385,7 @@ init_wine_ver () { sed -i '/Steam.exe/d' "${WINEDIR}/share/wine/wine.inf" sed -i '/\\Valve\\Steam/d' "${WINEDIR}/share/wine/wine.inf" fi + sed -i '/winemenubuilder/d' "${WINEDIR}/share/wine/wine.inf" fi return 0 } @@ -845,7 +846,7 @@ pw_port_update () { curl -s --list-only "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver" | sszen CHANGLOG_NEWS=`cat "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed "/Scripts version ${scripts_install_ver}/,$ d" | sed '1,/---/ d' ` xcsd=`"${pw_yad_new}" --title "${scripts_upd2} v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ - --borders=5 --form --separator='%%%' --width=1000 --height=350 --center \ + --borders=5 --form --separator='%%%' --width=1200 --height=600 --center \ --field=":TXT" "${CHANGLOG_NEWS}" \ --field=" ${scripts_upd3} :CB" "${scripts_upd4}!${scripts_upd5}!${scripts_upd6}" ` YAD_STATUS="$?" diff --git a/data_from_portwine/scripts/portwine_db/FulqrumGames b/data_from_portwine/scripts/portwine_db/FulqrumGames deleted file mode 100644 index 80ada3a..0000000 --- a/data_from_portwine/scripts/portwine_db/FulqrumGames +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -#Author: castro-fidel -#FulqrumGames.exe -#Rating=1-5 -#####################examples########################### -##export PW_COMMENT_DB="blablabla" -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_DLL_INSTALL="vcrun2017" # 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_WINE_USE="PROTON_LG_7-34" -export PW_VULKAN_USE="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 -##export PW_OLD_GL_STRING=1 -##export PW_HIDE_NVIDIA_GPU=1 -##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -##export PW_VIRTUAL_DESKTOP=1 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -export ENABLE_VKBASALT="1" -export PW_VKBASALT_EFFECTS="Curves:cas" -export PW_VKBASALT_FFX_CAS="1" -##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. -##export PW_NO_ESYNC=0 # Do not use eventfd-based in-process synchronization primitives -##export PW_USE_GSTREAMER=1 # 0 - disabled use winegstreamer -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -##export PW_HEAP_DELAY_FREE=1 -##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -##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 -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } -export PW_PREFIX_NAME="DEFAULT" diff --git a/data_from_portwine/scripts/portwine_db/RobloxPlayer b/data_from_portwine/scripts/portwine_db/RobloxPlayer index e3387e8..cdce670 100644 --- a/data_from_portwine/scripts/portwine_db/RobloxPlayer +++ b/data_from_portwine/scripts/portwine_db/RobloxPlayer @@ -4,36 +4,7 @@ #Rating=1-5 #####################examples########################### ##export PW_COMMENT_DB="blablabla" -##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP -##export PW_DLL_INSTALL="vcrun2017" # 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_WINE_USE="WINE-8.2-STAGING-TKG-AMD64" +export PW_WINE_USE="WINE-8.8-STAGING-TKG-AMD64" export PW_VULKAN_USE="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 -##export PW_OLD_GL_STRING=1 -##export PW_HIDE_NVIDIA_GPU=1 -##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -##export PW_VIRTUAL_DESKTOP=1 -##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue -##export ENABLE_VKBASALT=1 -##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) -##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) -##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. -##export PW_NO_ESYNC=0 # Do not use eventfd-based in-process synchronization primitives -##export PW_USE_GSTREAMER=1 # 0 - disabled use winegstreamer -##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games -##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). -##export PW_HEAP_DELAY_FREE=1 -##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread -##export WINEARCH=win32 # defaut = win64 -##export WINEPREFIX= -##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 -##export PATH_TO_GAME= -##add_in_start_portwine () { commands ; } export PW_PREFIX_NAME="ROBLOX" +export DISABLE_CP_DEFPFX=1 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_FULQRUM_GAMES b/data_from_portwine/scripts/pw_autoinstall/PW_FULQRUM_GAMES deleted file mode 100755 index 7ceed0b..0000000 --- a/data_from_portwine/scripts/pw_autoinstall/PW_FULQRUM_GAMES +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -# Author: chal55rus (Sergey P.) -######################################################################## -export LAUNCH_PARAMETERS=("/VERYSILENT" ) -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/fulqrumgames_setup.exe" -start_portwine -if try_download "https://royalquest.com/download/fulqrum" "${PW_AUTOINSTALL_EXE}" -then - pw_start_progress_bar_block "${loc_gui_installing_the} Fulqrum Games. ${loc_gui_please_wait} " - pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe="$WINEPREFIX/drive_c/FulqrumGames/FulqrumGames.exe" - try_remove_file "${PW_AUTOINSTALL_EXE}" - try_remove_file "${portwine_exe}.ppdb" - kill_portwine - pw_stop_progress_bar - export PORTWINE_CREATE_SHORTCUT_NAME="Fulqrum Games" - portwine_create_shortcut -fi -stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH index 4e4fd03..0b77bf1 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH @@ -9,7 +9,8 @@ then pw_start_progress_bar_block "${loc_gui_installing_the} ITCH.IO. ${loc_gui_please_wait} " pw_kill_autostart itch.exe & pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/itch/app-25.5.1/itch.exe" + portwine_exe=`find "$WINEPREFIX/drive_c/users" -type f -name "itch.exe"` + # portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/itch/app-25.5.1/itch.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" kill_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX index 5624092..f6b33e7 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX @@ -4,17 +4,17 @@ 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 WINEDLLOVERRIDES="mscoree,mshtml=" +export DISABLE_CP_DEFPFX=1 export PW_MUST_HAVE_DLL="" -export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64" - -gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64" +export PW_WINE_USE="WINE-8.8-STAGING-TKG-AMD64" +gui_proton_downloader silent "WINE-8.8-STAGING-TKG-AMD64" start_portwine if try_download "setup.rbxcdn.com/RobloxPlayerLauncher.exe" "${PW_AUTOINSTALL_EXE}" then pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe="${WINEPREFIX}/drive_c/users/${USER}/AppData/Local/Roblox/Versions/version-5e9aac577efb4995/RobloxPlayerBeta.exe" + portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "RobloxPlayerBeta.exe"` try_remove_file "${portwine_exe}.ppdb" pw_stop_progress_bar # export PORTWINE_CREATE_SHORTCUT_NAME="RobloxPlayerBeta" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR index ae00c0a..a2b8c4e 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR @@ -3,11 +3,12 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Rockstar-Games-Launcher.exe" start_portwine -if try_download "web.archive.org/web/20210708074247if_/gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Rockstar-Games-Launcher. ${loc_gui_please_wait} " - "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files/Rockstar Games/Launcher" - portwine_exe="$WINEPREFIX/drive_c/Program Files/Rockstar Games/Launcher/Launcher.exe" + 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"` try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" kill_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY index 8d64db9..2a110d3 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY @@ -6,6 +6,8 @@ export PW_PREFIX_NAME="VK_PLAY" export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/AppData/Local/VKPlayLoader.exe" export WINEDLLOVERRIDES="mscoree,mshtml=" export PW_MUST_HAVE_DLL="" +export PW_WINE_USE="WINE_8.5_LG" +gui_proton_downloader silent "WINE_8.5_LG" start_portwine if try_download "static.gc.my.games/VKPlayLoader.exe" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 5c142a9..8374d6e 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -26,6 +26,7 @@ fi . "$(dirname $(readlink -f "$0"))/functions_helper" start_portwine () { + var_winedlloverride_update "${PW_MUST_WINEDLLOVERRIDES}" export WINEPREFIX="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" @@ -542,7 +543,8 @@ start_portwine () { pw_run () { unset GDK_BACKEND - if [[ ! -z "$portwine_exe" ]] ; then + if [[ -n "${PATH_TO_GAME}" ]] ; then + echo "cd to ${PATH_TO_GAME}" cd "${PATH_TO_GAME}" else cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 69d1e02..2b3eb58 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -753,7 +753,6 @@ else --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=" FULQRUM GAMES"!"$PW_GUI_ICON_PATH/fulqrumgames.png"!"":"FBTN" '@bash -c "button_click PW_FULQRUM_GAMES"' \ --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"' \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 13a90d3..1905e1a 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=2189 +#SCRIPTS_NEXT_VERSION=2190 ######################################################################## 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 @@ -53,7 +53,7 @@ export VKD3D_GIT_VER="1.1-3424" export DOTPFX_VER="48v1" export DEFPFX_VER="v1" export PROGPFX_VER="v1" -export WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe,winemenubuilder=" +export PW_MUST_WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b,winemenubuilder.exe=" ################################################################# export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf" ################################################################# diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index cf930f0..7adeccc 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -103,7 +103,7 @@ export -f pw_stop_progress_bar_cover open_changelog () { "${pw_yad}" --title="$loc_gui_changelog" --borders=10 --no-buttons --text-align=center \ - --text-info --show-uri --wrap --center --width=1200 --height=550 --uri-color=red \ + --text-info --show-uri --wrap --center --width=1200 --height=700 --uri-color=red \ --filename="${PORT_WINE_PATH}/data/${PW_CHANGELOG_FILE}" } export -f open_changelog