23 changed files with 122 additions and 234 deletions
--- a/.install/Alter
+++ b/.install/Alter
@ -1,5 +1,3 @@
-game="${0##*/}"
-game="${game%.sh}"
 check_dependencies git sox tt++
 git -C "${installPath}/" clone --recurse-submodules https://github.com/lilmike/tintin-alteraeon.git | \
    dialog --progressbox "Installing \"${game}\", please wait..." -1 -1
--- a/.install/EmpireMUD.sh
+++ b/.install/EmpireMUD.sh
@ -1,5 +1,3 @@
-game="${0##*/}"
-game="${game%.sh}"
 check_dependencies git sox tt++
 git -C "${installPath}/" clone --recurse-submodules https://github.com/lilmike/tintin-empiremud.git | \
    dialog --progressbox "Installing \"${game}\", please wait..." -1 -1
--- a/.install/End
+++ b/.install/End
@ -1,5 +1,3 @@
-game="${0##*/}"
-game="${game%.sh}"
 check_dependencies git opusdec sox tt++
 git -C "${installPath}/" clone https://git.2mb.codes/~stormdragon2976/tintin-endoftime | \
    dialog --progressbox "Installing \"${game}\", please wait..." -1 -1
--- a/.install/Legends
+++ b/.install/Legends
@ -1,5 +0,0 @@
-game="${0##*/}"
-game="${game%.sh}"
-check_dependencies git sox tt++
-git -C "${installPath}/" clone --recurse-submodules https://github.com:hjozwiak/tintin-kallisti-pack | \
-    dialog --progressbox "Installing \"${game}\", please wait..." -1 -1
--- a/.install/Slay
+++ b/.install/Slay
@ -1,39 +1,24 @@
 check_architecture x86_64
-check_dependencies steamcmd
+echo "Please note this requires the game to be available either in your Steam library"
+echo "or as the installer purchased from gog.com."
+echo "If using the gog.com installer, please use the default path when prompted."
 alert
-dialog --backtitle "Linux Game manager" \
-    --msgbox \
-    "Please note this requires the game to be available either in your Steam library\nor as the installer purchased from gog.com.\nIf using the gog.com installer, please use the default path when prompted." -1 -1 --stdout
-dialog --backtitle "Linux Game Manager" \
-    --yes-label "GOG" \
-    --no-label "Steam" \
-    --yesno "Select installation method" -1 -1 --stdout
-installationMethod=$?
+check_dependencies steamcmd
 appId="646570"
-gogFileName="slay_the_spire_2020_12_15_8735c9fe3cc2280b76aa3ec47c953352a7df1f65_43444.sh"
-if [[ $installMethod -eq 1 ]]; then
-    # Steam Installation
+if ! [[ -f  ~/Downloads/slay_the_spire_2020_12_15_8735c9fe3cc2280b76aa3ec47c953352a7df1f65_43444.sh ]] && ! [[ -f ~/Desktop/slay_the_spire_2020_12_15_8735c9fe3cc2280b76aa3ec47c953352a7df1f65_43444.sh ]]; then
    echo "Please enter Steam user name:"
    read -er steamUser
    steamcmd +@sSteamCmdForcePlatformType linux +force_install_dir "${HOME}/.local/games/SlayTheSpire" +login "$steamUser" +app_update "$appId" +quit
-    if [[ $? -ne 0 ]]; then
-        dialog --backtitle "Linux Game Manager" \
-            --msgbox "Error installing game through Steam." -1 -1 --stdout
-        exit 1
-    fi
 else
-    # GOG Installation
-    get_installer "$gogFileName" "https://www.gog.com/en/game/slay_the_spire"
-    DISPLAY="" find ~/Downloads -maxdepth 1 -type f -name "$gogFileName" -exec bash "{}" \; ||
-        DISPLAY="" find ~/Desktop -maxdepth 1 -type f -name "$gogFileName" -exec bash "{}" \;
+    DISPLAY=""
+    find ~/Downloads -maxdepth 1 -type f -name 'slay_the_spire_2020_12_15_8735c9fe3cc2280b76aa3ec47c953352a7df1f65_43444.sh' -exec bash "{}" \; ||
+        find ~/Desktop -maxdepth 1 -type f -name 'slay_the_spire_2020_12_15_8735c9fe3cc2280b76aa3ec47c953352a7df1f65_43444.sh' -exec bash "{}" \;
    if [[ $? -eq 0 ]]; then
-        ln -sf "${HOME}/GOG Games/Slay the Spire/game" "${installPath}/SlayTheSpire" ||
-        { dialog --backtitle "Linux Game Manager" \
-            --msgbox "Error creating link to game directory." -1 -1 --stdout
-          exit 1; }
-    else
-        dialog --backtitle "Linux Game Manager" \
-            --msgbox "Error installing game from GOG installer." -1 -1 --stdout
+    	ln -sf "${HOME}/GOG Games/Slay the Spire/game" "${installPath}/SlayTheSpire" ||
+            { echo "Error creating link."
+            exit 1; }
+else
+        echo "Error installing game."
        exit 1
    fi
 fi
@ -42,13 +27,13 @@ mkdir -p "${HOME}/.config/ModTheSpire"
 if [[ -f ~"/.config/ModTheSpire/mod_lists.json" ]]; then
    dialog --backtitle "Linux Game manager" \
        --yesno "Existing mod_lists.json file found. Would you like to replace it?" -1 -1 --stdout &&
-    cp -v .files/SlayTheSpire/mod_lists.json "${HOME}/.config/ModTheSpire/mod_lists.json"
+            cp -v .files/SlayTheSpire/mod_lists.json "${HOME}/.config/ModTheSpire/mod_lists.json"
 else
    cp -v .files/SlayTheSpire/mod_lists.json "${HOME}/.config/ModTheSpire/mod_lists.json"
 fi
 cp -v .files/SlayTheSpire/MTS.sh "${HOME}/.local/games/SlayTheSpire/"
 # Get mods
-declare -A modsMap=(
+declare -A mods=(
    [mod the spire]=1605060445
    [base mod]=1605833019
    [stslib]=1609158507
@ -57,25 +42,17 @@ declare -A modsMap=(
    [say the spire]=2239220106
 )
 installString=""
-for modId in ${modsMap[@]} ; do
-    installString="$installString +workshop_download_item $appId $modId"
+for x in ${mods[@]} ; do
+    installString="$installString +workshop_download_item $appId $x"
 done
 steamcmd +@sSteamCmdForcePlatformType linux +force_install_dir "${HOME}/.local/games/SlayTheSpire/" +login anonymous $installString +quit
-if [[ $? -ne 0 ]]; then
-    dialog --backtitle "Linux Game Manager" \
-        --msgbox "Error installing required mods. Some accessibility features may not be available." -1 -1 --stdout
-    exit 1
-fi
 mkdir -p "$HOME/.local/games/SlayTheSpire/mods"
-for modName in "${!modsMap[@]}" ; do
-    if [[ "$modName" == "mod the spire" ]]; then
-        ln -sr "$HOME/.local/games/SlayTheSpire/steamapps/workshop/content/$appId/${modsMap[$modName]}"/* "$HOME/.local/games/SlayTheSpire/"
+for x in "${!mods[@]}" ; do
+    if [ "$x" == "mod the spire" ] ; then
+        ln -sr "$HOME/.local/games/SlayTheSpire/steamapps/workshop/content/$appId/${mods[$x]}"/* "$HOME/.local/games/SlayTheSpire/"
    else
-        ln -sr "$HOME/.local/games/SlayTheSpire/steamapps/workshop/content/$appId/${modsMap[$modName]}"/* "$HOME/.local/games/SlayTheSpire/mods/"
-    fi
-    if [[ $? -ne 0 ]] && [[ "$modName" == "say the spire" ]]; then
-        dialog --backtitle "Linux Game Manager" \
-            --msgbox "Error installing SayTheSpire mod. Screen reader support will not be available." -1 -1 --stdout
-        exit 1
+        ln -sr "$HOME/.local/games/SlayTheSpire/steamapps/workshop/content/$appId/${mods[$x]}"/* "$HOME/.local/games/SlayTheSpire/mods/"
    fi
 done
+launcherPath="$(readlink -f "$0")"
+launcherPath="${launcherPath%/*}"
--- a/.install/StickMUD.sh
+++ b/.install/StickMUD.sh
@ -1,5 +1,3 @@
-game="${0##*/}"
-game="${game%.sh}"
 check_dependencies git sox tt++
 git -C "${installPath}/" clone --recurse-submodules https://github.com/stormdragon2976/tintin-stickmud.git | \
    dialog --progressbox "Installing \"${game}\", please wait..." -1 -1
--- a/.install/The
+++ b/.install/The
@ -1,6 +1,6 @@
 check_architecture x86_64
-get_installer "Ttc v3.2 linux.zip" "https://renzivan.itch.io/the-tornado-chicken"
-unzip -d "${installPath}/The Tornado Chicken" "${cache}/Ttc v3.2 linux.zip"
+get_installer "Ttc v3.0 linux.zip" "https://renzivan.itch.io/the-tornado-chicken"
+unzip -d "${installPath}/The Tornado Chicken" "${cache}/Ttc v3.0 linux.zip"
 chmod +x "${installPath}/The Tornado Chicken/Ttc"
 echo "Note: When the game first starts it will be playing very loud music with the built in suboptimal voice."
 echo "You are recommended to press page down several times to turn down the music, then go to settings and enable speech with screen reader, using speech dispatcher."
--- a/.launch/Alter
+++ b/.launch/Alter
@ -3,7 +3,7 @@ pushd "${mudPath%/*}"
 git pull | \
 dialog --progressbox "Checking for updates, please wait..." -1 -1
 if [[ -n "${COLORTERM}" ]]; then
-    terminal_emulator "${mudPath%/*}" "tt++" "${mudPath##*/}"
+terminal_emulator tt++ ${mudPath##*/}
 else
-    tt++ ${mudPath##*/}
+tt++ ${mudPath##*/}
 fi
--- a/.launch/EmpireMUD.game
+++ b/.launch/EmpireMUD.game
@ -3,7 +3,7 @@ pushd "${mudPath%/*}"
 git pull | \
 dialog --progressbox "Checking for updates, please wait..." -1 -1
 if [[ -n "${COLORTERM}" ]]; then
-    terminal_emulator "${mudPath%/*}" "tt++" "${mudPath##*/}"
+terminal_emulator tt++ ${mudPath##*/}
 else
-    tt++ ${mudPath##*/}
+tt++ ${mudPath##*/}
 fi
--- a/.launch/End
+++ b/.launch/End
@ -3,7 +3,7 @@ pushd "${mudPath%/*}"
 git pull | \
 dialog --progressbox "Checking for updates, please wait..." -1 -1
 if [[ -n "${COLORTERM}" ]]; then
-    terminal_emulator "${mudPath%/*}" "tt++" "${mudPath##*/}"
+terminal_emulator tt++ ${mudPath##*/}
 else
-    tt++ "${mudPath%/*}" "${mudPath##*/}"
+tt++ ${mudPath##*/}
 fi
--- a/.launch/FreeDoom.game
+++ b/.launch/FreeDoom.game
@ -32,58 +32,6 @@ speak() {
    done
 }

-
-audio_manual() {
-    if command -v mpv &> /dev/null ; then
-        mediaPlayer=("mpv" "--really-quiet" "--no-video")
-    else
-        mediaPlayer=("play" "-qV0")
-    fi
-    local manualPath="${gamePath}/Manual"
-    declare -a menuList
-    for i in "${manualPath}"/*/ ; do
-        local path="${i%/}"
-        local name="${i/${manualPath}\//}"
-        local name="${name% *}"
-        menuList+=("$path" "$name")
-    done
-    manualPath="$(dialog --backtitle "Select a Manual" \
-        --clear \
-        --no-tags \
-        --menu "Please select one" 0 0 0 "${menuList[@]}" --stdout)"
-    [[ $? -ne 0 ]] && exit 0
-    # If user selected a manual, show the audio file menu
-    if [[ -n "$manualPath" ]]; then
-        declare -a audioList=("all" "Play All")  # Start with "All" option
-        # Add all mp3 files to the menu
-        while IFS= read -r file; do
-            local filename="${file##*/}"
-            local menuname="${filename%.mp3}"
-            audioList+=("$file" "$menuname")
-        done < <(find "$manualPath" -name "*.mp3" | sort)
-        local selection
-        selection="$(dialog --backtitle "Select Audio Track" \
-            --clear \
-            --no-tags \
-            --menu "Please select one" 0 0 0 "${audioList[@]}" --stdout)"
-        [[ $? -ne 0 ]] && exit 0
-        if [[ -n "$selection" ]]; then
-            if [[ "$selection" == "all" ]]; then
-                # Play all files in order
-                find "$manualPath" -name "*.mp3" -print0 | sort -z | \
-                    while IFS= read -r -d '' file; do
-                        "${mediaPlayer[@]}" "$file"
-                    done
-            else
-                # Play selected file
-                "${mediaPlayer[@]}" "$selection"
-                return
-            fi
-        fi
-    fi
-}
-
-
 # Dialog setup:
 DIALOG_ITEM_HELP=""
 export DIALOGOPTS='--no-lines --visit-items'
@ -232,24 +180,17 @@ if [[ "$doomLanguage" != "en" ]]; then
    init_translation_db
 fi

-doomGames+=("manual" "Audio Manual")
-while [[ -z "${gameOption}" ]] || [[ "${gameOption}" == "manual" ]]; do
-    gameOption="$(dialog --backtitle "Select your Doom!" \
-            --clear \
-            --no-tags \
-            --ok-label "Single Player" \
-            --cancel-label "Death Match" \
-            --extra-button \
-            --extra-label "co-op" \
-            --help-button \
-            --help-label "Exit" \
-            --menu "Please select one" 0 0 0 "${doomGames[@]}" --stdout)"
-    buttonCode=$?
-    [[ $buttonCode -ne 0 ]] && break
-    if [[ "${gameOption}" == "manual" ]]; then
-        audio_manual
-    fi
-done
+gameOption="$(dialog --backtitle "Select your Doom!" \
+        --clear \
+        --no-tags \
+        --ok-label "Single Player" \
+        --cancel-label "Death Match" \
+        --extra-button \
+        --extra-label "co-op" \
+        --help-button \
+        --help-label "Exit" \
+        --menu "Please select one" 0 0 0 "${doomGames[@]}" --stdout)"
+buttonCode=$?
 if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then
    gameOption+=" DoomMetalVol7.wad"
 elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then
@ -276,7 +217,7 @@ case ${buttonCode} in
                dialog --backtitle "Deathmatch" --clear --msgbox "No ip address or URL given." -1 -1 --stdout
                exit 1
            fi
-            flags=('-join' "${ipAddress}" '+Toby_SnapToTargetTargetingMode' '0')
+            flags=('-join' "${ipAddress}")
        else
            # List of maps included:
            maps=(
@ -340,7 +281,6 @@ case ${buttonCode} in
                    '-host' "${players}"
                    '-skill' "${skillLevel}"
                    '-deathmatch'
-                    '+Toby_SnapToTargetTargetingMode' '0'
                    '+set' 'sv_cheats' '1'
                    '+fraglimit' "$fraglimit"
                    '+dmflags' '16384' '+dmflags' '4' '+dmflags' '128' '+dmflags' '4096'
@ -406,9 +346,6 @@ case ${buttonCode} in
    0)
    if [[ "${gameOption%% *}" == "custom_game" ]]; then
        custom_game
-    fi
-    if [[ -e "${gamePath}/Toby-Doom-Level-Music-Renamer.pk3" ]] && [[ "${gameOption}" =~ TobyDoomLevels.wad ]]; then
-        gameOption+=("${gamePath}/Toby-Doom-Level-Music-Renamer.pk3")
    fi
        launch_game ${gameOption[@]} "${flags[@]}"
    ;;
--- a/.launch/Legends
+++ b/.launch/Legends
@ -1,9 +0,0 @@
-mudPath="${installPath}/tintin-kallisti-pack/kallisti.tin"
-pushd "${mudPath%/*}"
-git pull | \
-dialog --progressbox "Checking for updates, please wait..." -1 -1
-if [[ -n "${COLORTERM}" ]]; then
-    terminal_emulator "${mudPath%/*}" "tt++" "${mudPath##*/}"
-else
-    tt++ ${mudPath##*/}
-fi
--- a/.launch/Slay
+++ b/.launch/Slay
@ -1,33 +1,2 @@
-#!/usr/bin/env bash
-
-menulist() {
-    # Args: menu options.
-    # returns: selected tag
-    local i
-    local menuList
-    for i in $@ ; do
-        menuList+=("$i" "$i")
-    done
-    dialog --backtitle "Select a Slay the Spire profile." \
-        --clear \
-        --no-tags \
-        --menu "$(gettext "Please select one")" 0 0 0 "${menuList[@]}" --stdout
-    if [[ $? -ne 1 ]]; then
-        exit 0
-    fi
-}
-
-# Create a list of profiles
-profiles=($(jq -r '.lists | keys[]' "${HOME}/.config/ModTheSpire/mod_lists.json"))
-
-if [[ "${#profiles[@]}" -ne 1 ]]; then
-    currentProfile="$(menulist "${profiles[@]}")"
-else
-    currentProfile="Default"
-fi
-
-pushd "${HOME}/.local/games/SlayTheSpire"
-./MTS.sh --profile "$currentProfile"
-popd
-
-exit 0
+pushd "${installPath}"
+"${launcherPath}/.scripts/SlayTheSpire.sh"
--- a/.launch/SlayTheSpire.game
+++ b/.launch/SlayTheSpire.game
@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+menulist() {
+    # Args: menu options.
+    # returns: selected tag
+    local i
+    local menuList
+    for i in $@ ; do
+        menuList+=("$i" "$i")
+    done
+    dialog --backtitle "Select a Slay the Spire profile." \
+        --clear \
+        --no-tags \
+        --menu "$(gettext "Please select one")" 0 0 0 "${menuList[@]}" --stdout
+    if [[ $? -ne 1 ]]; then
+        exit 0
+    fi
+}
+
+# Create a list of profiles
+profiles=($(jq -r '.lists | keys[]' "${HOME}/.config/ModTheSpire/mod_lists.json"))
+
+if [[ "${#profiles[@]}" -ne 1 ]]; then
+    currentProfile="$(menulist "${profiles[@]}")"
+else
+    currentProfile="Default"
+fi
+
+pushd "${HOME}/.local/games/SlayTheSpire"
+./MTS.sh --profile "$currentProfile"
+popd
+
+exit 0
--- a/.launch/StickMUD.game
+++ b/.launch/StickMUD.game
@ -4,7 +4,7 @@ pushd "${mudPath%/*}"
 git pull | \
 dialog --progressbox "Checking for updates, please wait..." -1 -1
 if [[ -n "${COLORTERM}" ]]; then
-    terminal_emulator "${mudPath%/*}" "tt++" "${mudPath##*/}"
+terminal_emulator tt++ ${mudPath##*/}
 else
-    tt++ ${mudPath##*/}
+tt++ ${mudPath##*/}
 fi
--- a/.launch/TobyCustom/ArmyOfDarknessDoom.sh
+++ b/.launch/TobyCustom/ArmyOfDarknessDoom.sh
@ -21,5 +21,3 @@ elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then
 fi

 source ${BASH_SOURCE[0]%/*}/.mapmenu
-
-flags=('+Toby_UniversalBeacon_UseUniversalSounds' 'true')
--- a/.launch/TobyCustom/Custom_Death_Match.sh
+++ b/.launch/TobyCustom/Custom_Death_Match.sh
@ -3,7 +3,7 @@
 # Set up the pk3 and wad files 
 gameOption=(
    "${gamePath}/TobyAccMod_V${tobyVersion}.pk3"
-    "$gamePath/Addons/MENU/TobyV*_"*
+    "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"*
 )

 # Get a list of pk3s to use for the custom death match.
@ -42,7 +42,7 @@ if [[ $buttonCode -eq 0 ]]; then
        dialog --backtitle "Deathmatch" --clear --msgbox "No ip address or URL given." -1 -1 --stdout
        exit 1
    fi
-    flags=('-join' "${ipAddress}" '+Toby_SnapToTargetTargetingMode' '0')
+    flags=('-join' "${ipAddress}")
 else
    # List of maps included:
    maps=(
@ -53,9 +53,7 @@ else
        "5" "Ocean Fortress (2-4 players)"
        "6" "Water Treatment Facility (2-4 players)"
        "7" "Phobos Base Site 4 (2-4 players)"
-        "8" "Hangar Bay 18 (2-4 players)"
-        "9" "Garden of Demon (2-4 players)"
-        "10" "Outpost 69 (2-4 players)")
+        "8" "Hangar Bay 18 (2-4 players)")
    # Array of how many players a given map supports in dialog rangebox syntax
    declare -a mapPlayers=(
        [1]="2 4"
@ -65,9 +63,7 @@ else
        [5]="2 4"
        [6]="2 4"
        [7]="2 4"
-        [8]="2 4"
-        [9]="2 4"
-        [10]="2 4")
+        [8]="2 4")
    map="$(dialog --backtitle "Select Map" \
        --clear \
        --no-tags \
@ -106,7 +102,6 @@ else
            '-host' "${players}"
            '-skill' "${skillLevel}"
            '-deathmatch'
-            '+Toby_SnapToTargetTargetingMode' '0'
            '+set' 'sv_cheats' '1'
            '+fraglimit' "$fraglimit"
            '+dmflags' '16384' '+dmflags' '4' '+dmflags' '128' '+dmflags' '4096'
@ -117,5 +112,12 @@ else
 fi

 gameOption+=("${pk3}"
-    "${gamePath}/Addons/MAPS/TobyDeathArena_V1-5.wad"
+    "${gamePath}/TobyDeathArena_V1-0.wad"
 )
+
+# Check for and include if present a wad. Some people may not have it.
+if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then
+    gameOption+=" DoomMetalVol7.wad"
+elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then
+    gameOption+=" DoomMetalVol6.wad"
+fi
--- a/.launch/TobyCustom/GoMidievilOnTheirAss.sh
+++ b/.launch/TobyCustom/GoMidievilOnTheirAss.sh
@ -17,11 +17,15 @@ gameOption=(

 source ${BASH_SOURCE[0]%/*}/.mapmenu
 flags=(
+    # Key bindings
+    '+bind Alt +altattack'
+    '+bind Ctrl +attack'
+    '+bind G +User1'
+    '+bind U unreloader'
+    # Variables
    '+Toby_NarrationOutputType 2'
    '+pb_exaggeratedrecoil false'
    '+pb_weapon_recoil_mod_horizontal 0'
    '+pb_weapon_recoil_mod_vertical 0'
    '+vertspread true'
-    '+Toby_SnapToTargetTargetingMode' '1'
-    '+Toby_UniversalBeacon_UseUniversalSounds' 'true'
 )
--- a/.launch/TobyCustom/Project_Brutality.sh
+++ b/.launch/TobyCustom/Project_Brutality.sh
@ -26,10 +26,14 @@ fi

 source ${BASH_SOURCE[0]%/*}/.mapmenu
 flags=(
-    '+pb_exaggeratedrecoil' 'false'
-    '+pb_weapon_recoil_mod_horizontal' '0'
-    '+pb_weapon_recoil_mod_vertical' '0'
-    '+vertspread' 'true'
-    '+Toby_SnapToTargetTargetingMode' '1'
-    '+Toby_UniversalBeacon_UseUniversalSounds' 'false'
+    # Key bindings
+    '+bind Alt +altattack'
+    '+bind Ctrl +attack'
+    '+bind G +User1'
+    '+bind U unreloader'
+    # Variables
+    '+pb_exaggeratedrecoil false'
+    '+pb_weapon_recoil_mod_horizontal 0'
+    '+pb_weapon_recoil_mod_vertical 0'
+    '+vertspread true'
 )
--- a/.launch/TobyCustom/Project_BrutalityLatest.sh
+++ b/.launch/TobyCustom/Project_BrutalityLatest.sh
@ -25,10 +25,15 @@ fi

 source ${BASH_SOURCE[0]%/*}/.mapmenu
 flags=(
-    '+pb_exaggeratedrecoil' 'false'
-    '+pb_weapon_recoil_mod_horizontal' '0'
-    '+pb_weapon_recoil_mod_vertical' '0'
-    '+vertspread' 'true'
-    '+Toby_SnapToTargetTargetingMode' '1'
-    '+Toby_UniversalBeacon_UseUniversalSounds' 'false'
+    # Key bindings
+    '+bind Alt +altattack'
+    '+bind Ctrl +attack'
+    '+bind G +User1'
+    '+bind U unreloader'
+    # Variables
+    '+Toby_NarrationOutputType 2'
+    '+pb_exaggeratedrecoil false'
+    '+pb_weapon_recoil_mod_horizontal 0'
+    '+pb_weapon_recoil_mod_vertical 0'
+    '+vertspread true'
 )
--- a/.launch/TobyCustom/README.ProjectBrutality
+++ b/.launch/TobyCustom/README.ProjectBrutality
@ -1,14 +0,0 @@
-In your ~/.config/gzdoom/gzdoom.ini file, if you do not have these four sections  create them at the end. If they are there, you can just update the keybindings. It should look like this:
-
-
-[Doom.PBInteractions.Bindings]
-
-[Doom.PBInteractions.DoubleBindings]
-
-[Doom.PBAdvMoves.Bindings]
-F=+User2
-G=+User1
-U=unreloader
-V=+User4
-
-[Doom.PBAdvMoves.DoubleBindings]
--- a/.launch/TobyCustom/WolfenDoom.sh
+++ b/.launch/TobyCustom/WolfenDoom.sh
@ -12,8 +12,8 @@ check_dependencies "${gamePath}/Addons/WOLFENDOOM/orig_enh.pk3" \
 # Set up the pk3 and wad files 
 gameOption=(
    "${gamePath}/TobyAccMod_V${tobyVersion}.pk3"
-    "$gamePath/Addons/MENU/TobyV*_"*
-    "$gamePath/Addons/DOOM/TobyV*_"*"Proximity"*".pk3"
+    "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"*
+    "$gamePath/Addons/DOOM/TobyV${tobyVersion%%-*}_"*"Proximity"*".pk3"
 )

 menuList=("${gamePath}/Addons/WOLFENDOOM/orig_enh.pk3" "WolfenDoom"
@ -35,6 +35,4 @@ flags=(
    '+bind X turn180'
    # Variables
    '+Toby_NarrationOutputType 2'
-    '+Toby_SnapToTargetTargetingMode' '1'
-    '+Toby_UniversalBeacon_UseUniversalSounds' 'true'
 )
--- a/linux-game-manager.sh
+++ b/linux-game-manager.sh
@ -111,16 +111,13 @@ check_dependencies() {

 # Function to open a terminal emulator
 terminal_emulator() {
-    # Arguments workingDirectory, rest of arguments
-    local workingDir="$1"
-    shift
    terminals=(
        "lxterminal"
        "mate-terminal"
        "gnome-terminal"
    )
    for i in "${terminals[@]}" ; do
-        if command $i --working-directory="${workingDir}" -e "$@" ; then
+        if command $i --working-directory="${game%/*}" -e $* ; then
            return
        fi
    done