From 698be8e8dc6742718e324b959ff49a84d4f9ef81 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Thu, 18 Apr 2024 11:42:35 -0400 Subject: [PATCH] Fixed a problem with reading things not needed from the console. --- .scripts/TobyCustom/Project_Brutality_Operation_MDK.sh | 4 +++- .scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh | 2 +- .scripts/TobyCustom/Project_Brutality_Toby_Demo.sh | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh index 92c3fb4..b90534a 100755 --- a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh +++ b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh @@ -7,6 +7,7 @@ pushd "${doomPath}" 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 @@ -14,6 +15,7 @@ gameOption=( "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')" "${doomPath}/TobyAccMod_V${tobyVersion}.pk3" ${addons[@]} + "${doomPath}/PB-Toby-Compatibility-Addon.pk3" "${doomPath}/OpMDK.wad" ) @@ -28,7 +30,7 @@ grepStrings+=('-e' 'New PDA Entry:' '-e' ' has been ' '-e' 'Lesser demon energy' '-e' 'Got the ' - '-e' ' was ' + '-e' '^\([^?]*\)\(was\)\([^?]*\)$' '-e' "You've found " '-e' 'Slot ') diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh index 0328625..446c685 100755 --- a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh +++ b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh @@ -28,7 +28,7 @@ grepStrings+=('-e' 'New PDA Entry:' '-e' ' has been ' '-e' 'Lesser demon energy' '-e' 'Got the ' - '-e' ' was ' + '-e' '^\([^?]*\)\(was\)\([^?]*\)$' '-e' "You've found " '-e' 'Slot ') diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh index 51630dd..f0ca57a 100755 --- a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh +++ b/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh @@ -28,7 +28,7 @@ grepStrings+=('-e' 'New PDA Entry:' '-e' ' has been ' '-e' 'Lesser demon energy' '-e' 'Got the ' - '-e' ' was ' + '-e' '^\([^?]*\)\(was\)\([^?]*\)$' '-e' "You've found " '-e' 'Slot ')