diff --git a/.scripts/FreeDoom.sh b/.scripts/FreeDoom.sh index 6bd2b50..518c373 100755 --- a/.scripts/FreeDoom.sh +++ b/.scripts/FreeDoom.sh @@ -14,7 +14,7 @@ export doomPath="$(find /usr/share -type d -name "doom" 2> /dev/null | head -1)" export gzdoom="$(command -v gzdoom)" # Version of the accessibility mod -export tobyVersion="7-0" +export tobyVersion="7-5" doomGames=( @@ -26,6 +26,10 @@ doomGames=( "TobyAccMod_V${tobyVersion}.pk3 TobyDoomLevels.wad ""$gamePath/Addons/TobyV${tobyVersion%%-*}_"* "Freedoom Toby Delux Map Pack" # OperationMDK "TobyAccMod_V${tobyVersion}.pk3 OpMDK.wad ""$gamePath/Addons/TobyV${tobyVersion%%-*}_"* "Freedoom OperationMDK" + # Unmodified Heretic with accessibility + "TobyAccMod_V${tobyVersion}.pk3 ""$gamePath/Addons/HERETIC/TobyHeretic"* "Classic Heretic" + # Heretic accessibility mods + "TobyAccMod_V${tobyVersion}.pk3 TobyHereticLevels.wad ""$gamePath/Addons/HERETIC/TobyHeretic"* "Toby Heretic" "custom_game" "Custom Game" ) diff --git a/linux-game-manager.sh b/linux-game-manager.sh index c3639c1..1c8f46c 100755 --- a/linux-game-manager.sh +++ b/linux-game-manager.sh @@ -676,14 +676,14 @@ case "${game}" in add_launcher "${installPath}/FS2_2.7_Linux/fs2.x86_64" "-ESpeakApplication=espeak-ng" ;; "Freedoom") - tobyVersion="7-0" + tobyVersion="7-5" mkdir -p "${installPath}/doom" doomPath="$(find /usr/share -type d -name "doom" 2> /dev/null)" if [[ ${#doomPath} -lt 5 ]]; then dialog --backtitle "Linux Game Manager" \ --yesno "Do you want Linux Game Manager to install freedoom and gzdoom for you? If you want to do this manually, select no." -1 -1 --stdout || exit 0 if command -v yay &> /dev/null ; then - yay -Sy --noconfirm --sudoloop freedoom gzdoom freedm + yay -Sy --noconfirm --sudoloop freedoom gzdoom freedm blasphemer-wad elif command -v slapt-src &> /dev/null ; then su -c 'slapt-src -i freedoom gzdoom' elif command -v dnf &> /dev/null ; then @@ -715,13 +715,16 @@ case "${game}" in fi # The url breaks the normal download function download_named "keyshare-universal.pk3" "https://forum.zdoom.org/download/file.php?id=42262" - download "${ipfsGateway}/ipfs/QmW5xfL2Z3PQvwKyU34nFLr31dLNZaghjPc68VsA6hFjZD?filename=TobyAccessibilityMod_Version${tobyVersion}.zip" "${ipfsGateway}/ipfs/QmSKgXKDgu6z4NoDt6GWMhDSin8ABpd7oQDj6Tqsfk7xhQ?filename=OpMDK_ForV7-0.zip" + download "${ipfsGateway}/ipfs/QmV4y13thaiHSsYKNrD4arKg2JQ5hextb3GP6aidwvGo3h?filename=TobyAccessibilityMod_Version${tobyVersion}.zip" "${ipfsGateway}/ipfs/QmSKgXKDgu6z4NoDt6GWMhDSin8ABpd7oQDj6Tqsfk7xhQ?filename=OpMDK_ForV7-0.zip" [[ -e "${cache}/DoomMetalVol6.wad" ]] && mv "${cache}/DoomMetalVol6.wad" "${installPath}/doom" [[ -e "${cache}/DoomMetalVol7.wad" ]] && mv "${cache}/DoomMetalVol7.wad" "${installPath}/doom" unzip -n -d "${installPath}/doom" "${cache}/TobyAccessibilityMod_Version${tobyVersion}.zip" unzip -n -d "${installPath}/doom" "${cache}/OpMDK_ForV7-0.zip" cp -v "${cache}/keyshare-universal.pk3" "${installPath}/doom" rm -fv "${installPath}/"*.{bat,exe} + if [[ -e /usr/share/doom/blasphem.wad ]]; then + ln -s /usr/share/doom/blasphem.wad "${installPath}/doom/" + fi mkdir -p "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom" cp "${installPath}/doom/TobyConfig.ini" "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/gzdoom.ini" cp "${installPath}/doom/zcajun/bots.cfg" "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/"