From 8f9443e0c04f24da38b5d65493bc139e92e82417 Mon Sep 17 00:00:00 2001 From: zany130 Date: Thu, 10 Nov 2022 15:42:58 -0500 Subject: [PATCH] fix reshade override list and some skel work on Auto bumping global reshade version --- steamtinkerlaunch | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 86745577..3384af3d 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -2593,6 +2593,7 @@ function setDefaultCfgValues { if [ -z "$LUXTORPEDACMD" ] ; then LUXTORPEDACMD="$STEAMCOMPATOOLS/luxtorpeda/luxtorpeda"; fi if [ -z "$LUXTORPEDAARGS" ] ; then LUXTORPEDAARGS="wait-before-run"; fi if [ -z "$RSVERS" ] ; then RSVERS="5.4.2"; fi +# if [ -z "$AUTOBUMPRESHADE" ] ; then AUTOBUMPRESHADE="0"; fi if [ -z "$DOWNLOAD_RESHADE" ] ; then DOWNLOAD_RESHADE="1"; fi if [ -z "$RESHADESRCDIR" ] ; then RESHADESRCDIR="$STLDLDIR/reshade"; fi if [ -z "$D3D47_64" ] ; then D3D47_64="${D3D47//./_64.}"; fi @@ -3011,6 +3012,8 @@ function saveCfg { echo "DOWNLOAD_RESHADE=\"$DOWNLOAD_RESHADE\"" echo "## $DESC_RSVERS" echo "RSVERS=\"$RSVERS\"" +# echo "## $AUTOBUMPRESHADE" +# echo "AUTOBUMPRESHADE=\"$AUTOBUMPRESHADE\"" echo "## $DESC_RESHADESRCDIR" echo "RESHADESRCDIR=\"$RESHADESRCDIR\"" echo "## $DESC_D3D47_64" @@ -4960,6 +4963,7 @@ function AllSettingsEntriesDummyFunction { --field=" $GUI_RESHADEUPDATE!$DESC_RESHADEUPDATE ('RESHADEUPDATE')":CHK "${RESHADEUPDATE/#-/ -}" `#CAT_Shader` `#SUB_Checkbox` `#MENU_GAME` \ --field=" $GUI_RESHADEOVERRIDETOGGLE!$DESC_RESHADEOVERRIDETOGGLE ('RSOVRD')":CHK "${RSOVRD/#-/ -}" `#CAT_Shader` `#SUB_Checkbox` `#MENU_GAME` \ --field=" $GUI_RSVERS!$DESC_RSVERS ('RSVERS')" "${RSVERS/#-/ -}" `#CAT_Shader` `#SUB_ReShade` `#MENU_GLOBAL` \ +--field=" $GUI_AUTOBUMPRESHADE!$DESC_AUTOBUMPRESHADE ('AUTOBUMPRESHADE')":CHK "${AUTOBUMPRESHADE/#-/ -}" `#CAT_Shader` `#SUB_ReShade` `#MENU_GLOBAL` \ --field=" $GUI_RS_32!$DESC_RS_32 ('RS_32')" "${RS_32/#-/ -}" `#CAT_Shader` `#SUB_ReShade` `#MENU_GLOBAL` \ --field=" $GUI_RS_64!$DESC_RS_64 ('RS_64')" "${RS_64/#-/ -}" `#CAT_Shader` `#SUB_ReShade` `#MENU_GLOBAL` \ --field=" $GUI_RS_32_VK!$DESC_RS_32_VK ('RS_32_VK')" "${RS_32_VK/#-/ -}" `#CAT_Shader` `#SUB_ReShade` `#MENU_GLOBAL` \ @@ -7462,10 +7466,20 @@ function installd3d47dll { fi } +#function autoBumpReShade { +# RSVERSLATEST="$( fetchGitHubTags "$RESHADEPROJURL" "1" )" +# if [ "$AUTOBUMPRESHADE" -eq 1 ] && [ "$RSVERS" -ge RSVERSLATEST ]; then +# +# fi +#} + function createDLReShadeList { if [ "$RSOVRD" -eq 1 ]; then RSVERSONLINE="$( fetchGitHubTags "$RESHADEPROJURL" "3" )" - RESHADEVERSIONS="$RSOVRVERS!$RSVERS!$RSVERSONLINE!4.91!3.4.1" + RSVERSONLINE="${RSVERSONLINE//$'\n'/!}" + RSVERSONLINE="${RSVERSONLINE//v/}" + writelog "INFO" "${FUNCNAME[0]}" - "Found the following '$RESH' versions online '$RSVERSONLINE'" + RESHADEVERSIONS="$RSOVRVERS!$RSVERSONLINE!4.91!3.4.1" fi }