diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 335862f..4e2e383 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,12 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2206### Date: 07.07.2023 / Update download size: 250 megabytes. +* updated PROTON_LG_8-6 (with MONO 8.0) +* updated DXVK_GIT_VER="2.2-116" +* updated VKD3D_GIT_VER="1.1-3488" +* added Guild Wars 2 to autoinstall + ###Scripts version 2205### Date: 01.07.2023 / Update download size: 240 megabytes. * updated PROTON_LG_8-4 * with the PROTON_LG_8-4 version, the "World of Ships" game is working again diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index d47a117..f2bf083 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,13 @@ ----------------------------------------- История изменений: +###Scripts version 2206### Дата: 07.07.2023 / Размер скачиваемого обновления: 250 мегабайт. +* обновлен PROTON_LG до версии 8-6 (совместно с версией MONO 8.0) +* обновлены версии: + DXVK_GIT_VER="2.2-116" + VKD3D_GIT_VER="1.1-3488" +* добавлена автоустановка игры: Guild Wars 2 + ###Scripts version 2205### Дата: 01.07.2023 / Размер скачиваемого обновления: 240 мегабайт. * обновлен PROTON_LG до версии 8-4 * с версией PROTON_LG_8-4 снова работает игра "Мир Кораблей" diff --git a/data_from_portwine/img/gui/gw2.png b/data_from_portwine/img/gui/gw2.png new file mode 100644 index 0000000..9088dbe Binary files /dev/null and b/data_from_portwine/img/gui/gw2.png differ diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index e1f741c..129ccd9 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -20,7 +20,7 @@ else fi fi -if [ "${update_loc}" = "RUS" ] ; then +if [[ "${update_loc}" == "RUS" ]] ; then export loc_gui_pw_reinstall_pp="Переустановить ${portname}" export loc_gui_rm_pp="Удалить ${portname}" export loc_gui_upd_pp="Проверить обновления" @@ -264,7 +264,7 @@ if [ "${update_loc}" = "RUS" ] ; then export loc_gui_installing_the="Устанавливаем" export loc_gui_please_wait="Пожалуйста подождите..." -elif [ "${update_loc}" = "ENG" ] ; then +elif [[ "${update_loc}" == "ENG" ]] ; then export loc_gui_pw_reinstall_pp="REINSTALL ${portname}" export loc_gui_rm_pp="REMOVE ${portname}" 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 bfa3a86..313f58d 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2 +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2 @@ -5,9 +5,6 @@ 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/" @@ -16,13 +13,13 @@ export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/Gw2S if try_download "https://s3.amazonaws.com/gw2cdn/client/branches/Gw2Setup-64.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} Guild Wars 2. ${loc_gui_please_wait} " - pw_kill_autostart Gw2-64.exe 3 & - cd "${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/" + pw_kill_autostart Gw2.exe 3 & pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe="${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/Gw2-64.exe" + portwine_exe="${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/Gw2.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" kill_portwine + mv -f "${WINEPREFIX}/drive_c/users/steamuser/Temp/"* "${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/" pw_stop_progress_bar export PORTWINE_CREATE_SHORTCUT_NAME="Guild Wars 2" portwine_create_shortcut diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index c4acd22..faa566c 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -446,6 +446,7 @@ pw_autoinstall_from_db () { export PW_MANGOHUD=0 export ENABLE_VKBASALT=0 export PW_USE_D3D_EXTRAS=1 + export PW_LOG=1 . "${PORT_SCRIPTS_PATH}/pw_autoinstall/${PW_YAD_SET}" } @@ -766,11 +767,12 @@ else --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=" Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click PW_GUILD_WARS_2"' \ --field=" Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"' 2>/dev/null & # --field=" Electronic Arts App"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' # --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"' diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index bffbbc4..0548a00 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=2205 +#SCRIPTS_NEXT_VERSION=2206 ######################################################################## 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 @@ -21,7 +21,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 /i /b /wait /high /unix" +export WINE_WIN_START="start /wait /high /unix" export PW_USE_SHADER_CACHE="1" export STAGING_SHARED_MEMORY="1" export PROTON_DISABLE_LSTEAMCLIENT="1" @@ -36,7 +36,7 @@ export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v12" export PW_FAKE_DLSS_VER="230506" ###WINE_PROTON_LG### -export PW_LG_VER="8-4" +export PW_LG_VER="8-6" export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}" ###WINE_PROTON_GE### export PW_GE_VER="8-3" @@ -46,9 +46,9 @@ export PW_WINE_FULLSCREEN_FSR="1" # export VKD3D_FEATURE_LEVEL=12_1 export VKD3D_LIMIT_TESS_FACTORS="16" export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.2-7" +export DXVK_GIT_VER="2.2-116" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-3424" +export VKD3D_GIT_VER="1.1-3488" ###PREFIX_VERSION### export DOTPFX_VER="48v1" export DEFPFX_VER="v1"