diff --git a/.scripts/FreeDoom.sh b/.scripts/FreeDoom.sh index 518c373..fd05c26 100755 --- a/.scripts/FreeDoom.sh +++ b/.scripts/FreeDoom.sh @@ -36,10 +36,12 @@ doomGames=( export antiGrepStrings=( '-E' '-v' '-e' '^Resolution:' + '-e' '^READMe(\d+).*' ) export grepStrings=( '-E' + '-e' '^\[Toby Accessibility Mod\]' '-e' '^[A-Z][0-9a-z]+: .+' '-e' 'is now known as' '-e' '.+ punched .+ to death\.' @@ -63,6 +65,8 @@ export grepStrings=( ) export sedStrings=( + '-e' 's/^\[Toby Accessibility Mod\] M_/[Toby Accessibility Mod] /' + '-e' 's/^\[Toby Accessibility Mod\] //' '-e' 's/"cl_run" = "true"/run/' '-e' 's/"cl_run" = "false"/walk/' '-e' 's:.*/:Game saved. (:' diff --git a/.scripts/TobyCustom/Brutal_Death_Match.sh b/.scripts/TobyCustom/Brutal_Death_Match.sh index f414a9e..4b1f240 100755 --- a/.scripts/TobyCustom/Brutal_Death_Match.sh +++ b/.scripts/TobyCustom/Brutal_Death_Match.sh @@ -7,8 +7,6 @@ gamePath=~/.local/games/doom # Set up the pk3 and wad files gameOption=( "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" - "${gamePath}/PB-Toby-Compatibility-Addon.pk3" - "${gamePath}/Toby-Universal-Pickup-Beacon-Prototype.pk3" "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')" "$(find ~/.local/games/doom -name 'Project_Brutality-master.pk3')" "${gamePath}/TobyDeathArena_V1-0.wad" diff --git a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh index b427d3f..38f0212 100755 --- a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh +++ b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh @@ -7,8 +7,6 @@ gamePath=~/.local/games/doom # Set up the pk3 and wad files gameOption=( "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" - "${gamePath}/PB-Toby-Compatibility-Addon.pk3" - "${gamePath}/Toby-Universal-Pickup-Beacon-Prototype.pk3" "${gamePath}/OpMDK.wad" "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')" "$(find ~/.local/games/doom -name 'Project_Brutality-master.pk3')" diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh index 5921b59..1c4814b 100755 --- a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh +++ b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh @@ -9,7 +9,6 @@ gamePath=~/.local/games/doom gameOption=( "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" "${gamePath}/PB-Toby-Compatibility-Addon.pk3" - "${gamePath}/Toby-Universal-Pickup-Beacon-Prototype.pk3" "${gamePath}/TobyDoomLevels.wad" "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')" "$(find ~/.local/games/doom -name 'Project_Brutality-master.pk3')" diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh index 2c0e645..d5ee610 100755 --- a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh +++ b/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh @@ -9,7 +9,6 @@ gamePath=~/.local/games/doom gameOption=( "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" "${gamePath}/PB-Toby-Compatibility-Addon.pk3" - "${gamePath}/Toby-Universal-Pickup-Beacon-Prototype.pk3" "${gamePath}/Toby-Demo-Level.wad" "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')" "$(find ~/.local/games/doom -name 'Project_Brutality-master.pk3')" diff --git a/linux-game-manager.sh b/linux-game-manager.sh index 98b59ca..3745cb1 100755 --- a/linux-game-manager.sh +++ b/linux-game-manager.sh @@ -715,7 +715,7 @@ 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/QmV4y13thaiHSsYKNrD4arKg2JQ5hextb3GP6aidwvGo3h?filename=TobyAccessibilityMod_Version${tobyVersion}.zip" "${ipfsGateway}/ipfs/QmNUfYa5P9J6EaDZoGvsiG2ArMR3BCc3gTcW3wPo1HABLU?filename=OpMDK_ForV${tobyVersion}.zip" + download "${ipfsGateway}/ipfs/QmNtn1bugWQg2Y8rB29FH6zYzthsebxmpuMcHcErprzx3z?filename=TobyAccessibilityMod_Version${tobyVersion}.zip" "${ipfsGateway}/ipfs/QmNUfYa5P9J6EaDZoGvsiG2ArMR3BCc3gTcW3wPo1HABLU?filename=OpMDK_ForV${tobyVersion}.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"