From c5c5996c238f2fe6e3a12d24b08ce3ecfa7910b2 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sat, 28 Dec 2024 22:31:52 -0500
Subject: [PATCH] Updated the custom death match. Maps should work again.

---
 .launch/TobyCustom/Custom_Death_Match.sh | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/.launch/TobyCustom/Custom_Death_Match.sh b/.launch/TobyCustom/Custom_Death_Match.sh
index 8c08652..b970895 100755
--- a/.launch/TobyCustom/Custom_Death_Match.sh
+++ b/.launch/TobyCustom/Custom_Death_Match.sh
@@ -3,7 +3,7 @@
 # Set up the pk3 and wad files 
 gameOption=(
     "${gamePath}/TobyAccMod_V${tobyVersion}.pk3"
-    "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"*
+    "$gamePath/Addons/MENU/TobyV*_"*
 )
 
 # Get a list of pk3s to use for the custom death match.
@@ -53,7 +53,9 @@ else
         "5" "Ocean Fortress (2-4 players)"
         "6" "Water Treatment Facility (2-4 players)"
         "7" "Phobos Base Site 4 (2-4 players)"
-        "8" "Hangar Bay 18 (2-4 players)")
+        "8" "Hangar Bay 18 (2-4 players)"
+        "9" "Garden of Demon (2-4 players)"
+        "10" "Outpost 69 (2-4 players)")
     # Array of how many players a given map supports in dialog rangebox syntax
     declare -a mapPlayers=(
         [1]="2 4"
@@ -63,7 +65,9 @@ else
         [5]="2 4"
         [6]="2 4"
         [7]="2 4"
-        [8]="2 4")
+        [8]="2 4"
+        [9]="2 4"
+        [10]="2 4")
     map="$(dialog --backtitle "Select Map" \
         --clear \
         --no-tags \
@@ -112,12 +116,5 @@ else
 fi
 
 gameOption+=("${pk3}"
-    "${gamePath}/TobyDeathArena_V1-0.wad"
+    "${gamePath}/Addons/MAPS/TobyDeathArena_V1-5.wad"
 )
-
-# Check for and include if present a wad. Some people may not have it.
-if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then
-    gameOption+=" DoomMetalVol7.wad"
-elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then
-    gameOption+=" DoomMetalVol6.wad"
-fi