Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #374 from erri120/erri120-fixes

Browse Source 
Assortment of fixes
This commit is contained in:
Timothy Baldridge 2020-01-09 06:38:56 -08:00 committed by GitHub
commit 27d54a2683
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wabbajack.Common/GameMetaData.cs
View File

@ -143,6 +143,7 @@ namespace Wabbajack.Common
MO2ArchiveName = "oblivion", MO2ArchiveName = "oblivion",
GameLocationRegistryKey = @"HKEY_LOCAL_MACHINE\SOFTWARE\Bethesda Softworks\Oblivion", GameLocationRegistryKey = @"HKEY_LOCAL_MACHINE\SOFTWARE\Bethesda Softworks\Oblivion",
SteamIDs = new List<int> {22330}, SteamIDs = new List<int> {22330},
GOGIDs = new List<int>{1458058109},
RequiredFiles = new List<string> RequiredFiles = new List<string>
{ {
"oblivion.exe" "oblivion.exe"
@ -179,6 +180,7 @@ namespace Wabbajack.Common
MO2ArchiveName = "falloutnv", MO2ArchiveName = "falloutnv",
GameLocationRegistryKey = @"HKEY_LOCAL_MACHINE\SOFTWARE\Bethesda Softworks\falloutnv", GameLocationRegistryKey = @"HKEY_LOCAL_MACHINE\SOFTWARE\Bethesda Softworks\falloutnv",
SteamIDs = new List<int> {22380, 22490}, // normal and RU version SteamIDs = new List<int> {22380, 22490}, // normal and RU version
GOGIDs = new List<int>{1454587428},
RequiredFiles = new List<string> RequiredFiles = new List<string>
{ {
"FalloutNV.exe" "FalloutNV.exe"

6
Wabbajack.Common/StoreHandlers/GOGHandler.cs
View File

@ -104,11 +104,7 @@ namespace Wabbajack.Common.StoreHandlers
Path = path Path = path
}; };
var gameMeta = GameRegistry.Games.Values.FirstOrDefault(g => var gameMeta = GameRegistry.Games.Values.FirstOrDefault(g => (g.GOGIDs?.Contains(gameID) ?? false));
{
return (g.GOGIDs?.Contains(gameID) ?? false)
&& (g.RequiredFiles?.TrueForAll(file => File.Exists(Path.Combine(game.Path, file))) ?? true);
});
if (gameMeta == null) if (gameMeta == null)
{ {

1
Wabbajack.Lib/VortexCompiler.cs
View File

@ -484,6 +484,7 @@ namespace Wabbajack.Lib
new IgnoreGameFiles(this), new IgnoreGameFiles(this),
new DirectMatch(this), new DirectMatch(this),
new IncludeTaggedMods(this, Consts.WABBAJACK_INCLUDE),
new IgnoreGameFiles(this), new IgnoreGameFiles(this),