From f81ee0b68b199e3bef5351298384c781ae5ec5d5 Mon Sep 17 00:00:00 2001 From: CheffieGithub <113442598+CheffieGithub@users.noreply.github.com> Date: Wed, 24 Dec 2025 15:23:03 +0000 Subject: [PATCH 1/8] dsada --- games/game_darkestdungeon.py | 53 ++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/games/game_darkestdungeon.py b/games/game_darkestdungeon.py index e9be3e62..070fb5a3 100644 --- a/games/game_darkestdungeon.py +++ b/games/game_darkestdungeon.py @@ -1,14 +1,13 @@ import json from pathlib import Path -from PyQt6.QtCore import QDir, QFileInfo, QStandardPaths +from PyQt6.QtCore import QDir, QFileInfo, QStandardPaths, qInfo import mobase from ..basic_game import BasicGame, BasicGameSaveGame from ..steam_utils import find_steam_path - class DarkestDungeonModDataChecker(mobase.ModDataChecker): def __init__(self): super().__init__() @@ -58,7 +57,6 @@ def dataLooksValid( return mobase.ModDataChecker.VALID return mobase.ModDataChecker.INVALID - class DarkestDungeonSaveGame(BasicGameSaveGame): def __init__(self, filepath: Path): super().__init__(filepath) @@ -155,7 +153,6 @@ def getName(self) -> str: return super().getName() return self.name - class DarkestDungeonGame(BasicGame): Name = "DarkestDungeon" Author = "erri120" @@ -167,27 +164,26 @@ class DarkestDungeonGame(BasicGame): GameNexusId = 804 GameSteamId = 262060 GameGogId = 1719198803 - GameBinary = "_windowsnosteam/win64/darkest.exe" + GameBinary = "_windows/win64/Darkest.exe" GameDataPath = "" - GameSupportURL = ( - r"https://github.com/ModOrganizer2/modorganizer-basic_games/wiki/" - "Game:-Darkest-Dungeon" - ) + GameDocumentsDirectory = "%DOCUMENTS%/Darkest" + GameSavesDirectory = "%GAME_DOCUMENTS%" + GameSupportURL = "https://github.com/ModOrganizer2/modorganizer-basic_games/wiki/Game:-Darkest-Dungeon" def init(self, organizer: mobase.IOrganizer) -> bool: super().init(organizer) self._register_feature(DarkestDungeonModDataChecker()) return True - def executables(self): - if self.is_steam(): - path = QFileInfo(self.gameDirectory(), "_windows/win64/darkest.exe") - else: - path = QFileInfo(self.gameDirectory(), "_windowsnosteam/win64/darkest.exe") + def executables(self) -> list[mobase.ExecutableInfo]: + game_name = self.gameName() + game_dir = self.gameDirectory() + return [ - mobase.ExecutableInfo("Darkest Dungeon", path).withWorkingDirectory( - self.gameDirectory() - ), + mobase.ExecutableInfo(f"{game_name} Steam x64", QFileInfo(game_dir, "_windows/win64/Darkest.exe")), + mobase.ExecutableInfo(f"{game_name} x64", QFileInfo(game_dir, "_windowsnosteam/win64/Darkest.exe")), + mobase.ExecutableInfo(f"{game_name} Steam x32", QFileInfo(game_dir, "_windows/win32/Darkest.exe")), + mobase.ExecutableInfo(f"{game_name} x32", QFileInfo(game_dir, "_windowsnosteam/win32/Darkest.exe")), ] @staticmethod @@ -211,19 +207,16 @@ def getCloudSaveDirectory() -> str | None: return None def savesDirectory(self) -> QDir: - documentsSaves = QDir( - "{}/Darkest".format( - QStandardPaths.writableLocation( - QStandardPaths.StandardLocation.DocumentsLocation - ) - ) - ) - if self.is_steam(): - cloudSaves = self.getCloudSaveDirectory() - if cloudSaves is None: - return documentsSaves - return QDir(cloudSaves) - return documentsSaves + documentsSaves = self.documentsDirectory() + + if not self.is_steam(): + return documentsSaves + + cloudSaves = self.getCloudSaveDirectory() + if cloudSaves is None: + return documentsSaves + + return QDir(cloudSaves) def listSaves(self, folder: QDir) -> list[mobase.ISaveGame]: profiles: list[Path] = [] From 15d1d90478acb0113e5420f96777216b8cf14641 Mon Sep 17 00:00:00 2001 From: CheffieGithub <113442598+CheffieGithub@users.noreply.github.com> Date: Sat, 27 Dec 2025 01:30:49 +0000 Subject: [PATCH 2/8] ah --- games/game_darkestdungeon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/game_darkestdungeon.py b/games/game_darkestdungeon.py index 070fb5a3..3069f0d5 100644 --- a/games/game_darkestdungeon.py +++ b/games/game_darkestdungeon.py @@ -165,7 +165,7 @@ class DarkestDungeonGame(BasicGame): GameSteamId = 262060 GameGogId = 1719198803 GameBinary = "_windows/win64/Darkest.exe" - GameDataPath = "" + GameDataPath = "%GAMEPATH" GameDocumentsDirectory = "%DOCUMENTS%/Darkest" GameSavesDirectory = "%GAME_DOCUMENTS%" GameSupportURL = "https://github.com/ModOrganizer2/modorganizer-basic_games/wiki/Game:-Darkest-Dungeon" From 25f016e46c97b54f412869891955b9c3e2c4000a Mon Sep 17 00:00:00 2001 From: CheffieGithub <113442598+CheffieGithub@users.noreply.github.com> Date: Sat, 27 Dec 2025 01:35:06 +0000 Subject: [PATCH 3/8] remove unused --- games/game_darkestdungeon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/game_darkestdungeon.py b/games/game_darkestdungeon.py index 3069f0d5..f923a7f4 100644 --- a/games/game_darkestdungeon.py +++ b/games/game_darkestdungeon.py @@ -1,7 +1,7 @@ import json from pathlib import Path -from PyQt6.QtCore import QDir, QFileInfo, QStandardPaths, qInfo +from PyQt6.QtCore import QDir, QFileInfo import mobase From 9238381df0104490fbb88d9d992eda1e7208a939 Mon Sep 17 00:00:00 2001 From: CheffieGithub <113442598+CheffieGithub@users.noreply.github.com> Date: Sat, 27 Dec 2025 01:35:36 +0000 Subject: [PATCH 4/8] f --- games/game_darkestdungeon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/game_darkestdungeon.py b/games/game_darkestdungeon.py index f923a7f4..965b6e6e 100644 --- a/games/game_darkestdungeon.py +++ b/games/game_darkestdungeon.py @@ -165,7 +165,7 @@ class DarkestDungeonGame(BasicGame): GameSteamId = 262060 GameGogId = 1719198803 GameBinary = "_windows/win64/Darkest.exe" - GameDataPath = "%GAMEPATH" + GameDataPath = "%GAMEPATH%" GameDocumentsDirectory = "%DOCUMENTS%/Darkest" GameSavesDirectory = "%GAME_DOCUMENTS%" GameSupportURL = "https://github.com/ModOrganizer2/modorganizer-basic_games/wiki/Game:-Darkest-Dungeon" From a4f7a2e97e4e7aa757e398f6a362eeef1e0cb3af Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 27 Dec 2025 01:41:10 +0000 Subject: [PATCH 5/8] [pre-commit.ci] Auto fixes from pre-commit.com hooks. --- games/game_darkestdungeon.py | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/games/game_darkestdungeon.py b/games/game_darkestdungeon.py index 965b6e6e..304220a8 100644 --- a/games/game_darkestdungeon.py +++ b/games/game_darkestdungeon.py @@ -8,6 +8,7 @@ from ..basic_game import BasicGame, BasicGameSaveGame from ..steam_utils import find_steam_path + class DarkestDungeonModDataChecker(mobase.ModDataChecker): def __init__(self): super().__init__() @@ -57,6 +58,7 @@ def dataLooksValid( return mobase.ModDataChecker.VALID return mobase.ModDataChecker.INVALID + class DarkestDungeonSaveGame(BasicGameSaveGame): def __init__(self, filepath: Path): super().__init__(filepath) @@ -153,6 +155,7 @@ def getName(self) -> str: return super().getName() return self.name + class DarkestDungeonGame(BasicGame): Name = "DarkestDungeon" Author = "erri120" @@ -180,10 +183,22 @@ def executables(self) -> list[mobase.ExecutableInfo]: game_dir = self.gameDirectory() return [ - mobase.ExecutableInfo(f"{game_name} Steam x64", QFileInfo(game_dir, "_windows/win64/Darkest.exe")), - mobase.ExecutableInfo(f"{game_name} x64", QFileInfo(game_dir, "_windowsnosteam/win64/Darkest.exe")), - mobase.ExecutableInfo(f"{game_name} Steam x32", QFileInfo(game_dir, "_windows/win32/Darkest.exe")), - mobase.ExecutableInfo(f"{game_name} x32", QFileInfo(game_dir, "_windowsnosteam/win32/Darkest.exe")), + mobase.ExecutableInfo( + f"{game_name} Steam x64", + QFileInfo(game_dir, "_windows/win64/Darkest.exe"), + ), + mobase.ExecutableInfo( + f"{game_name} x64", + QFileInfo(game_dir, "_windowsnosteam/win64/Darkest.exe"), + ), + mobase.ExecutableInfo( + f"{game_name} Steam x32", + QFileInfo(game_dir, "_windows/win32/Darkest.exe"), + ), + mobase.ExecutableInfo( + f"{game_name} x32", + QFileInfo(game_dir, "_windowsnosteam/win32/Darkest.exe"), + ), ] @staticmethod @@ -211,11 +226,11 @@ def savesDirectory(self) -> QDir: if not self.is_steam(): return documentsSaves - + cloudSaves = self.getCloudSaveDirectory() if cloudSaves is None: return documentsSaves - + return QDir(cloudSaves) def listSaves(self, folder: QDir) -> list[mobase.ISaveGame]: From 3261ee5f8a8cd6d905a9e708a6dd33fecc576678 Mon Sep 17 00:00:00 2001 From: CheffieGithub <113442598+CheffieGithub@users.noreply.github.com> Date: Sat, 27 Dec 2025 02:36:12 +0000 Subject: [PATCH 6/8] ok no --- games/game_darkestdungeon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/game_darkestdungeon.py b/games/game_darkestdungeon.py index 965b6e6e..9a953d3a 100644 --- a/games/game_darkestdungeon.py +++ b/games/game_darkestdungeon.py @@ -165,7 +165,7 @@ class DarkestDungeonGame(BasicGame): GameSteamId = 262060 GameGogId = 1719198803 GameBinary = "_windows/win64/Darkest.exe" - GameDataPath = "%GAMEPATH%" + GameDataPath = "" GameDocumentsDirectory = "%DOCUMENTS%/Darkest" GameSavesDirectory = "%GAME_DOCUMENTS%" GameSupportURL = "https://github.com/ModOrganizer2/modorganizer-basic_games/wiki/Game:-Darkest-Dungeon" From 68035a4b8e8439c232f9554765633e08898a0aaa Mon Sep 17 00:00:00 2001 From: CheffieGithub <113442598+CheffieGithub@users.noreply.github.com> Date: Sat, 27 Dec 2025 17:26:48 +0000 Subject: [PATCH 7/8] there --- games/game_darkestdungeon.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/games/game_darkestdungeon.py b/games/game_darkestdungeon.py index 1413778d..9ba76cd9 100644 --- a/games/game_darkestdungeon.py +++ b/games/game_darkestdungeon.py @@ -1,7 +1,9 @@ import json +import os +import re from pathlib import Path -from PyQt6.QtCore import QDir, QFileInfo +from PyQt6.QtCore import QDir, QFileInfo, qInfo import mobase @@ -186,19 +188,19 @@ def executables(self) -> list[mobase.ExecutableInfo]: mobase.ExecutableInfo( f"{game_name} Steam x64", QFileInfo(game_dir, "_windows/win64/Darkest.exe"), - ), + ).withWorkingDirectory(game_dir), mobase.ExecutableInfo( f"{game_name} x64", QFileInfo(game_dir, "_windowsnosteam/win64/Darkest.exe"), - ), + ).withWorkingDirectory(game_dir), mobase.ExecutableInfo( f"{game_name} Steam x32", QFileInfo(game_dir, "_windows/win32/Darkest.exe"), - ), + ).withWorkingDirectory(game_dir), mobase.ExecutableInfo( f"{game_name} x32", QFileInfo(game_dir, "_windowsnosteam/win32/Darkest.exe"), - ), + ).withWorkingDirectory(game_dir), ] @staticmethod From c06bb3b83e7268ee42cea0b2d478d62b4bea0637 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 27 Dec 2025 17:27:11 +0000 Subject: [PATCH 8/8] [pre-commit.ci] Auto fixes from pre-commit.com hooks. --- games/game_darkestdungeon.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/games/game_darkestdungeon.py b/games/game_darkestdungeon.py index 9ba76cd9..5c3ae4ea 100644 --- a/games/game_darkestdungeon.py +++ b/games/game_darkestdungeon.py @@ -1,9 +1,7 @@ import json -import os -import re from pathlib import Path -from PyQt6.QtCore import QDir, QFileInfo, qInfo +from PyQt6.QtCore import QDir, QFileInfo import mobase