Updates to custom launchers.

.scripts/TobyCustom/ArmyOfDarknessDoom.sh

@@ -8,9 +8,7 @@ gamePath=~/.local/games/doom
 # Set up the pk3 and wad files 
 gameOption=(
     "${gamePath}/TobyAccMod_V${tobyVersion}.pk3"
-    "${gamePath}/Addons/DOOM/TobyV7_Pickups.pk3"
     "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"*
-    "${gamePath}/TobyDoomLevels.wad"
     "${gamePath}/aoddoom1.wad"
 )
 
@@ -20,3 +18,5 @@ if [[ -e "${gamePath}/DoomMetalVol7.wad" ]]; then
 elif [[ -e "${gamePath}/DoomMetalVol6.wad" ]]; then
     gameOption+=("${gamePath}/DoomMetalVol6.wad")
 fi
+
+source ${0%/*}/TobyCustom/.mapmenu

.scripts/TobyCustom/StarWars.sh

@@ -6,14 +6,8 @@ sedStrings+=('-e' 's/^Playerclassmenu$/Player class menu/')
 gameOption=(
     "${gamePath}/TobyAccMod_V${tobyVersion}.pk3"
     "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"*
-    "${gamePath}/OpMDK.wad"
     "${gamePath}/Xim-StarWars-v3.1.5.pk3"
     "$gamePath/Addons/STARWARS/"*
 )
 
-# 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
+source ${0%/*}/TobyCustom/.mapmenu