From 16b09c2ae006d03586df5c655c7eeb10f3b47037 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 29 Sep 2024 16:25:47 +0300 Subject: [PATCH] updated DXVK and VKD3D, + autoinstall --- data_from_portwine/changelog_en | 2 +- data_from_portwine/changelog_ru | 10 +++++++++- .../scripts/pw_autoinstall/PW_BLOOD_AND_SOUL | 2 +- .../{PW_STARCONFLICT => PW_STAR_CONFLICT} | 6 +++--- data_from_portwine/scripts/pw_autoinstall/PW_VBA-M | 1 + data_from_portwine/scripts/start.sh | 2 +- data_from_portwine/scripts/var | 4 ++-- 7 files changed, 18 insertions(+), 9 deletions(-) rename data_from_portwine/scripts/pw_autoinstall/{PW_STARCONFLICT => PW_STAR_CONFLICT} (79%) diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 20596e4..51a262f 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -3,7 +3,7 @@ You can help us in the development of the project on the website: https://linux- Changelog: ###Scripts version 2356### / stable / Date: 28.09.2024 / Download update size: 4 megabytes -* Fixed work in steam and ingame +* fixed work in steam and ingame ###Scripts version 2355### / stable / Date: 28.09.2024 / Download update size: 385 megabytes * cumulative update to the stable version of PortProton scripts diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 7b306f2..14bf47b 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,8 +2,16 @@ ----------------------------------------- История изменений: +; * обновлен PROTON_LG до версии "9-15" +* обновлены версии: + * DXVK_GIT "2.4.1-74" + * VKD3D_GIT "1.1-4202" +* добавлена автоустановка игры "Star Conflict" (спасибо Chal55rus) +* добавлена автоустановка игры "Blood and Soul" (спасибо Chal55rus) + + ###Scripts version 2356### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 4 мегабайт -* Исправлена работа в steam и ingame +* исправлена работа в steam и ingame ###Scripts version 2355### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 385 мегабайт * кумулятивное обновление стабильной версии скриптов PortProton diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL b/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL index 73690a6..8109fcd 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BLOOD_AND_SOUL @@ -9,7 +9,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Blood and Soul" start_portwine if try_download "https://bsclassic.com/files/bs-install.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then - pw_start_progress_bar_install_game "Blood and Soul ..." + pw_start_progress_bar_install_game "Blood and Soul." pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Blood and Soul Classic/launcher.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STARCONFLICT b/data_from_portwine/scripts/pw_autoinstall/PW_STAR_CONFLICT similarity index 79% rename from data_from_portwine/scripts/pw_autoinstall/PW_STARCONFLICT rename to data_from_portwine/scripts/pw_autoinstall/PW_STAR_CONFLICT index 51327d4..cf51eb1 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_STARCONFLICT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_STAR_CONFLICT @@ -1,15 +1,15 @@ #!/usr/bin/env bash # Author: chal55rus ######################################################################## -export PW_PREFIX_NAME="STARCONFLICT" +export PW_PREFIX_NAME="STAR_CONFLICT" export LAUNCH_PARAMETERS=("/VERYSILENT") -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/starconf_launcher_1.0.3.10.exe" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/starconf_installer.exe" export PORTWINE_CREATE_SHORTCUT_NAME="Star Conflict" start_portwine if try_download "https://yupmaster.gaijinent.com/launcher/current.php?id=StarConflictLauncher" "${PW_AUTOINSTALL_EXE}" no_mirror then - pw_start_progress_bar_install_game "Star Conflict ..." + pw_start_progress_bar_install_game "Star Conflict." pw_kill_autostart launcher.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="${WINEPREFIX}/drive_c/users/steamuser/AppData/Local/StarConflict/launcher.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M index 54b2625..cb7707b 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M @@ -2,6 +2,7 @@ # Author: chal55rus (Sergey P.) ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/visualboyadvance-m-Win-x86_64.zip" + start_portwine if try_download "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/latest/download/visualboyadvance-m-Win-x86_64.zip" "${PW_AUTOINSTALL_EXE}" no_mirror then diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 122313c..6c48e7f 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -745,7 +745,7 @@ else --field=" Farlight 84"!"$PW_GUI_ICON_PATH/farlight84.png"!"":"FBTN" '@bash -c "button_click --normal PW_FARLIGHT84"' \ --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click --normal PW_SWL"' \ --field=" Blood and Soul"!"$PW_GUI_ICON_PATH/bloodandsoul.png"!"":"FBTN" '@bash -c "button_click --normal PW_BLOOD_AND_SOUL"' \ - --field=" Star Conflict (ENG)"!"$PW_GUI_ICON_PATH/starconflict.png"!"":"FBTN" '@bash -c "button_click --normal PW_STARCONFLICT"' \ + --field=" Star Conflict (ENG)"!"$PW_GUI_ICON_PATH/starconflict.png"!"":"FBTN" '@bash -c "button_click --normal PW_STAR_CONFLICT"' \ 2>/dev/null & export START_FROM_PP_GUI="1" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index d2615f0..503ecd2 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -55,9 +55,9 @@ export PW_VULKAN_USE="2" export VKD3D_LIMIT_TESS_FACTORS="64" export DXVK_LEGACY_VER="1.6.1" export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.4-94" +export DXVK_GIT_VER="2.4.1-74" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-4191" +export VKD3D_GIT_VER="1.1-4202" ###VKBASALT### export PW_VKBASALT_EFFECTS="Curves:cas" export PW_VKBASALT_FFX_CAS="0.66"