storm/toby-doom-launcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a few renaming issues that cause some of the maps and addons to fail. Removed Demo and tutorial options because now part of main game.

Browse Source
This commit is contained in:
Storm Dragon
2025-07-30 22:39:41 -04:00
parent e9ca4f02e0
commit d906292d5e
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toby Doom Launcher.py
+6 -13
View File
@@ -1460,7 +1460,7 @@ class DoomLauncher(QMainWindow):
mapsDir = self.gamePath / "Addons/MAPS" mapsDir = self.gamePath / "Addons/MAPS"
if mapsDir.exists(): if mapsDir.exists():
mapFiles.extend([p.name for p in mapsDir.glob("*.wad") mapFiles.extend([p.name for p in mapsDir.glob("*.wad")
if p.name not in ["TobyDeathArena_V1-5.wad", "Toby-Demo-Level.wad"]]) if p.name not in ["TobyDeathArena_V2-0.wad"]])
# Add Operation MDK as special case # Add Operation MDK as special case
opMDK = self.gamePath / "OpMDK.wad" opMDK = self.gamePath / "OpMDK.wad"
@@ -1496,7 +1496,7 @@ class DoomLauncher(QMainWindow):
if Path(mapPath).exists(): if Path(mapPath).exists():
gameFiles.append(mapPath) gameFiles.append(mapPath)
if selectedMap == "TobyDoomLevels.wad": if selectedMap == "TobyDoomLevels.pk3":
musicRenamer = self.gamePath / "Toby-Doom-Level-Music-Renamer.pk3" musicRenamer = self.gamePath / "Toby-Doom-Level-Music-Renamer.pk3"
if musicRenamer.exists(): if musicRenamer.exists():
gameFiles.append(str(musicRenamer)) gameFiles.append(str(musicRenamer))
@@ -1911,9 +1911,6 @@ class DoomLauncher(QMainWindow):
def populate_game_list(self): def populate_game_list(self):
"""Populate the game selection combo box""" """Populate the game selection combo box"""
gameList = [ gameList = [
"Toby Demo Map",
"Tutorial",
"Funny Pack - Demo Map",
"Classic Doom", "Classic Doom",
"Funny Pack - Classic Doom", "Funny Pack - Classic Doom",
"Toby Doom", "Toby Doom",
@@ -2063,12 +2060,8 @@ class DoomLauncher(QMainWindow):
baseFiles.append(str(self.gamePath / "Addons/MAPS/TobyHexen.pk3")) baseFiles.append(str(self.gamePath / "Addons/MAPS/TobyHexen.pk3"))
else: # Doom games else: # Doom games
gameType = "DOOM" gameType = "DOOM"
if "Demo Map" in selectedGame: if "Toby Doom" in selectedGame:
baseFiles.append(str(self.gamePath / "Addons/MAPS/Toby-Demo-Level_V2_ALT.wad")) baseFiles.append(str(self.gamePath / "Addons/MAPS/TobyDoomLevels.pk3"))
elif "Tutorial" in selectedGame:
baseFiles.append(str(self.gamePath / "Addons/MAPS/TobyTutorial-V2.wad"))
elif "Toby Doom" in selectedGame:
baseFiles.append(str(self.gamePath / "Addons/MAPS/TobyDoomLevels.wad"))
musicRenamer = self.gamePath / "Toby-Doom-Level-Music-Renamer.pk3" musicRenamer = self.gamePath / "Toby-Doom-Level-Music-Renamer.pk3"
if musicRenamer.exists() and not isFunnyPack: if musicRenamer.exists() and not isFunnyPack:
baseFiles.append(str(musicRenamer)) baseFiles.append(str(musicRenamer))
@@ -2330,7 +2323,7 @@ class DoomLauncher(QMainWindow):
mapsDir = self.gamePath / "Addons/MAPS" mapsDir = self.gamePath / "Addons/MAPS"
if mapsDir.exists(): if mapsDir.exists():
mapFiles.extend([p.name for p in mapsDir.glob("*.wad") mapFiles.extend([p.name for p in mapsDir.glob("*.wad")
if p.name not in ["TobyDeathArena_V1-5.wad", "Toby-Demo-Level.wad"]]) if p.name not in ["TobyDeathArena_V2-0.wad"]])
# Add Operation MDK as special case # Add Operation MDK as special case
opMDK = self.gamePath / "OpMDK.wad" opMDK = self.gamePath / "OpMDK.wad"
@@ -2380,7 +2373,7 @@ class DoomLauncher(QMainWindow):
if Path(mapPath).exists(): if Path(mapPath).exists():
gameFiles.append(mapPath) gameFiles.append(mapPath)
if selectedMap == "TobyDoomLevels.wad": if selectedMap == "TobyDoomLevels.pk3":
musicRenamer = self.gamePath / "Toby-Doom-Level-Music-Renamer.pk3" musicRenamer = self.gamePath / "Toby-Doom-Level-Music-Renamer.pk3"
if musicRenamer.exists(): if musicRenamer.exists():
gameFiles.append(str(musicRenamer)) gameFiles.append(str(musicRenamer))