Skip to content

Commit

Permalink
v1.6.5 - removed MF - this project should stay clean!
Browse files Browse the repository at this point in the history
  • Loading branch information
frostworx committed Sep 11, 2020
1 parent cf936f6 commit 8623054
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 75 deletions.
15 changes: 1 addition & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ Also enable everything you want to use generally for your games in [the default
* **[Vortex Mod Manager](#Vortex)** via steam `Vortex` category see [Video of usage](#stl-Vortex-gif)
* **[GFWL/xlive](#GFWL)** automatic support for games using GFWL
* **[WMP10](#WMP10)** automatic support for WMP10 installation
* **[mf-install](#mf-install)** automatic support for Media Foundation installation
* **[self maintaining configs](#self-maintaining-configs)** optional automatic cloning of this repo as replacemement for missing system wide installation
* **[GameConqueror](#GameConqueror)** automatically open gameconqueror (scanmem gui) with the game exe on game launch
* **[Custom User Start/Stop scripts](#Start-Stop-Scripts)** optional start custom scripts when game starts/ends
Expand All @@ -82,6 +81,7 @@ Also enable everything you want to use generally for your games in [the default
The script itself doesn't have any special dependencies

- bash *(only shell tested)*
- [Yad](#Yad) for the GUI

For the optional features you need:
- [strace](#Strace)
Expand Down Expand Up @@ -394,7 +394,6 @@ As of writing those are
[ReShade](#ReShade) ReShade itself and required d3dcompiler dlls
[Auto Tweaks](#Auto-Tweaks) downloads for all enabled Auto Tweaks are stored in here
[GFWL/xlive](#GFWL) xlive replacement
[mf-install](#mf-install) will be pulled in here if used
[self maintaining configs](#self-maintaining-configs) stl itself will be downloaded here when self-maintaining-configs are used

### Logs
Expand Down Expand Up @@ -502,18 +501,6 @@ Giana Sisters Twisted Dreams (223220)
Giana Sisters - Rise of the Owlverlord (246960)
**

#### mf-install
**stl** supports optional automatic installation of MF using [mf installed](https://github.com/z0z0z/mf-install).
The used dlls can't be distributed officially *(see [here](https://github.com/z0z0z/mf-install/issues/1))*,
so the user has to decide for himself if he wants to use this project.
When a game has `USEMF=1` set *(f.e. with Steam Category MF)* **stl** will go through following process when the game is started:

- check if the game `WINEPREFIX` *(GPFX)* already has [mf installed](https://github.com/z0z0z/mf-install). If yes, return and start game.
- check if mf-install is found in `STLDLDIR/mf-install`. If yes automatically install into the `GPFX` and start the game.
- requester opens, giving the user the option to download mf-install into`STLDLDIR/mf-install` automatically, if yes, download for all future games, install into `GPFX` and start the game.
- if user selects to not install it the game will start without MF.


#### Vortex
[Vortex Mod Manager](https://github.com/Nexus-Mods/Vortex)

Expand Down
1 change: 0 additions & 1 deletion categories/MF.conf

This file was deleted.

27 changes: 27 additions & 0 deletions misc/gtk.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
@define-color bg_color #2A2E33;
@define-color selButTL #545C68;
@define-color selButBR #393E46;
@define-color inButTL #414750;
@define-color inButBR #343940;
@define-color buttontext #D5D9E9;
@define-color regtext #A7ABB2;

.background {
background-color: @bg_color;
color: @regtext;
font: 28px "Arial";
}

button:active,
button:hover,
button:focus {
background-image: linear-gradient(to bottom right, @selButTL, @selButBR 80%);
}

button {
font: 24px "Arial";
color: @buttontext;
min-height: 49px;
min-width: 90px;
background-image: linear-gradient(to bottom right, @inButTL, @inButBR 80%);
}
62 changes: 2 additions & 60 deletions stl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
### project ###

PROGNAME="SteamTinkerLaunch"
PROGVERS="v1.6.4"
PROGVERS="v1.6.5"
PROGCMD="$(basename "$0")"
PROJECTPAGE="https://github.com/frostworx/steamtinkerlaunch"

Expand Down Expand Up @@ -1823,54 +1823,6 @@ function checkXliveless {
fi
}

function checkMF {

MF="Media Foundation"
MFI="mf-install"

MFDL="$STLDLDIR/$MFI"
MFINSTURL="https://github.com/z0z0z/$MFI.git"

MFISH="$MFDL/${MFI}.sh"
MFMINSIZE="100000"
MFPLATDLL="mfplat.dll"
GPFX64DIR="$GPFX/drive_c/windows/system32/"
REQWIDTH="1400"

if [ -n "$USEMF" ]; then
if [ "$USEMF" -eq 1 ]; then

if [ "$(wc -c < "$GPFX64DIR/$MFPLATDLL")" -gt "$MFMINSIZE" ]; then # cheap check, but should be sufficient TODO?
writelog "SKIP" "${FUNCNAME[0]} - looks like $MF is already installed - nothing to do"
else
if [ ! -f "$MFDL/system32/$MFPLATDLL" ]; then
writelog "INFO" "${FUNCNAME[0]} - '$MFI' not found - opening requester"

if [ -x "$(command -v "$STEAM_ZENITY" 2>/dev/null)" ]; then
"$STEAM_ZENITY" --title="$PROGNAME ($PROGCMD) - $PROGVERS" --question --text="'$MFDL' not found'!\n\nIf available it can be installed automatically into the gamedir for every game which requires it..\nClick Skip to skip now, click Download to download and install the file automatically!" --ok-label=Skip --cancel-label=Download --width "$REQWIDTH"
case $? in
0) writelog "SKIP" "${FUNCNAME[0]} - skipping download of '$MFDL' as requested"
return
;;
1) writelog "INFO" "${FUNCNAME[0]} - downloading '$MFDL' as requested"
gitUpdate "$MFDL" "$MFINSTURL"
;;
esac
else
writelog "SKIP" "${FUNCNAME[0]} - can't open requester"
fi
fi

if [ -f "$MFISH" ]; then
writelog "INFO" "${FUNCNAME[0]} - executing '$MFISH' to install $MF into WINEPREFIX '$GPFX' using proton '$(dirname "$GPROT")'"
PROTON="$(dirname "$GPROT")" WINEPREFIX="$GPFX" "$MFISH" -proton
else
writelog "SKIP" "${FUNCNAME[0]} - skipping installation as '$MFISH' was not found"
fi
fi
fi
fi
}

# automatically applies game-specific tweaks
#function preloadForcedTweaks {
Expand Down Expand Up @@ -2222,13 +2174,6 @@ function createAutoTweakLU {
LINECONV=1
fi
# mf
if grep -q "mfplat" <<< "$line"; then
writelog "INFO" "${FUNCNAME[0]} - found mfplat - setting USEMF"
echo "USEMF=1" >> "$LUTWEAKCFG"
LINECONV=1
fi
# write_config
if grep -q "write_config" <<< "$line"; then
writelog "INFO" "${FUNCNAME[0]} - found write_config setting TWEAKCMD"
Expand Down Expand Up @@ -2284,7 +2229,7 @@ function createAutoTweakLU {
if [ -n "$LUATDEBUG" ]; then
if [ "$LUATDEBUG" -eq 1 ]; then
awk -i inplace '!visited[$0]++' "$LUTWEAK1DEBUG"
grep -v "write_config\|KB976932\|appid\|mf-install\|insert-disc\|\"winesteam\"\|''\|create_prefix\|winekill\|\"description\"\|N\/A\|\"files\"\|mfinstall" "$LUTWEAK1DEBUG" >> "$LUTWEAKDEBUG"
grep -v "write_config\|KB976932\|appid\|insert-disc\|\"winesteam\"\|''\|create_prefix\|winekill\|\"description\"\|N\/A\|\"files\"" "$LUTWEAK1DEBUG" >> "$LUTWEAKDEBUG"
awk -i inplace '!visited[$0]++' "$LUTWEAKDEBUG"
fi
fi
Expand Down Expand Up @@ -4087,9 +4032,6 @@ function launchSteamProtonGame {
# remove GFWL if NOGFWL is 1
checkXliveless

# add MF if USEMF is 1
checkMF

# start winetricks gui if RUN_WINETRICKS is 1 or silently if WINETRICKSPAKS is not empty
writelog "INFO" "${FUNCNAME[0]} - checkWinetricksLaunch:"
checkWinetricksLaunch
Expand Down

0 comments on commit 8623054

Please sign in to comment.