From b4c0573d2c4329b607b14538af15825ff9cbc95b Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Thu, 18 Apr 2024 16:26:42 -0400
Subject: [PATCH] Update scripts to select Metal mod vol 7, fall back to vol 6
 if both are available.

---
 .scripts/FreeDoom.sh                                 | 4 +++-
 .scripts/TobyCustom/Brutal_Death_Match.sh            | 6 ++++--
 .scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh | 6 ++++--
 .scripts/TobyCustom/Project_Brutality_Toby_Demo.sh   | 6 ++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.scripts/FreeDoom.sh b/.scripts/FreeDoom.sh
index affe960..e4d3e20 100755
--- a/.scripts/FreeDoom.sh
+++ b/.scripts/FreeDoom.sh
@@ -94,7 +94,9 @@ gameOption="$(dialog --backtitle "Select your Doom!" \
         --help-label "Exit" \
         --menu "Please select one" 0 0 0 "${doomGames[@]}" --stdout)"
 buttonCode=$?
-if [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then
+if [[ -e "${doomPath}/DoomMetalVol7.wad" ]]; then
+    gameOption+=" DoomMetalVol7.wad"
+elif [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then
     gameOption+=" DoomMetalVol6.wad"
 fi
 
diff --git a/.scripts/TobyCustom/Brutal_Death_Match.sh b/.scripts/TobyCustom/Brutal_Death_Match.sh
index 25deca0..0f32e48 100755
--- a/.scripts/TobyCustom/Brutal_Death_Match.sh
+++ b/.scripts/TobyCustom/Brutal_Death_Match.sh
@@ -102,8 +102,10 @@ else
 fi
 
 # Check for and include if present a wad. Some people may not have it.
-if [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then
-    gameOption+=("${doomPath}/DoomMetalVol6.wad")
+if [[ -e "${doomPath}/DoomMetalVol7.wad" ]]; then
+    gameOption+=" DoomMetalVol7.wad"
+elif [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then
+    gameOption+=" DoomMetalVol6.wad"
 fi
 
 # Extend the search for new messages to be read.
diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh
index 446c685..aeffcaa 100755
--- a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh
+++ b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh
@@ -18,8 +18,10 @@ gameOption=(
 )
                                                                                                                                                                           
 # Check for and include if present a wad. Some people may not have it.
-if [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then
-    gameOption+=("${doomPath}/DoomMetalVol6.wad")
+if [[ -e "${doomPath}/DoomMetalVol7.wad" ]]; then
+    gameOption+=" DoomMetalVol7.wad"
+elif [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then
+    gameOption+=" DoomMetalVol6.wad"
 fi
 
 # Extend the search for new messages to be read.
diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh
index f0ca57a..cae76be 100755
--- a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh
+++ b/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh
@@ -18,8 +18,10 @@ gameOption=(
 )
                                                                                                                                                                           
 # Check for and include if present a wad. Some people may not have it.
-if [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then
-    gameOption+=("${doomPath}/DoomMetalVol6.wad")
+if [[ -e "${doomPath}/DoomMetalVol7.wad" ]]; then
+    gameOption+=" DoomMetalVol7.wad"
+elif [[ -e "${doomPath}/DoomMetalVol6.wad" ]]; then
+    gameOption+=" DoomMetalVol6.wad"
 fi
 
 # Extend the search for new messages to be read.