From 870126d13b29dc0134b5861170011bd8076b348c Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Fri, 22 Oct 2021 18:54:48 +0300
Subject: [PATCH] ###Scripts version 2030###
---
data_from_portwine/changelog | 3 ++
data_from_portwine/scripts/functions_helper | 3 +-
data_from_portwine/scripts/lang | 14 +++++++++
data_from_portwine/scripts/var | 2 +-
data_from_portwine/vkBasalt.conf | 32 ++++++++-------------
5 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog
index 38e8e47e..7bf62bc3 100755
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
@@ -7,6 +7,9 @@
* добавить проверку количества db файлов на один exe
* заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
-----------------------------------------
+###Scripts version 2030###
+* HOTFIX - исправление ошибки распаковки обновлений на некоторых системах
+
###Scripts version 2029###
* MANGOHUD выключен по умолчанию (включается для каждой игры отдельно в EDIT_DB, либо глобально в /data/user.conf добавить: export PW_MANGOHUD=1
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 6b188918..c5a1488c 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -590,8 +590,7 @@ pw_port_update () {
print_info "Update scripts..."
try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
if try_download "https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz" "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" ; then
- tar -xvzf "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" -C "${PORT_WINE_TMP_PATH}"
- if [ "$?" == "0" ] ; then
+ if unpack_tar_gz "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" -C "${PORT_WINE_TMP_PATH}" ; then
cp -fr "${PORT_WINE_TMP_PATH}/PortWINE-master/data_from_portwine/"* "${PORT_WINE_PATH}/data/"
try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
try_remove_dir "${PORT_WINE_TMP_PATH}/PortWINE-master/"
diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang
index f824d741..95feaff9 100755
--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@@ -76,6 +76,20 @@ then
export PW_USE_RUNTIME_INFO='Использовать контейнерный режим запуска (Рекомендуется не изменять значение)'
export PW_MANGOHUD_INFO='Использование мониторинга FPS и нагрузки системы (Включается и выключается сочитанием клавиш - правый Shift + F12)'
+ export 3DFX_INFO='Имитация старого графического ускорителя 3dfx (добавляет горизонтальные полосы)'
+ export AdaptiveSharpen_INFO='Увеличение резкости, можно использовать совместо с CAS'
+ export Bloom_INFO='Добавляет свечения от ярких источников света в игре'
+ export Border_INFO='Обрезка изображения сверху и снизу (как в кино =)'
+ export Cartoon_INFO='Сильное увеличение резкости краев тексур'
+ export ChromaticAberration_INFO='Добавляет хроматические аберрации к изображению'
+ export Clarity_INFO='Увеличение резкости текстур с небольшими модификациями контраста изображения (похож по эффекту на CAS)'
+ export ColorMatrix_INFO='Добавление холодных цветов'
+ export Colourfulness_INFO='Увеличение насыщености цветов'
+ export FakeHDR_INFO='Расширение динамического диапазона цветов'
+ export FilmGrain2_INFO='Добавление эффекта зерна кинопленки'
+ export Curves_INFO='Увеличение контраста изображения'
+ export Denoise_INFO='Уменьшение шумов за счет смазывания изображения'
+
elif [ "${update_loc}" = "ENG" ]
then
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 0ecefb7c..74a7ce36 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
#!/bin/bash
#Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_NEXT_VERSION=2029
+#SCRIPTS_NEXT_VERSION=2030
#PORT_NEXT_VERSION=97
########################################################################
export PW_MANGOHUD=0
diff --git a/data_from_portwine/vkBasalt.conf b/data_from_portwine/vkBasalt.conf
index cc41042b..4f091c21 100755
--- a/data_from_portwine/vkBasalt.conf
+++ b/data_from_portwine/vkBasalt.conf
@@ -1,25 +1,13 @@
reshadeTexturePath = /usr/local/share/reshade/textures
reshadeIncludePath = /usr/local/share/reshade/
-3DFX = /usr/local/share/reshade/shaders/3DFX.fx
-AdaptiveFog = /usr/local/share/reshade/shaders/AdaptiveFog.fx
-AdaptiveSharpen = /usr/local/share/reshade/shaders/AdaptiveSharpen.fx
-AmbientLight = /usr/local/share/reshade/shaders/AmbientLight.fx
-ASCII = /usr/local/share/reshade/shaders/ASCII.fx
-AspectRatio = /usr/local/share/reshade/shaders/AspectRatio.fx
-Bloom = /usr/local/share/reshade/shaders/Bloom.fx
-Border = /usr/local/share/reshade/shaders/Border.fx
-Cartoon = /usr/local/share/reshade/shaders/Cartoon.fx
-ChromaKey = /usr/local/share/reshade/shaders/ChromaKey.fx
-ChromaticAberration = /usr/local/share/reshade/shaders/ChromaticAberration.fx
-CinematicDOF = /usr/local/share/reshade/shaders/CinematicDOF.fx
-Clarity = /usr/local/share/reshade/shaders/Clarity.fx
-ColorMatrix = /usr/local/share/reshade/shaders/ColorMatrix.fx
+FilmGrain2 = /usr/local/share/reshade/shaders/FilmGrain2.fx
+FakeHDR = /usr/local/share/reshade/shaders/FakeHDR.fx
Colourfulness = /usr/local/share/reshade/shaders/Colourfulness.fx
-CRT = /usr/local/share/reshade/shaders/CRT.fx
-Curves = /usr/local/share/reshade/shaders/Curves.fx
-Daltonize = /usr/local/share/reshade/shaders/Daltonize.fx
-Deband = /usr/local/share/reshade/shaders/Deband.fx
+Bloom = /usr/local/share/reshade/shaders/Bloom.fx
+ChromaticAberration = /usr/local/share/reshade/shaders/ChromaticAberration.fx
Denoise = /usr/local/share/reshade/shaders/Denoise.fx
+Clarity = /usr/local/share/reshade/shaders/Clarity.fx
+Curves = /usr/local/share/reshade/shaders/Curves.fx
Depth3D = /usr/local/share/reshade/shaders/Depth3D.fx
Dephhaze = /usr/local/share/reshade/shaders/Dephhaze.fx
DisplayDepth = /usr/local/share/reshade/shaders/DisplayDepth.fx
@@ -27,10 +15,8 @@ DOF = /usr/local/share/reshade/shaders/DOF.fx
DPX = /usr/local/share/reshade/shaders/DPX.fx
Emphasize = /usr/local/share/reshade/shaders/Emphasize.fx
EyeAdaption = /usr/local/share/reshade/shaders/EyeAdaption.fx
-FakeHDR = /usr/local/share/reshade/shaders/FakeHDR.fx
FakeMotionBlur = /usr/local/share/reshade/shaders/FakeMotionBlur.fx
FilmGrain = /usr/local/share/reshade/shaders/FilmGrain.fx
-FilmGrain2 = /usr/local/share/reshade/shaders/FilmGrain2.fx
FilmicAnamorphSharpen = /usr/local/share/reshade/shaders/FilmicAnamorphSharpen.fx
FilmicPass = /usr/local/share/reshade/shaders/FilmicPass.fx
FineSharp = /usr/local/share/reshade/shaders/FineSharp.fx
@@ -72,6 +58,12 @@ UIDetect = /usr/local/share/reshade/shaders/UIDetect.fx
UIMask = /usr/local/share/reshade/shaders/UIMask.fx
Vibrance = /usr/local/share/reshade/shaders/Vibrance.fx
Vignette = /usr/local/share/reshade/shaders/Vignette.fx
+AdaptiveSharpen = /usr/local/share/reshade/shaders/AdaptiveSharpen.fx
+ColorMatrix = /usr/local/share/reshade/shaders/ColorMatrix.fx
+Cartoon = /usr/local/share/reshade/shaders/Cartoon.fx
+3DFX = /usr/local/share/reshade/shaders/3DFX.fx
+Border = /usr/local/share/reshade/shaders/Border.fx
+AspectRatio = /usr/local/share/reshade/shaders/AspectRatio.fx
casSharpness = 0.7
toggleKey = Home