Scripts version 2188

2023-05-26 11:01:43 +03:00 · 2023-05-26 11:01:43 +03:00 · 8bbb990c2b
commit 8bbb990c2b
parent 1e198ba0c6
14 changed files with 55 additions and 61 deletions
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@ -2,6 +2,15 @@ You can help us in the development of the project on the website: boosty.to/linu
 -----------------------------------------
 Changelog:

+###Scripts version 2188###
+* Indiegala Client installation is installed in a separate IGCLIENT prefix
+* temporarily removed installers that require improvements:
+    Genshin Impact (the developers, for their part, again banned the launch under wine)
+    Plarium Play (requires dotnet 6, which does not work adequately at the moment)
+    Electronic Arts App (after switching from Origin to EA App launcher works, but the games do not start) 
+* added the ability to download a new version of wine: PROTON_STEAM_8.0-2D (using DOWNLOAD OTHER WINE)
+* fixed incorrect display of the game icon when launching exe files similar in name: Setup, setup, Launcher, launcher (ALT bug 46269)
+
 ###Scripts version 2187###
 * Added: (Thanks chal55rus Sergey P.)
    CONTRACT WARS
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@ -2,6 +2,15 @@
 -----------------------------------------
 История изменений:

+###Scripts version 2188###
+* установка Indiegala Client устанавливается в отдельный префикс IGCLIENT и добавлена информация при запуске лончера: После первого подтверждения логина в вашем браузере необходимо перезапустить игру
+* временно убраны установщики которые треуют доработки:
+    Genshin Impact (разработчики со своей стороны снова запретили запуск под wine)
+    Plarium Play (требуется dotnet 6 который не работает адекватно на данный момент)
+    Electronic Arts App (после перехода с Origin на EA App лончер работает, но игры не запускаются)    
+* добавлена возможность скачивания новой версии wine: PROTON_STEAM_8.0-2D (с помощью DOWNLOAD OTHER WINE)
+* исправлена неправильное отображение иконки игры при запуске схожих по названию exe файлов: Setup, setup, Launcher, launcher (ALT bug 46269)
+
 ###Scripts version 2187###
 * добавлена установка эмуляторов: (Спасибо chal55rus Sergey P.)
    Xenia
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@ -941,6 +941,9 @@ pw_create_gui_png () {
    fi
    PW_RESIZE_TO=128
    try_remove_file "${PORT_WINE_PATH}/data/img/setup.png"
+    try_remove_file "${PORT_WINE_PATH}/data/img/Setup.png"
+    try_remove_file "${PORT_WINE_PATH}/data/img/launcher.png"
+    try_remove_file "${PORT_WINE_PATH}/data/img/Launcher.png"
    if [[ -x "`which wrestool 2>/dev/null`" ]] && [[ ! -f "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" ]] ; then
        try_remove_dir "${PORT_WINE_TMP_PATH}/tmp_img"
        create_new_dir "${PORT_WINE_TMP_PATH}/tmp_img"
--- a/data_from_portwine/scripts/portwine_db/EALauncher
+++ b/data_from_portwine/scripts/portwine_db/EALauncher
@ -4,7 +4,7 @@
 #EADesktop.exe
 #Rating=5
 #####################examples###########################
-# export PW_DLL_INSTALL="vcrun2022"               # Install DDL in port prefix (used winetricks) 
+# export PW_DLL_INSTALL="vcrun2019"               # Install DDL in port prefix (used winetricks) 
 export PW_VULKAN_USE=1                       # dxvk, vkd3d or 0 for OpenGL
 # export PW_USE_TERMINAL="1"
 export DISABLE_CP_DEFPFX=1
--- a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher
+++ b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher
@ -7,7 +7,7 @@
 # export PW_WINE_USE=PROTON_GE
 export PW_VULKAN_USE=1
 export LAUNCH_PARAMETERS="-SkipBuildPatchPrereq"
-export PW_DLL_INSTALL="vcrun2012 vcrun2013 vcrun2022"
+export PW_DLL_INSTALL="vcrun2012 vcrun2013 vcrun2019"
 export PW_USE_D3D_EXTRAS=1
 export PW_WINE_USE="PROTON_LG"
 export WINEDLLOVERRIDES="vulkan-1=n,b"
--- a/data_from_portwine/scripts/portwine_db/IGClient
+++ b/data_from_portwine/scripts/portwine_db/IGClient
@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+#Author: fidel
+#IGClient.exe
+#Rating=1-5
+#####################examples###########################
+export PW_COMMENT_DB="\nПосле первого подтверждения логина в вашем браузере\nнеобходимо перезапустить игру.\n"
+export PW_WINE_USE="PROTON_LG"
+export PW_VULKAN_USE="1"
+export PW_PREFIX_NAME="IGCLIENT"
+export PW_DLL_INSTALL="vcrun2019"
--- a/data_from_portwine/scripts/portwine_db/PlariumPlay
+++ b/data_from_portwine/scripts/portwine_db/PlariumPlay
@ -4,6 +4,8 @@
 #Rating=1-5
 #####################examples###########################
 ##export PW_COMMENT_DB="blablabla"
+export PW_WINE_USE="WINE-PROTON-8.0-2-AMD64"
+export PW_PREFIX_NAME="DOTNET"
 export PW_WINDOWS_VER="10"
 export PW_DLL_INSTALL=""
 export WINEDLLOVERRIDES="libglesv2="
@ -13,7 +15,6 @@ 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"
@ -35,17 +36,3 @@ 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"
--- a/data_from_portwine/scripts/portwine_db/itch
+++ b/data_from_portwine/scripts/portwine_db/itch
@ -3,36 +3,5 @@
 #itch.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_GE
 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 ; }
+#add_in_start_portwine () { commands ; }
--- a/data_from_portwine/scripts/portwine_db/steam
+++ b/data_from_portwine/scripts/portwine_db/steam
@ -5,8 +5,8 @@
 ################################################
 export PW_COMMENT_DB="Steam"
 export PW_WINDOWS_VER="10"
-export PW_DLL_INSTALL="vcrun2022 d3dcompiler_46"
-export WINEDLLOVERRIDES=""
+export PW_DLL_INSTALL="vcrun2019 d3dcompiler_46"
+export WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b;winemenubuilder=d"
 export LAUNCH_PARAMETERS="-gamepadui -fullscreen -no-dwrite"
 export PW_VULKAN_USE="1"

--- a/data_from_portwine/scripts/portwine_db/wgc
+++ b/data_from_portwine/scripts/portwine_db/wgc
@ -14,7 +14,7 @@ export LAUNCH_PARAMETERS=""            # Additional launch options
 export PW_WINDOWS_VER=10                        # Set windows version 10, 7 or XP
 #export PW_USE_NVAPI_AND_DLSS=0
 export WINEDLLOVERRIDES="ucrtbase,xaudio2_7,xaudio2_8=n,b"
-export PW_DLL_INSTALL="lucida vcrun2022"     # Install DDL in port prefix (used winetricks)
+export PW_DLL_INSTALL="lucida vcrun2019"     # Install DDL in port prefix (used winetricks)
 ##export PW_GUI_DISABLED_CS=1
 ##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
 export PW_USE_D3D_EXTRAS=0
--- a/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT
@ -2,7 +2,9 @@
 # Author: Castro Fidel
 ########################################################################
 export LAUNCH_PARAMETERS=("/S")
+export PW_PREFIX_NAME="IGCLIENT"
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/igclient_setup.exe"
+export PW_DLL_INSTALL="vcrun2019"

 start_portwine
 if try_download "https://content.indiegalacdn.com/common/IGClientSetup.exe" "${PW_AUTOINSTALL_EXE}"
--- a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY
@ -4,6 +4,9 @@
 export PW_PREFIX_NAME=DOTNET
 export LAUNCH_PARAMETERS=("/s" )
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/plarium_play_setup.exe"
+export PW_WINE_USE="WINE-PROTON-8.0-2-AMD64"
+gui_proton_downloader silent "WINE-PROTON-8.0-2-AMD64"
+
 start_portwine
 if try_download "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}"
 then
@ -19,3 +22,5 @@ then
    portwine_create_shortcut
 fi
 stop_portwine
+
+
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Author: linux-gaming.ru
-# clear
+
 export NO_AT_BRIDGE=1
 export pw_full_command_line=("$0" $*)
 if [ -f "$1" ]; then
@ -302,7 +302,7 @@ pw_prefix_manager () {
        --text="Change config for prefix: <b>\"${PW_PREFIX_NAME}\"</b>" \
        --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/settings_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" &

-        "${pw_yad_new}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=5 --width=700 --height=600 --center \
+        "${pw_yad_new}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=5 --width=900 --height=800 --center \
        --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "PREFIX MANAGER..." --tab-pos=bottom --tab="DLL" --tab="FONTS" --tab="SETTINGS"
        YAD_STATUS="$?"
        if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then
@ -747,8 +747,6 @@ else
    --field="   GoG Galaxy Launcher"!"$PW_GUI_ICON_PATH/gog.png"!"":"FBTN" '@bash -c "button_click PW_GOG"' \
    --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="   Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"' \
-    --field="   Electronic Arts 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="   OSU"!"$PW_GUI_ICON_PATH/osu.png"!"":"FBTN" '@bash -c "button_click PW_OSU"' \
    --field="   League of Legends"!"$PW_GUI_ICON_PATH/lol.png"!"":"FBTN" '@bash -c "button_click PW_LOL"' \
@ -756,11 +754,9 @@ else
    --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="   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 (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"' \
-    --field="   Indiegala Client"!"$PW_GUI_ICON_PATH/igclient.png"!"":"FBTN" '@bash -c "button_click PW_IGCLIENT"' \
    --field="   Warframe"!"$PW_GUI_ICON_PATH/warframe.png"!"":"FBTN" '@bash -c "button_click PW_WARFRAME"' \
    --field="   Panzar"!"$PW_GUI_ICON_PATH/panzar.png"!"":"FBTN" '@bash -c "button_click PW_PANZAR"' \
    --field="   STALCRAFT"!"$PW_GUI_ICON_PATH/stalcraft.png"!"":"FBTN" '@bash -c "button_click PW_STALCRAFT"' \
@ -769,8 +765,12 @@ else
    --field="   Stalker Online"!"$PW_GUI_ICON_PATH/so.png"!"":"FBTN" '@bash -c "button_click PW_SO"' \
    --field="   Metal War Online"!"$PW_GUI_ICON_PATH/mwo.png"!"":"FBTN" '@bash -c "button_click PW_MWO"' \
    --field="   Ankama Launcher"!"$PW_GUI_ICON_PATH/ankama.png"!"":"FBTN" '@bash -c "button_click PW_ANKAMA"' \
+    --field="   Indiegala Client"!"$PW_GUI_ICON_PATH/igclient.png"!"":"FBTN" '@bash -c "button_click PW_IGCLIENT"' \
    --field="   Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' &

+    # --field="   Electronic Arts App"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"'
+    # --field="   Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"'
+    # --field="   Plarium Play"!"$PW_GUI_ICON_PATH/plariumplay.png"!"":"FBTN" '@bash -c "button_click PW_PLARIUM_PLAY"'
    # --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"'
--- 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=2187
+#SCRIPTS_NEXT_VERSION=2188
 ########################################################################
 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
@ -60,8 +60,8 @@ export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf"
 pw_install_dll_in_prefix ()
 {
    case $PW_PREFIX_NAME in
-        DEFAULT) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2022" ;;
-         DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2022 faudio dotnet48" ;;
+        DEFAULT) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019" ;;
+         DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48" ;;
              *) export PW_MUST_HAVE_DLL="" ;;
    esac
 }