From b6a2e722eee8ed9aa4cad220c06873ac793a1dfa Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sat, 27 Apr 2024 00:15:07 -0400 Subject: [PATCH] Found one more string that wasn't being read. --- .scripts/TobyCustom/Brutal_Death_Match.sh | 1 + .../Project_Brutality_Operation_MDK.sh | 1 + .../TobyCustom/Project_Brutality_Toby_Deluxe.sh | 17 +++++++++++------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.scripts/TobyCustom/Brutal_Death_Match.sh b/.scripts/TobyCustom/Brutal_Death_Match.sh index 0b52f8e..39eb021 100755 --- a/.scripts/TobyCustom/Brutal_Death_Match.sh +++ b/.scripts/TobyCustom/Brutal_Death_Match.sh @@ -112,6 +112,7 @@ grepStrings+=('-e' ' died.' '-e' 'Lesser demon energy' '-e' '^Found ' '-e' 'Got the ' + '-e' ' killed (her|him|it)self(\.|!)' '-e' 'Picked up ' '-e' '^(Mega|Soul)sphere$' '-e' '^Took ' diff --git a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh index 25a4c3a..09cb771 100755 --- a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh +++ b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh @@ -29,6 +29,7 @@ grepStrings+=('-e' '^\*\*\* Brutality Bonus awarded!' '-e' 'Lesser demon energy' '-e' '^Found ' '-e' 'Got the ' + '-e' ' killed (her|him|it)self(\.|!)' '-e' 'Picked up ' '-e' '^(Mega|Soul)sphere$' '-e' ' skeleton key secured!$' diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh index 8553dcc..7c1be46 100755 --- a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh +++ b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh @@ -5,11 +5,11 @@ pushd "${doomPath}" # Set up the pk3 and wad files gameOption=( - "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')" "${doomPath}/TobyAccMod_V${tobyVersion}.pk3" "${doomPath}/PB-Toby-Compatibility-Addon.pk3" "${doomPath}/Toby-Universal-Pickup-Beacon-Prototype.pk3" "${doomPath}/TobyDoomLevels.wad" + "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')" ) # Check for and include if present a wad. Some people may not have it. @@ -20,8 +20,7 @@ elif [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then fi # Extend the search for new messages to be read. -grepStrings+=('-e' 'New PDA Entry:' - '-e' '^\*\*\* Brutality Bonus awarded!' +grepStrings+=('-e' '^\*\*\* Brutality Bonus awarded!' '-e' ' died.' '-e' 'Ectoplasmic Surge!' '-e' '^Game Saved.' @@ -30,15 +29,21 @@ grepStrings+=('-e' 'New PDA Entry:' '-e' 'Lesser demon energy' '-e' '^Found ' '-e' 'Got the ' + '-e' ' killed (her|him|it)self(\.|!)' '-e' 'Picked up ' '-e' '^(Mega|Soul)sphere$' + '-e' ' skeleton key secured!$' + '-e' ' (SPLATTERED|was) .*(\.|!)' '-e' '^Took ' - '-e' ' was .*(\.|!)' '-e' '^Vanguard of the gods!$' '-e' "You've found " '-e' 'You (collected|got|found|picked up) ') - -antiGrepStrings+=('-e' 'key card') + +antiGrepStrings+=('-e' 'key card' + '-e' ' was .*\?' +) + +sedStrings+=('-e' 's/*\{3\}//g') # 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.