Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Virtualize both FalloutNV / _Epic for plugins.txt #23

Closed
wants to merge 6 commits into from
Closed

Virtualize both FalloutNV / _Epic for plugins.txt #23

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c3a946e
Virtualize both FalloutNV / _Epic for plugins.txt
Silarn Sep 30, 2023
10079e9
Update launch args to work properly with EGS
Silarn Oct 1, 2023
662b84a
Move NVSE to top of 'extra' executables
Silarn Oct 1, 2023
72cfce0
GOG 'support'
Silarn Oct 1, 2023
de60232
Merge branch 'master' of https://github.com/ModOrganizer2/modorganize…
Silarn Oct 1, 2023
d90aac5
Filter the install directories to avoid grabbing a hidden directory
Silarn Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions src/gamefalloutnv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@ void GameFalloutNV::setVariant(QString variant)

void GameFalloutNV::checkVariants()
{
QFileInfo gog_dll(m_GamePath + "\\Galaxy.dll");
QFileInfo epic_dll(m_GamePath + "\\EOSSDK-Win32-Shipping.dll");
if (epic_dll.exists())
if (gog_dll.exists())
setVariant("GOG");
else if (epic_dll.exists())
setVariant("Epic Games");
else
setVariant("Steam");
Expand Down Expand Up @@ -84,7 +87,8 @@ QString GameFalloutNV::identifyGamePath() const
result = parseEpicGamesLocation({"5daeb974a22a435988892319b3a4f476"});
if (QFileInfo(result).isDir()) {
QDir startPath = QDir(result);
auto subDirs = startPath.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
auto subDirs = startPath.entryList({"Fallout New Vegas*"},
QDir::Dirs | QDir::NoDotAndDotDot);
if (!subDirs.isEmpty())
result = subDirs.first();
}
Expand Down Expand Up @@ -141,19 +145,24 @@ void GameFalloutNV::detectGame()

QList<ExecutableInfo> GameFalloutNV::executables() const
{
QList<ExecutableInfo> executables =
ExecutableInfo game("New Vegas", findInGameFolder(binaryName()));
ExecutableInfo launcher("Fallout Launcher", findInGameFolder(getLauncherName()));
QList<ExecutableInfo> extraExecutables =
QList<ExecutableInfo>()
<< ExecutableInfo("New Vegas", findInGameFolder(binaryName()))
<< ExecutableInfo("Fallout Mod Manager", findInGameFolder("fomm/fomm.exe"))
<< ExecutableInfo("Construction Kit", findInGameFolder("geck.exe"))
<< ExecutableInfo("Fallout Launcher", findInGameFolder(getLauncherName()))
<< ExecutableInfo("BOSS", findInGameFolder("BOSS/BOSS.exe"))
<< ExecutableInfo("LOOT", QFileInfo(getLootPath()))
.withArgument("--game=\"FalloutNV\"");
if (selectedVariant() == "Epic Games") {
executables.append(ExecutableInfo(
if (selectedVariant() != "Epic Games") {
extraExecutables.prepend(ExecutableInfo(
"NVSE", findInGameFolder(feature<ScriptExtender>()->loaderName())));
} else {
game.withArgument("-EpicPortal");
launcher.withArgument("-EpicPortal");
}
QList<ExecutableInfo> executables = {game, launcher};
executables += extraExecutables;
return executables;
}

Expand Down Expand Up @@ -243,7 +252,7 @@ QStringList GameFalloutNV::primaryPlugins() const

QStringList GameFalloutNV::gameVariants() const
{
return {"Steam", "Epic Games"};
return {"Steam", "GOG", "Epic Games"};
}

QString GameFalloutNV::gameShortName() const
Expand Down Expand Up @@ -289,15 +298,19 @@ QDir GameFalloutNV::gameDirectory() const
return QDir(m_GamePath);
}

// Not to delete all the spaces...
MappingType GameFalloutNV::mappings() const
{
MappingType result;

for (const QString& profileFile : {"plugins.txt", "loadorder.txt"}) {
result.push_back({m_Organizer->profilePath() + "/" + profileFile,
localAppFolder() + "/" + gameDirectoryName() + "/" + profileFile,
localAppFolder() + "/" + gameShortName() + "/" + profileFile,
false});
if (selectedVariant() == "Epic Games") {
result.push_back(
{m_Organizer->profilePath() + "/" + profileFile,
localAppFolder() + "/" + gameDirectoryName() + "/" + profileFile, false});
}
}

return result;
Expand Down
Loading