diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 6ab1e9d0..381af9da 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,13 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2142### +* added alternative FTP server for PP component updates if download failed from main GITHUB server +* added display of current versions of DXVK and VKD3D when they are selected in the PortProton interface +* Changed the WINE_WIN_START="start /i /b /wait /high /unix" variable to increase the priority of the application being started (test) and more detailed output of information when creating a Log. +* for lovers of MMORPGs and weak hardware, an automatic installer Fulqrum Games has been added to launch Royal Quest - a massively multiplayer online game developed by 1C and Katauri Interactive. Thanks chal55rus (Sergey P.) +* Added PlariumPlay automatic installer to launch Raid: Shadow Legends + ###Scripts version 2141### * HOTFIX - added EA icon diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 97626ac2..6bdfa7eb 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,14 @@ ----------------------------------------- История изменений: +###Scripts version 2142### +* добавлен альтернативный FTP сервер для обновлений компонентов PP если не удалось скачать с основного сервера GITHUB +* добавлен вывод текущих версий DXVK и VKD3D при их выборе в интерфейсе PortProton +* изменена перемееная WINE_WIN_START="start /i /b /wait /high /unix" для увеличения приоритета запускаемого приложения (тест) и более подробного вывода информации при создании Лога. +* для любителей MMORPG и слабого железа добавлен автоматический установщик Fulqrum Games для запуска Royal Quest — массовая многопользовательская онлайн-игра, разработанная Фирмой «1С» и Katauri Interactive. Спасибо chal55rus (Sergey P.) +* добавлен автоматический установщик PlariumPlay для запуска игры Raid: Shadow Legends +* небольшие улучшения локализации + ###Scripts version 2141### * HOTFIX - добавлена иконка EA @@ -52,7 +60,7 @@ ###Scripts version 2130### * по умолчанию используется WINE версии PROTON_LG (основан на wine-ge-custom с добавлением патчей необходимых для PortProton) Вы всё так же можете использовать версию PROTON_GE выбрав его в меню при запуске .exe файла. -* в связи с ребрендингом и переходом на новую ветку WINE-PROTON, значительно обновлены скрипты +* в связи с ребрендингом и переходом на новую PROTON_LG ветку WINE-PROTON, значительно обновлены скрипты * ВНИМАНИЕ: префикс переменных в "EDIT_DB" и "user.conf" изменился с "PW_" на "PW_". При первом запуске после обновления, обновяться и ваши файлы настроек. ###Scripts version 2129### diff --git a/data_from_portwine/img/gui/eve.png b/data_from_portwine/img/gui/eve.png index 3eae5e4b..83b2981d 100755 Binary files a/data_from_portwine/img/gui/eve.png and b/data_from_portwine/img/gui/eve.png differ diff --git a/data_from_portwine/img/gui/fulqrumgames.png b/data_from_portwine/img/gui/fulqrumgames.png new file mode 100644 index 00000000..888d719c Binary files /dev/null and b/data_from_portwine/img/gui/fulqrumgames.png differ diff --git a/data_from_portwine/img/gui/lgc.png b/data_from_portwine/img/gui/lgc.png index 1d7ad0e0..8ba24bc5 100755 Binary files a/data_from_portwine/img/gui/lgc.png and b/data_from_portwine/img/gui/lgc.png differ diff --git a/data_from_portwine/img/gui/plariumplay.png b/data_from_portwine/img/gui/plariumplay.png new file mode 100644 index 00000000..a6f13fb5 Binary files /dev/null and b/data_from_portwine/img/gui/plariumplay.png differ diff --git a/data_from_portwine/img/gui/plariumplay.png~ b/data_from_portwine/img/gui/plariumplay.png~ new file mode 100644 index 00000000..4ef3146e Binary files /dev/null and b/data_from_portwine/img/gui/plariumplay.png~ differ diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index eb6efb21..e0d05136 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -103,19 +103,28 @@ check_process () { export -f check_process try_download () { + PW_DOWNLOAD_FILE_NAME="$(basename $1)" set -o pipefail - wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 3 \ - --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \ + wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 2 \ + --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "${1}" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --width=500 --height=90 + zenity --progress --percentage=0 --title="Download ${PW_DOWNLOAD_FILE_NAME}" --text=Starting... --auto-close --width=500 --height=90 if [ "${PIPESTATUS[0]}" != 0 ] ; then - print_error "Failed to download $1." + print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from GitHub." + print_info "Try download ${PW_DOWNLOAD_FILE_NAME} from FTP" try_remove_file "$2" - return 1 - else - return 0 + wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 2 \ + --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" --ftp-user=anonymous "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" 2>&1 | \ + tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ + zenity --progress --percentage=0 --title="Download ${PW_DOWNLOAD_FILE_NAME}" --text=Starting... --auto-close --width=500 --height=90 + if [ "${PIPESTATUS[0]}" != 0 ] ; then + print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from FTP." + try_remove_file "$2" + return 1 + fi fi try_remove_file "${PORT_WINE_TMP_PATH}/download_log" + return 0 } try_download_to_path () { @@ -183,11 +192,16 @@ var_vk_istance_layers_config_update () { return 0 } - unpack_tar_zst () { set -o pipefail - tar -I zstd -xvf "$1" -C "$2" | sszen - [ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0 + unset PW_ZSTD_PORT + if [[ `which zstd` ]] &>/dev/null ; then + tar -I zstd -xvf "$1" -C "$2" | sszen + [ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0 + else + env LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PW_WINELIB}/portable/lib/lib64:${PW_WINELIB}/portable/lib/lib" tar -I "${PW_WINELIB}/portable/bin/zstd" -xvf "$1" -C "$2" | sszen + [ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0 + fi } unpack_tar_xz () { diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 154dea28..acfdcecd 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -200,13 +200,19 @@ then export loc_gui_vkbasalt_start="VKBASALT" export loc_gui_db_comments="Найден файл настроек PortProton для" - export loc_gui_vulkan_stable="VULKAN (Стабильные версии DXVK и VKD3D)" - export loc_gui_vulkan_git="VULKAN (Новейшие GIT версии DXVK и VKD3D)" + export loc_gui_vulkan_stable="Стабильные версии DXVK ${DXVK_STABLE_VER} и VKD3D ${VKD3D_STABLE_VER}" + export loc_gui_vulkan_git="Новейшие версии DXVK ${DXVK_GIT_VER} и VKD3D ${VKD3D_GIT_VER}" export loc_gui_gallium_nine="GALLIUM_NINE (Аппаратный DX9 для MESA)" - export loc_gui_open_gl="OPENGL (Для видеокарт без VULKAN)" + export loc_gui_open_gl="OPENGL (Для видеокарт без API VULKAN)" + + export loc_gui_installing_the="Устанавливаем" + export loc_gui_please_wait="Пожалуйста подождите..." elif [ "${update_loc}" = "ENG" ] then + export loc_gui_installing_the="Installing the" + export loc_gui_please_wait="Please wait..." + export loc_gui_vulkan_stable="VULKAN (Stable version of DXVK and VKD3D)" export loc_gui_vulkan_git="VULKAN (New GIT version of DXVK and VKD3D)" export loc_gui_gallium_nine="GALLIUM_NINE (Native DX9 on MESA)" diff --git a/data_from_portwine/scripts/portwine_db/FulqrumGames b/data_from_portwine/scripts/portwine_db/FulqrumGames new file mode 100644 index 00000000..80ada3a9 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/FulqrumGames @@ -0,0 +1,39 @@ +#!/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/PlariumPlay b/data_from_portwine/scripts/portwine_db/PlariumPlay new file mode 100644 index 00000000..c60d6c42 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/PlariumPlay @@ -0,0 +1,51 @@ +#!/usr/bin/env bash +#Author: castro-fidel +#PlariumPlay.exe +#Rating=1-5 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +export PW_WINDOWS_VER="10" +export PW_DLL_INSTALL="" +export WINEDLLOVERRIDES="libglesv2=" +export LAUNCH_PARAMETERS="" +export PW_VULKAN_USE="1" +export PW_USE_DXR10="0" +##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="0" +export PW_HIDE_NVIDIA_GPU="0" +##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +export PW_VIRTUAL_DESKTOP="0" +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +export ENABLE_VKBASALT="0" +##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="0" +export PW_NO_ESYNC="1" +##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="0" +##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="0" +export PW_GUI_DISABLED_CS="0" +##export PATH_TO_GAME= +##add_in_start_portwine () { commands ; } +export PW_PREFIX_NAME="DOTNET" +export PW_MANGOHUD="0" +export PW_MANGOHUD_USER_CONF="0" +export PW_USE_DXR11="0" +export PW_USE_FAKE_DLSS="0" +export PW_WINE_FULLSCREEN_FSR="0" +export PW_USE_GAMEMODE="1" +export PW_DX12_DISABLE="0" +export PW_PRIME_RENDER_OFFLOAD="0" +export PW_USE_D3D_EXTRAS="1" +export PW_FIX_VIDEO_IN_GAME="0" +export PW_FORCE_LARGE_ADDRESS_AWARE="1" +export PW_USE_SHADER_CACHE="1" +export PW_USE_WINE_DXGI="0" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA b/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA index bdc0819b..b1bf0a7a 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Ankama Launcher-Setup.exe" start_portwine if try_download "launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the Ankama Launcher. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} Ankama Launcher. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files/Ankama/Ankama Launcher/Ankama Launcher.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET index 6b73aec4..65265588 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup-${BN_LOC}.exe" start_portwine if try_download "dist.blizzard.com/downloads/bna-installers/322d5bb9ae0318de3d4cde7641c96425/retail.1/Battle.net-Setup-${BN_LOC}.exe" "${PW_AUTOINSTALL_EXE}" then - # PW_START_PROGRESS_BAR "Installing the Battle Net. Please wait..." + # PW_START_PROGRESS_BAR "${loc_gui_installing_the} Battle Net. ${loc_gui_please_wait} " pw_kill_autostart Battle.net.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "Battle.net.exe"` diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA b/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA index dae9c6a8..dbf20f87 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/BethesdaNetLauncher_Setup.exe" start_portwine if try_download "download.cdp.bethesda.net/BethesdaNetLauncher_Setup.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the BethesdaNetLauncher. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} BethesdaNetLauncher. ${loc_gui_please_wait} " pw_kill_autostart BethesdaNetLauncher.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Bethesda.net Launcher/BethesdaNetLauncher.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER index 1199c18f..aca5a710 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER @@ -31,7 +31,7 @@ try_download_caliber () { start_portwine if try_download_caliber "https://cdn.playcaliber.com/p1/a88c3b70f76a0e56b1e08b62c9895cfe/launcher/setup/CaliberSetup.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the CALIBER. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} CALIBER. ${loc_gui_please_wait} " pw_kill_autostart VC_redist.x64.exe 3 & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/1C Game Studios/Caliber/Launcher.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CEMU b/data_from_portwine/scripts/pw_autoinstall/PW_CEMU index 890e1346..9aec721e 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CEMU +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CEMU @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/`echo ${PW_URL_CEMU} | awk -F/ '{prin start_portwine if try_download "${PW_URL_CEMU}" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the Cemu. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} Cemu. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/`echo ${PW_URL_CEMU} | awk -F/ '{print $5}' | sed 's/.zip//'`/Cemu.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CITRA b/data_from_portwine/scripts/pw_autoinstall/PW_CITRA index f232acf9..9e6a3ee0 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CITRA +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CITRA @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/citra-setup-windows.exe" start_portwine if try_download "github.com/citra-emu/citra-web/releases/download/1.0/citra-setup-windows.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the Citra. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} Citra. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Citra/nightly-mingw/citra-qt.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN b/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN index fdab1060..9257af27 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN +++ b/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/dolphin-x64-5.0.exe" start_portwine if try_download "dl-mirror.dolphin-emu.org/5.0/dolphin-x64-5.0.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the Dolphin 5.0. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} Dolphin 5.0. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files/Dolphin/Dolphin.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION b/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION index 44a02e14..95b6c5da 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION +++ b/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION @@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/duckstation-windows-x64-release.zip" start_portwine if try_download "github.com/stenzek/duckstation/releases/download/preview/duckstation-windows-x64-release.zip" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the VBA-M. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} VBA-M. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Duckstation" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Duckstation/duckstation-qt-x64-ReleaseLTCG.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP index dee97814..0aaeab62 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP @@ -41,7 +41,7 @@ export PW_PREFIX_NAME="EA_APP" start_portwine if try_download "https://origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the EA Launcher. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} EA Launcher. ${loc_gui_please_wait} " pw_kill_autostart EABackgroundService.exe & # pw_kill_autostart EALocalHostSvc.exe & mkdir -p "$WINEPREFIX/drive_c/Program Files/Electronic Arts/EA Desktop/EA Desktop" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC index fa8dcc84..8112fb96 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC @@ -8,7 +8,7 @@ export PW_USE_D3D_EXTRAS=1 start_portwine if try_download "launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing Epic Games Launcher. Please wait..." + pw_start_progress_bar_block "Installing Epic Games Launcher. ${loc_gui_please_wait} " # pw_kill_autostart EpicGamesLauncher.exe & pw_run msiexec /i "${PW_AUTOINSTALL_EXE}" # sleep 10 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE b/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE index acf7b6ba..7b036e47 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE @@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/ePSXe205.zip" start_portwine if try_download "www.epsxe.com/files/ePSXe205.zip" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the VBA-M. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} VBA-M. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/EPSXe" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/EPSXe/ePSXe.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EVE b/data_from_portwine/scripts/pw_autoinstall/PW_EVE index 99159014..26c1e348 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE @@ -7,7 +7,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EveLauncher-1892908.exe" start_portwine if try_download "binaries.eveonline.com/EveLauncher-1892908.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the EVE Launcher. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} EVE Launcher. ${loc_gui_please_wait} " if [ ! -f "$WINEPREFIX/drive_c/Games/EVE Online/Launcher/evelauncher.exe" ] ; then try_remove_dir "$WINEPREFIX/drive_c/Games/EVE Online" dd if="${PW_AUTOINSTALL_EXE}" of="${PW_AUTOINSTALL_EXE}".7z bs=1M skip=31646603 count=196171208 iflag=skip_bytes,count_bytes diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_FULQRUM_GAMES b/data_from_portwine/scripts/pw_autoinstall/PW_FULQRUM_GAMES new file mode 100755 index 00000000..763374cb --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_FULQRUM_GAMES @@ -0,0 +1,18 @@ +#!/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}" + 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_GAMEFORGE b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE index e09ee586..61354789 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE @@ -24,7 +24,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/GameforgeInstaller.exe" start_portwine if try_download "raw.githubusercontent.com/WarfaceZ/lutris-clients/master/GameforgeInstaller.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Gameforge-Client. Please wait..." + pw_start_progress_bar_block "Gameforge-Client. ${loc_gui_please_wait} " pw_shutdown_please SparkWebHelper.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/GameforgeClient/gfclient.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH b/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH index 5fe204f7..b4e67c82 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/GlyphInstall.exe" start_portwine if try_download "download.dyn.triongames.com/GlyphInstall.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the GlyphClient. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} GlyphClient. ${loc_gui_please_wait} " pw_kill_autostart GlyphClient.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Glyph/GlyphClient.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GOG b/data_from_portwine/scripts/pw_autoinstall/PW_GOG index 94aede31..5763b8de 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG @@ -7,7 +7,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/setup_galaxy_${GOG_VER}.exe" start_portwine if try_download "content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the GOG Galaxy. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} GOG Galaxy. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/GOG Galaxy/GalaxyClient.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH index 04509af0..1de6d89c 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/itch-setup.exe" start_portwine if try_download "itch.io/app/download?platform=windows" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the ITCH.IO. Please wait..." + 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" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LOL b/data_from_portwine/scripts/pw_autoinstall/PW_LOL index b4cc7598..0c2d6903 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL @@ -26,7 +26,7 @@ fi start_portwine if try_download "lol.secure.dyn.riotcdn.net/channels/public/x/installer/current/live.na.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing League of Legends. Please wait..." + pw_start_progress_bar_block "Installing League of Legends. ${loc_gui_please_wait} " zenity --info --width=500 --text "You must click the install button without changing the settings!" pw_kill_autostart RiotClientServices.exe & pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_MAME b/data_from_portwine/scripts/pw_autoinstall/PW_MAME index dfd354b9..fb0e2b09 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_MAME +++ b/data_from_portwine/scripts/pw_autoinstall/PW_MAME @@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/mame0237b_64bit.exe" start_portwine if try_download "github.com/mamedev/mame/releases/download/mame0237/mame0237b_64bit.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the MAME. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} MAME. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Mame" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Mame/mame.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_OSU b/data_from_portwine/scripts/pw_autoinstall/PW_OSU index 937d85cd..5ad0a7e5 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_OSU +++ b/data_from_portwine/scripts/pw_autoinstall/PW_OSU @@ -8,7 +8,7 @@ mkdir -p "${WINEPREFIX}/drive_c/Program Files (x86)/OSU/" export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files (x86)/OSU/osu!.exe" if try_download "m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the OSU!. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} OSU!. ${loc_gui_please_wait} " if [ -f "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!install.exe" ]; then mv -f "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!install.exe" "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!.exe" fi diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY new file mode 100755 index 00000000..9c9d1a0d --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +# Author: chal55rus (Sergey P.) +######################################################################## +export PW_PREFIX_NAME=DOTNET +export LAUNCH_PARAMETERS=("/s" ) +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/plarium_play_setup.exe" +start_portwine +if try_download "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}" +then + pw_start_progress_bar_block "${loc_gui_installing_the} Plarium Play. ${loc_gui_please_wait}" + pw_kill_autostart PlariumPlay.exe & + pw_run "${PW_AUTOINSTALL_EXE}" + portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/PlariumPlay/PlariumPlay.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + kill_portwine + pw_stop_progress_bar + export PORTWINE_CREATE_SHORTCUT_NAME="Plarium Play" + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP index e2bedf3b..a0e7671d 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/PPSSPPSetup.exe" start_portwine if try_download "www.ppsspp.org/files/1_12_3/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the PPSSPPS. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} PPSSPPS. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files/PPSSPP/PPSSPPWindows64.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 index db9462f1..714711cb 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Setup Project64 3.0.1-5664-2df3434.ex start_portwine if try_download "www.pj64-emu.com/file/setup-project64-3-0-0-5632-f83bee9/" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the Project64. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} Project64. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Project64 3.0/Project64.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH index 3ec70560..d4d190a0 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH @@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/RetroArch.7z" start_portwine if try_download "buildbot.libretro.com/stable/1.9.13/windows/x86_64/RetroArch.7z" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the RetroArch. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} RetroArch. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/RetroArch-Win64/retroarch.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR index 74399a79..920645d8 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR @@ -5,7 +5,7 @@ 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}" then - pw_start_progress_bar_block "Rockstar-Games-Launcher. Please wait..." + 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" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM b/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM index 1d32c88d..741f1b23 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM +++ b/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/scummvm-2.5.0-win32.exe" start_portwine if try_download "downloads.scummvm.org/frs/scummvm/2.5.0/scummvm-2.5.0-win32.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the ScummVM. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} ScummVM. ${loc_gui_please_wait} " #pw_kill_autostart launcher101xp.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files/ScummVM/scummvm.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM index 6cddc67d..456f299c 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM +++ b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SteamSetup.exe" start_portwine if try_download "cdn.cloudflare.steamstatic.com/client/installer/SteamSetup.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_cs "Installing the Steam. Please wait..." + pw_start_progress_bar_cs "${loc_gui_installing_the} Steam. ${loc_gui_please_wait} " pw_kill_autostart steam.exe & pw_run "${PW_AUTOINSTALL_EXE}" if [ -f "$WINEPREFIX/drive_c/Program Files (x86)/Steam/Steam.exe" ] diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_UBC b/data_from_portwine/scripts/pw_autoinstall/PW_UBC index 4160dc10..15629815 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_UBC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_UBC @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/UbisoftConnectInstaller.exe" start_portwine if try_download "ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_cs "Installing the Ubisoft Connect. Please wait..." + pw_start_progress_bar_cs "${loc_gui_installing_the} Ubisoft Connect. ${loc_gui_please_wait} " pw_kill_autostart UbisoftConnect.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Ubisoft Game Launcher/UbisoftConnect.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M index 941e9bd2..eb3bec40 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M @@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/visualboyadvance-m-Win-64bit.zip" start_portwine if try_download "github.com/visualboyadvance-m/visualboyadvance-m/releases/download/v2.1.4/visualboyadvance-m-Win-64bit.zip" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the VBA-M. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} VBA-M. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Visualboyadvance-m" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Visualboyadvance-m/visualboyadvance-m.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB index c5cec796..a7d4c46c 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB @@ -23,7 +23,7 @@ fi start_portwine if try_download "165311.selcdn.ru/wosb_installer/wos_client.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing World of Sea Battle. Please wait..." + pw_start_progress_bar_block "Installing World of Sea Battle. ${loc_gui_please_wait} " pw_kill_autostart WorldOfSeaBattleClient.exe & pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE b/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE index 81f6ab7e..edd18133 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/yabause-0.9.15-win64.exe" start_portwine if try_download "download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15-win64.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "Installing the Yabause. Please wait..." + pw_start_progress_bar_block "${loc_gui_installing_the} Yabause. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files/yabause 0.9.15/yabause.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index a0ac3255..217a2270 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -476,7 +476,7 @@ start_portwine () { if [[ "${PW_WINE_FULLSCREEN_FSR}" == 1 ]] || [[ "${WINE_FULLSCREEN_FSR}" == 1 ]] ; then export WINE_FULLSCREEN_FSR=1 - export WINE_FULLSCREEN_FSR_STRENGTH=1 + export WINE_FULLSCREEN_FSR_STRENGTH=2 export WINE_FULLSCREEN_INTEGER_SCALING=0 else export WINE_FULLSCREEN_FSR=0 diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 2041dba8..a315cad2 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -698,8 +698,10 @@ else --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=" 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=" Plarium Play"!"$PW_GUI_ICON_PATH/plariumplay.png"!"":"FBTN" '@bash -c "button_click PW_PLARIUM_PLAY"' \ + --field=" ITCH.IO"!"$PW_GUI_ICON_PATH/itch.png"!"":"FBTN" '@bash -c "button_click PW_ITCH"' & # --field=" Steam Client Launcher"!"$PW_GUI_ICON_PATH/steam.png"!"":"FBTN" '@bash -c "button_click PW_STEAM"' # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' @@ -732,15 +734,12 @@ else export PW_DISABLED_CREATE_DB=1 fi -if [[ -n "${VULKAN_MOD}" && "${VULKAN_MOD}" = "${loc_gui_open_gl}" ]] -then export PW_VULKAN_USE="0" -elif [[ -n "${VULKAN_MOD}" && "${VULKAN_MOD}" = "${loc_gui_vulkan_stable}" ]] -then export PW_VULKAN_USE="1" -elif [[ -n "${VULKAN_MOD}" && "${VULKAN_MOD}" = "${loc_gui_vulkan_git}" ]] -then export PW_VULKAN_USE="2" -elif [[ -n "${VULKAN_MOD}" && "${VULKAN_MOD}" = "${loc_gui_gallium_nine}" ]] -then export PW_VULKAN_USE="3" -fi +case "${VULKAN_MOD}" in + "${loc_gui_open_gl}" ) export PW_VULKAN_USE="0" ;; + "${loc_gui_vulkan_stable}" ) export PW_VULKAN_USE="1" ;; + "${loc_gui_vulkan_git}" ) export PW_VULKAN_USE="2" ;; + "${loc_gui_gallium_nine}" ) export PW_VULKAN_USE="3" ;; +esac init_wine_ver diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 8ce85a3e..d77cd2dd 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=2141 +#SCRIPTS_NEXT_VERSION=2142 ######################################################################## 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 @@ -25,7 +25,7 @@ export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1" export PW_USE_D3D_EXTRAS="1" export PW_PREFIX_NAME="DEFAULT" -export WINE_WIN_START="start.exe /i /unix" +export WINE_WIN_START="start /i /b /wait /high /unix" export PW_USE_SHADER_CACHE="1" export STAGING_SHARED_MEMORY="1" export PW_FORCE_LARGE_ADDRESS_AWARE="1"