diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index e9bbede8..d907d027 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2165### +* HOTFIX - runing Atomic Heart from VK Play + ###Scripts version 2164### * added support for the --autoinstall argument [script_id_pw_autoinstall] - to be able to install the game\program without running the main PortProton interface * updated the output of the --help argument from the terminal diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index cb58ed45..b559c75f 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2165### +* HOTFIX для запуска Atomic Heart из VK Play (после обновления ОБЯЗАТЕЛЬНО кликаем заново автоустановку VK Play из PortProton) + ###Scripts version 2164### * добавлена поддержка аргумента --autoinstall [имя_скрипта_из_pw_autoinstall] - для возможности установки игры\программы без запуска основного интерфейса PortProton * обновлен вывод аргумента --help из терминала diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index c630c54a..c9ce5288 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -958,3 +958,15 @@ pw_create_gui_png () { fi fi } + +pw_find_exe () { + unset PW_FIND_TIME + case "$1" in + "last_day") PW_FIND_TIME="-mtime -1" ;; + esac + + PW_EXCUDE_EXE_FIND='(windows|explorer|anticheat|programdata|redist|setup|.ppdb|unin|error|crash|handler|install|/jre/|steam|uploader)' + PW_PATH_FOR_FIND="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" + + find -P "${PW_PATH_FOR_FIND}" -type f -name "*.exe" ${PW_FIND_TIME} | grep -viE ${PW_EXCUDE_EXE_FIND} +} diff --git a/data_from_portwine/scripts/portwine_db/VKPlayLoader b/data_from_portwine/scripts/portwine_db/VKPlayLoader index 1f75a2e5..f0c17d7f 100755 --- a/data_from_portwine/scripts/portwine_db/VKPlayLoader +++ b/data_from_portwine/scripts/portwine_db/VKPlayLoader @@ -3,11 +3,16 @@ #VKPlayLoader.exe #Rating=5 #####################examples########################### -##export PW_COMMENT_DB="blablabla" +if [[ "${update_loc}" == "RUS" ]] ; then + export PW_COMMENT_DB="Если вы используете Wayland, для перехвата управления в Atomic Heart\nнеобходимо свернуть в трей сам VK Play Игровой центр" +else + export PW_COMMENT_DB="If you use Wayland, to intercept control in Atomic Heart\n,you need to collapse the VK Play Game Center itself into the tray" +fi export PW_WINDOWS_VER="10" -export WINEDLLOVERRIDES="mscoree,mshtml=" +export WINEDLLOVERRIDES="" export PW_MUST_HAVE_DLL="" export PW_PREFIX_NAME="VK_PLAY" +export PW_USE_GSTREAMER="0" add_in_start_portwine () { if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" ]] ; then diff --git a/data_from_portwine/scripts/portwine_db/setup b/data_from_portwine/scripts/portwine_db/setup index 1f58c787..a943eb74 100755 --- a/data_from_portwine/scripts/portwine_db/setup +++ b/data_from_portwine/scripts/portwine_db/setup @@ -16,5 +16,8 @@ export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronizatio export PW_WINEDBG_DISABLE=1 export PW_USE_GAMEMODE=0 # Force disabele gamemod export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. -export PW_DLL_INSTALL="mfc42 vcrun6sp6 vcrun2012 mfc120 mfc140 vcrun2013" +export PW_DLL_INSTALL="" +add_in_stop_portwine () { + echo TEST +} diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP index e1d02275..475a124a 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP @@ -39,10 +39,10 @@ export PW_MUST_HAVE_DLL="" # fi start_portwine -if try_download "https://origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} EA Launcher. ${loc_gui_please_wait} " - pw_kill_autostart EABackgroundService.exe & + # pw_kill_autostart EABackgroundService.exe & # pw_kill_autostart EALocalHostSvc.exe & mkdir -p "$WINEPREFIX/drive_c/Program Files/Electronic Arts/EA Desktop/EA Desktop" pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 223f4206..b4b25bb3 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -716,7 +716,7 @@ else --field=" Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png"!"":"FBTN" '@bash -c "button_click PW_UBC"' \ --field=" EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click PW_EVE"' \ --field=" Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \ - --field=" Origin"!"$PW_GUI_ICON_PATH/origin.png"!"":"FBTN" '@bash -c "button_click PW_ORIGIN"' \ + --field=" EA App"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' \ --field=" Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click PW_ROCKSTAR"' \ --field=" vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \ --field=" Ankama Launcher"!"$PW_GUI_ICON_PATH/ankama.png"!"":"FBTN" '@bash -c "button_click PW_ANKAMA"' \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 4dbb2d72..98bbbd5c 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=2164 +#SCRIPTS_NEXT_VERSION=2165 ######################################################################## 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