From 376d4158b3a4e6956d6d09af452bd6d3ae5f5a43 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Wed, 28 Aug 2024 14:51:26 -0400 Subject: [PATCH] Consolidated Project Brutality launchers. --- .../Project_Brutality Latest_Operation_MDK.sh | 20 ------------------- .../Project_Brutality Latest_Toby_Deluxe.sh | 16 --------------- ...lity_Toby_Demo.sh => Project_Brutality.sh} | 4 +++- ...oby_Demo.sh => Project_BrutalityLatest.sh} | 5 ++++- .../Project_Brutality_Operation_MDK.sh | 17 ---------------- .../Project_Brutality_Toby_Deluxe.sh | 17 ---------------- 6 files changed, 7 insertions(+), 72 deletions(-) delete mode 100755 .scripts/TobyCustom/Project_Brutality Latest_Operation_MDK.sh delete mode 100755 .scripts/TobyCustom/Project_Brutality Latest_Toby_Deluxe.sh rename .scripts/TobyCustom/{Project_Brutality_Toby_Demo.sh => Project_Brutality.sh} (84%) rename .scripts/TobyCustom/{Project_Brutality Latest_Toby_Demo.sh => Project_BrutalityLatest.sh} (84%) delete mode 100755 .scripts/TobyCustom/Project_Brutality_Operation_MDK.sh delete mode 100755 .scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh diff --git a/.scripts/TobyCustom/Project_Brutality Latest_Operation_MDK.sh b/.scripts/TobyCustom/Project_Brutality Latest_Operation_MDK.sh deleted file mode 100755 index 1372440..0000000 --- a/.scripts/TobyCustom/Project_Brutality Latest_Operation_MDK.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Set the current path to the Doom path required by some OS. -pushd "${doomPath}" - -gamePath=~/.local/games/doom -# Set up the pk3 and wad files -gameOption=( - "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" - "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* - "${gamePath}/OpMDK.wad" - "${gamePath}/Project_Brutality-Latest.pk3" -) - -# Check for and include if present a wad. Some people may not have it. -if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then - gameOption+=("${gamePath}/DoomMetalVol7.wad") -elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then - gameOption+=("${gamePath}/DoomMetalVol6.wad") -fi diff --git a/.scripts/TobyCustom/Project_Brutality Latest_Toby_Deluxe.sh b/.scripts/TobyCustom/Project_Brutality Latest_Toby_Deluxe.sh deleted file mode 100755 index cfb4f46..0000000 --- a/.scripts/TobyCustom/Project_Brutality Latest_Toby_Deluxe.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -# Set up the pk3 and wad files -gameOption=( - "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" - "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* - "${gamePath}/TobyDoomLevels.wad" - "${gamePath}/Project_Brutality-Latest.pk3" -) - -# Check for and include if present a wad. Some people may not have it. -if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then - gameOption+=("${gamePath}/DoomMetalVol7.wad") -elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then - gameOption+=("${gamePath}/DoomMetalVol6.wad") -fi diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh b/.scripts/TobyCustom/Project_Brutality.sh similarity index 84% rename from .scripts/TobyCustom/Project_Brutality_Toby_Demo.sh rename to .scripts/TobyCustom/Project_Brutality.sh index 3e01845..3e36dbe 100755 --- a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh +++ b/.scripts/TobyCustom/Project_Brutality.sh @@ -4,7 +4,7 @@ gameOption=( "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* - "${gamePath}/Toby-Demo-Level.wad" + "$gamePath/Addons/DOOM/TobyV${tobyVersion%%-*}_Proximity.pk3" "${gamePath}/PB-Toby-Compatibility-Addon.pk3" "${gamePath}/Project_Brutality.pk3" ) @@ -15,3 +15,5 @@ if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then gameOption+=("${gamePath}/DoomMetalVol6.wad") fi + +source ${0%/*}/TobyCustom/.mapmenu diff --git a/.scripts/TobyCustom/Project_Brutality Latest_Toby_Demo.sh b/.scripts/TobyCustom/Project_BrutalityLatest.sh similarity index 84% rename from .scripts/TobyCustom/Project_Brutality Latest_Toby_Demo.sh rename to .scripts/TobyCustom/Project_BrutalityLatest.sh index f4928e3..eb5a1e3 100755 --- a/.scripts/TobyCustom/Project_Brutality Latest_Toby_Demo.sh +++ b/.scripts/TobyCustom/Project_BrutalityLatest.sh @@ -1,9 +1,10 @@ #!/usr/bin/env bash + # Set up the pk3 and wad files gameOption=( "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* - "${gamePath}/Toby-Demo-Level.wad" + "$gamePath/Addons/DOOM/TobyV${tobyVersion%%-*}_Proximity.pk3" "${gamePath}/PB-Toby-Compatibility-Addon.pk3" "${gamePath}/Project_Brutality-Latest.pk3" ) @@ -14,3 +15,5 @@ if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then gameOption+=("${gamePath}/DoomMetalVol6.wad") fi + +source ${0%/*}/TobyCustom/.mapmenu diff --git a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh deleted file mode 100755 index b3b00f5..0000000 --- a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -# Set up the pk3 and wad files -gameOption=( - "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" - "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* - "${gamePath}/OpMDK.wad" - "${gamePath}/PB-Toby-Compatibility-Addon.pk3" - "${gamePath}/Project_Brutality.pk3" -) - -# Check for and include if present a wad. Some people may not have it. -if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then - gameOption+=("${gamePath}/DoomMetalVol7.wad") -elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then - gameOption+=("${gamePath}/DoomMetalVol6.wad") -fi diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh deleted file mode 100755 index d212988..0000000 --- a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -# Set up the pk3 and wad files -gameOption=( - "${gamePath}/TobyAccMod_V${tobyVersion}.pk3" - "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"* - "${gamePath}/TobyDoomLevels.wad" - "${gamePath}/PB-Toby-Compatibility-Addon.pk3" - "${gamePath}/Project_Brutality.pk3" -) - -# Check for and include if present a wad. Some people may not have it. -if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then - gameOption+=("${gamePath}/DoomMetalVol7.wad") -elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then - gameOption+=("${gamePath}/DoomMetalVol6.wad") -fi