Latest updates.

This commit is contained in:
Storm Dragon 2024-05-02 16:24:20 -04:00
parent b6a2e722ee
commit 3b731e4c69
2 changed files with 27 additions and 16 deletions

View File

@ -4,10 +4,10 @@ pushd "$doomPath"
# Set up the pk3 and wad files # Set up the pk3 and wad files
gameOption=( gameOption=(
"$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')"
"${doomPath}/TobyAccMod_V${tobyVersion}.pk3" "${doomPath}/TobyAccMod_V${tobyVersion}.pk3"
"${doomPath}/PB-Toby-Compatibility-Addon.pk3" "${doomPath}/PB-Toby-Compatibility-Addon.pk3"
"${doomPath}/Toby-Universal-Pickup-Beacon-Prototype.pk3" "${doomPath}/Toby-Universal-Pickup-Beacon-Prototype.pk3"
"$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')"
"${doomPath}/TobyDeathArena_V1-0.wad" "${doomPath}/TobyDeathArena_V1-0.wad"
) )

View File

@ -3,36 +3,47 @@
# Set the current path to the Doom path required by some OS. # Set the current path to the Doom path required by some OS.
pushd "${doomPath}" 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"
)
# Set up the pk3 and wad files # Set up the pk3 and wad files
gameOption=( gameOption=(
"$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')"
"${doomPath}/TobyAccMod_V${tobyVersion}.pk3" "${doomPath}/TobyAccMod_V${tobyVersion}.pk3"
${addons[@]} "${doomPath}/PB-Toby-Compatibility-Addon.pk3"
"${doomPath}/Toby-Universal-Pickup-Beacon-Prototype.pk3"
"${doomPath}/Toby-Demo-Level.wad" "${doomPath}/Toby-Demo-Level.wad"
"$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')"
) )
# Check for and include if present a wad. Some people may not have it. # Check for and include if present a wad. Some people may not have it.
if [[ -e "${doomPath}/DoomMetalVol7.wad" ]]; then if [[ -e "${doomPath}/DoomMetalVol7.wad" ]]; then
gameOption+=" DoomMetalVol7.wad" gameOption+=("${doomPath}/DoomMetalVol7.wad")
elif [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then elif [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then
gameOption+=" DoomMetalVol6.wad" gameOption+=("${doomPath}/DoomMetalVol6.wad")
fi fi
# Extend the search for new messages to be read. # Extend the search for new messages to be read.
grepStrings+=('-e' 'New PDA Entry:' grepStrings+=('-e' '^\*\*\* Brutality Bonus awarded!'
'-e' ' died.' '-e' ' died.'
'-e' 'Ectoplasmic Surge!'
'-e' '^Game Saved.'
'-e' ' has been ' '-e' ' has been '
'-e' '^(Armor|Health) boosted!'
'-e' 'Lesser demon energy' '-e' 'Lesser demon energy'
'-e' '^Found '
'-e' 'Got the ' '-e' 'Got the '
'-e' '^\([^?]*\)\(was\)\([^?]*\)$' '-e' ' killed (her|him|it)self(\.|!)'
'-e' 'Picked up '
'-e' '^(Mega|Soul)sphere$'
'-e' ' skeleton key secured!$'
'-e' ' (SPLATTERED|was) .*(\.|!)'
'-e' '^Took '
'-e' '^Vanguard of the gods!$'
'-e' "You've found " '-e' "You've found "
'-e' 'Slot ') '-e' 'You (collected|got|found|picked up) ')
antiGrepStrings+=('-e' 'key card'
'-e' ' was .*\?'
)
sedStrings+=('-e' 's/*\{3\}//g')
# Launch the game and pipe things to be spoken through speech-dispatcher. # 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. # This also leaves the console output intact for people who may want to read it.