diff --git a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh index 81bedf8..3ba510b 100755 --- a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh +++ b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh @@ -33,7 +33,7 @@ grepStrings+=('-e' 'New PDA Entry:' '-e' 'Picked up ' '-e' '^(Mega|Soul)sphere$' '-e' '^Took ' - '-e' ' was .*(\.|!)' + '-e' ' (SPLATTERED|was) .*(\.|!)' '-e' '^Vanguard of the gods!$' '-e' "You've found " '-e' 'You (collected|got|found|picked up) ') diff --git a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh.bak b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh.bak deleted file mode 100755 index b5da736..0000000 --- a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh.bak +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -# Set the current path to the Doom path required by some OS. -pushd "${doomPath}" - -# Add all the TobyDoom stuff we need, exclude things we do not. -# mapfile -t addons < <(find "${doomPath}/Addons/" -type f -iname "TobyV${tobyVersion%%-*}_*" \ - #-not -iname "TobyV${tobyVersion%%-*}_Decorations.pk3" \ - #-not -iname "TobyV${tobyVersion%%-*}_Monsters.pk3" \ - #-not -iname "TobyV${tobyVersion%%-*}_Guns.pk3" -#) - -# Set up the pk3 and wad files -gameOption=( - "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')" - "${doomPath}/TobyAccMod_V${tobyVersion}.pk3" - ${addons[@]} - "${doomPath}/PB-Toby-Compatibility-Addon.pk3" - "${doomPath}/Toby-Universal-Pickup-Beacon-Prototype.pk3" - "${doomPath}/OpMDK.wad" -) - -# Check for and include if present a wad. Some people may not have it. -if [[ -e "${doomPath}/DoomMetalVol7.wad" ]]; then - gameOption+=("${doomPath}/DoomMetalVol7.wad") -elif [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then - gameOption+=("${doomPath}/DoomMetalVol6.wad") -fi - -# Extend the search for new messages to be read. -grepStrings+=('-e' 'New PDA Entry:' - '-e' ' died.' - '-e' 'Ectoplasmic Surge!' - '-e' ' has been ' - '-e' '^(Armor|Health) boosted!' - '-e' 'Lesser demon energy' - '-e' '^Found ' - '-e' 'Got the ' - '-e' 'Picked up ' - '-e' '^(Mega|Soul)sphere$' - '-e' '^Took ' - '-e' '^\([^?]*\)\(was\)\([^?]*\)$' - '-e' '^Vanguard of the gods!$' - '-e' "You've found " - '-e' 'You (collected|got|found|picked up) ') - -antiGrepStrings+=('-e' 'key card') - -# Launch the game and pipe things to be spoken through speech-dispatcher. -# This also leaves the console output intact for people who may want to read it. -exec stdbuf -oL ${gzdoom} ${gameOption[@]} | while IFS= read -r l ; do echo "$l" | { grep "${grepStrings[@]}" | grep "${antiGrepStrings[@]}" | sed "${sedStrings[@]}" | spd-say -e ${spd_module} ${spd_pitch} ${spd_rate} ${spd_voice} ${spd_volume} -- > /dev/null 2>&1; }; echo "$l";done