fix bug with indexing getting wrong object source, and add support for gog folder shortcut

LeftofZen · LeftofZen · commit 2c6eb86d88e0 · 2025-12-08T11:59:03.000+11:00
diff --git a/Dat/Converters/ObjectSourceConverter.cs b/Dat/Converters/ObjectSourceConverter.cs
@@ -19,7 +19,7 @@ public static ObjectSource Convert(this DatObjectSource objectSource, string dat
 		=> objectSource switch
 		{
 			DatObjectSource.Custom => ObjectSource.Custom,
-			DatObjectSource.Vanilla => OriginalObjectFiles.GetFileSource(datName, datChecksum),
+			DatObjectSource.Vanilla => OriginalObjectFiles.GetFileSource(datName, datChecksum, objectSource),
 			DatObjectSource.OpenLoco => ObjectSource.OpenLoco,
 			_ => throw new NotImplementedException(),
 		};
diff --git a/Dat/Data/OriginalObjectFiles.cs b/Dat/Data/OriginalObjectFiles.cs
@@ -6,12 +6,12 @@ public record OriginalObjectFile(uint SteamChecksum, uint GoGChecksum, uint Open
 
 public static class OriginalObjectFiles
 {
-	public static ObjectSource GetFileSource((string name, uint checksum) key)
-		=> GetFileSource(key.name, key.checksum);
+	public static ObjectSource GetFileSource((string name, uint checksum) key, DatObjectSource claimedSource)
+		=> GetFileSource(key.name, key.checksum, claimedSource);
 
-	public static ObjectSource GetFileSource(string name, uint checksum)
+	public static ObjectSource GetFileSource(string name, uint checksum, DatObjectSource claimedSource)
 	{
-		if (Names.TryGetValue(name, out var fileInfo))
+		if (claimedSource == DatObjectSource.Vanilla && Names.TryGetValue(name, out var fileInfo))
 		{
 			if (checksum == fileInfo.SteamChecksum)
 			{
@@ -21,14 +21,11 @@ public static ObjectSource GetFileSource(string name, uint checksum)
 			{
 				return ObjectSource.LocomotionGoG;
 			}
-			else if (checksum == fileInfo.OpenGraphicsChecksum)
-			{
-				return ObjectSource.OpenLoco;
-			}
-			else if (name == fileInfo.OpenGraphicsName)
-			{
-				return ObjectSource.OpenLoco;
-			}
+		}
+
+		if (claimedSource == DatObjectSource.OpenLoco || Names.Any(x => x.Value.OpenGraphicsName == name))
+		{
+			return ObjectSource.OpenLoco;
 		}
 
 		return ObjectSource.Custom;
diff --git a/Dat/Types/S5Header.cs b/Dat/Types/S5Header.cs
@@ -2,6 +2,7 @@
 using Dat.Data;
 using Dat.FileParsing;
 using System.ComponentModel;
+using System.Xml.Linq;
 
 namespace Dat.Types;
 
@@ -77,8 +78,6 @@ public ReadOnlySpan<byte> Write()
 	public static readonly S5Header NullHeader = new(0x000000FF, "        ", 0);
 
 	public bool IsVanilla()
-		=> IsVanilla(Name, Checksum);
+		=> OriginalObjectFiles.GetFileSource(Name, Checksum, ObjectSource).Convert() != DatObjectSource.Custom;
 
-	public static bool IsVanilla(string name, uint checksum)
-		=> OriginalObjectFiles.GetFileSource(name, checksum).Convert() != DatObjectSource.Custom;
 }
diff --git a/DataSanitiser/Program.cs b/DataSanitiser/Program.cs
@@ -102,7 +102,7 @@ static void QueryBuildingProducedQuantity()
 			{
 				var struc = (BuildingObject)o.LocoObject.Object;
 				var header = o.DatFileInfo.S5Header;
-				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);
+				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);
 
 				foreach (var cargo in struc.ProducedCargo.Zip(struc.ProducedQuantity))
 				{
@@ -149,7 +149,7 @@ static void QueryHeadquarters()
 			{
 				var struc = (BuildingObject)o.LocoObject.Object;
 				var header = o.DatFileInfo.S5Header;
-				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);
+				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);
 
 				if (struc.Flags.HasFlag(BuildingObjectFlags.IsHeadquarters))
 				{
@@ -216,7 +216,7 @@ static void QueryCostIndex()
 				var costIndex = (byte)costIndexProperty.GetValue(o.LocoObject.Object);
 
 				var header = o.DatFileInfo.S5Header;
-				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);
+				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);
 
 				results.Add((obj, source, o.LocoObject.ObjectType, costIndex));
 			}
@@ -255,7 +255,7 @@ static void QueryTrackStationOneSidedTrack()
 			{
 				var struc = (TrackStationObject)o.LocoObject.Object;
 				var header = o.DatFileInfo.S5Header;
-				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);
+				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);
 
 				// Build a list of all enabled TrackTraitFlags for this object
 				var enabledFlags = new List<string>();
@@ -315,7 +315,7 @@ static void QueryIndustryHasShadows()
 			{
 				var struc = (IndustryObject)o.LocoObject.Object;
 				var header = o.DatFileInfo.S5Header;
-				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);
+				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);
 
 				if (struc.Flags.HasFlag(IndustryObjectFlags.HasShadows))
 				{
@@ -357,7 +357,7 @@ static void QueryVehicleBodyUnkSprites()
 			{
 				var struc = (VehicleObject)o.LocoObject.Object;
 				var header = o.DatFileInfo.S5Header;
-				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);
+				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);
 
 				if (struc.Flags.HasFlag(VehicleObjectFlags.AlternatingCarSprite))
 				{
@@ -400,7 +400,7 @@ static void QueryCargoCategories()
 				var struc = (CargoObject)o.LocoObject.Object;
 
 				var header = o.DatFileInfo.S5Header;
-				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);
+				var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);
 
 				results.Add((obj, struc.CargoCategory, o.LocoObject.StringTable.Table["Name"][LanguageId.English_UK], source));
 			}
diff --git a/Gui/EditorSettings.cs b/Gui/EditorSettings.cs
@@ -43,15 +43,17 @@ public HashSet<string> ObjDataDirectories
 	public string ObjectIndicesFolder { get; set; } = string.Empty;
 	public string DownloadFolder { get; set; } = string.Empty;
 
+	public string LocomotionSteamObjDataFolder { get; set; } = string.Empty;
+	public string LocomotionGoGObjDataFolder { get; set; } = string.Empty;
 	public string AppDataObjDataFolder { get; set; } = string.Empty;
-	public string LocomotionObjDataFolder { get; set; } = string.Empty;
 	public string OpenLocoObjDataFolder { get; set; } = string.Empty;
 
 	public string GetGameObjDataFolder(GameObjDataFolder folder)
 		=> folder switch
 		{
 			GameObjDataFolder.AppData => AppDataObjDataFolder,
-			GameObjDataFolder.Locomotion => LocomotionObjDataFolder,
+			GameObjDataFolder.LocomotionSteam => LocomotionSteamObjDataFolder,
+			GameObjDataFolder.LocomotionGoG => LocomotionGoGObjDataFolder,
 			GameObjDataFolder.OpenLoco => OpenLocoObjDataFolder,
 			_ => throw new NotImplementedException(),
 		};
diff --git a/Gui/GameObjDataFolder.cs b/Gui/GameObjDataFolder.cs
@@ -1,3 +1,3 @@
 namespace Gui;
 
-public enum GameObjDataFolder { AppData, Locomotion, OpenLoco }
+public enum GameObjDataFolder { LocomotionSteam, LocomotionGoG, AppData, OpenLoco }
diff --git a/Gui/ViewModels/EditorSettingsWindowViewModel.cs b/Gui/ViewModels/EditorSettingsWindowViewModel.cs
@@ -48,20 +48,27 @@ public bool ShowLogsOnError
 	const string GameObjectFolderCategory = "Folders OpenLoco can use objects from";
 	const string UserObjectFolderCategory = "Folders where you store custom objects";
 
+	[PathBrowsable(PathBrowsableType.Directory), Category(GameObjectFolderCategory), DisplayName("Locomotion (Steam) ObjData Folder"), Description("The ObjData folder in your Steam Locomotion installation.")]
+	public string LocomotionSteamObjDataFolder
+	{
+		get => Model.LocomotionSteamObjDataFolder;
+		set => Model.LocomotionSteamObjDataFolder = value;
+	}
+
+	[PathBrowsable(PathBrowsableType.Directory), Category(GameObjectFolderCategory), DisplayName("Locomotion (GoG) ObjData Folder"), Description("The ObjData folder in your GoG Locomotion installation.")]
+	public string LocomotionGoGObjDataFolder
+	{
+		get => Model.LocomotionGoGObjDataFolder;
+		set => Model.LocomotionGoGObjDataFolder = value;
+	}
+
 	[PathBrowsable(PathBrowsableType.Directory), Category(GameObjectFolderCategory), DisplayName("AppData ObjData Folder"), Description("The ObjData folder in %AppData%\\OpenLoco\\objects.")]
 	public string AppDataObjDataFolder
 	{
 		get => Model.AppDataObjDataFolder;
 		set => Model.AppDataObjDataFolder = value;
 	}
 
-	[PathBrowsable(PathBrowsableType.Directory), Category(GameObjectFolderCategory), DisplayName("Locomotion ObjData Folder"), Description("The ObjData folder in your Locomotion installation.")]
-	public string LocomotionObjDataFolder
-	{
-		get => Model.LocomotionObjDataFolder;
-		set => Model.LocomotionObjDataFolder = value;
-	}
-
 	[PathBrowsable(PathBrowsableType.Directory), Category(GameObjectFolderCategory), DisplayName("OpenLoco ObjData Folder"), Description("The ObjData folder in the OpenLoco\\Objects directory.")]
 	public string OpenLocoObjDataFolder
 	{
diff --git a/Gui/ViewModels/LocoTypes/ObjectEditorViewModel.cs b/Gui/ViewModels/LocoTypes/ObjectEditorViewModel.cs
@@ -63,7 +63,7 @@ public class ObjectEditorViewModel : BaseLocoFileViewModel
 	public ReactiveCommand<Unit, Unit> ValidateForOGCommand { get; }
 
 	[Reactive]
-	public GameObjDataFolder LastGameObjDataFolder { get; set; } = GameObjDataFolder.Locomotion;
+	public GameObjDataFolder LastGameObjDataFolder { get; set; } = GameObjDataFolder.LocomotionSteam;
 
 	//public ReactiveCommand<Unit, ObjectIndexEntry?> SelectObjectCommand { get; }
 	public Interaction<ObjectSelectionWindowViewModel, ObjectSelectionWindowViewModel?> SelectObjectShowDialog { get; }
diff --git a/Gui/ViewModels/LocoTypes/SCV5ViewModel.cs b/Gui/ViewModels/LocoTypes/SCV5ViewModel.cs
@@ -50,7 +50,7 @@ public ObservableCollection<TileElement> CurrentTileElements
 			: [];
 
 	[Reactive]
-	public GameObjDataFolder LastGameObjDataFolder { get; set; } = GameObjDataFolder.Locomotion;
+	public GameObjDataFolder LastGameObjDataFolder { get; set; } = GameObjDataFolder.LocomotionSteam;
 	public ReactiveCommand<GameObjDataFolder, Unit> DownloadMissingObjectsToGameObjDataCommand { get; }
 
 	public SCV5ViewModel(FileSystemItem currentFile, ObjectEditorModel model)
@@ -141,7 +141,7 @@ async Task DownloadMissingObjects(GameObjDataFolder targetFolder)
 
 		foreach (var obj in CurrentS5File.RequiredObjects)
 		{
-			if (OriginalObjectFiles.GetFileSource(obj.Name, obj.Checksum) is ObjectSource.LocomotionSteam or ObjectSource.LocomotionGoG)
+			if (OriginalObjectFiles.GetFileSource(obj.Name, obj.Checksum, obj.ObjectSource) is ObjectSource.LocomotionSteam or ObjectSource.LocomotionGoG)
 			{
 				continue;
 			}
diff --git a/Gui/ViewModels/MainWindowViewModel.cs b/Gui/ViewModels/MainWindowViewModel.cs
@@ -208,9 +208,14 @@ void PopulateObjDataMenu()
 			ObjDataItems.Add(new MenuItemViewModel($"[{nameof(GameObjDataFolder.AppData)}] {Model.Settings.AppDataObjDataFolder}", ReactiveCommand.Create(() => FolderTreeViewModel.CurrentLocalDirectory = Model.Settings.AppDataObjDataFolder)));
 		}
 
-		if (Directory.Exists(Model.Settings.LocomotionObjDataFolder))
+		if (Directory.Exists(Model.Settings.LocomotionSteamObjDataFolder))
 		{
-			ObjDataItems.Add(new MenuItemViewModel($"[{nameof(GameObjDataFolder.Locomotion)}] {Model.Settings.LocomotionObjDataFolder}", ReactiveCommand.Create(() => FolderTreeViewModel.CurrentLocalDirectory = Model.Settings.LocomotionObjDataFolder)));
+			ObjDataItems.Add(new MenuItemViewModel($"[{nameof(GameObjDataFolder.LocomotionSteam)}] {Model.Settings.LocomotionSteamObjDataFolder}", ReactiveCommand.Create(() => FolderTreeViewModel.CurrentLocalDirectory = Model.Settings.LocomotionSteamObjDataFolder)));
+		}
+
+		if (Directory.Exists(Model.Settings.LocomotionGoGObjDataFolder))
+		{
+			ObjDataItems.Add(new MenuItemViewModel($"[{nameof(GameObjDataFolder.LocomotionGoG)}] {Model.Settings.LocomotionGoGObjDataFolder}", ReactiveCommand.Create(() => FolderTreeViewModel.CurrentLocalDirectory = Model.Settings.LocomotionGoGObjDataFolder)));
 		}
 
 		if (Directory.Exists(Model.Settings.OpenLocoObjDataFolder))
@@ -283,7 +288,7 @@ public async Task LoadSingleObject()
 		if (Model.TryLoadObject(new FileSystemItem(Path.GetFileName(fsi.FileName), fsi.FileName, fsi.Id, createdTime, modifiedTime, FileLocation.Local), out var uiLocoFile) && uiLocoFile != null)
 		{
 			Model.Logger.Warning($"Successfully loaded {fsi.FileName}");
-			var source = OriginalObjectFiles.GetFileSource(uiLocoFile.DatInfo.S5Header.Name, uiLocoFile.DatInfo.S5Header.Checksum);
+			var source = OriginalObjectFiles.GetFileSource(uiLocoFile.DatInfo.S5Header.Name, uiLocoFile.DatInfo.S5Header.Checksum, uiLocoFile.DatInfo.S5Header.ObjectSource);
 			var fsi2 = new FileSystemItem(uiLocoFile!.DatInfo.S5Header.Name, fsi.FileName, fsi.Id, createdTime, modifiedTime, FileLocation.Local, source);
 			SetObjectViewModel(fsi2);
 		}
@@ -387,15 +392,15 @@ public async Task SelectNewFolder()
 			return;
 		}
 
-		if (Model.Settings.AppDataObjDataFolder == dirPath)
+		if (Model.Settings.LocomotionSteamObjDataFolder == dirPath)
 		{
-			Model.Logger.Warning("No need to add - this is the predefined AppData folder");
+			Model.Logger.Warning("No need to add - this is the predefined Locomotion (Steam) ObjData folder");
 			return;
 		}
 
-		if (Model.Settings.LocomotionObjDataFolder == dirPath)
+		if (Model.Settings.LocomotionGoGObjDataFolder == dirPath)
 		{
-			Model.Logger.Warning("No need to add - this is the predefined Locomotion ObjData folder");
+			Model.Logger.Warning("No need to add - this is the predefined Locomotion (GoG) ObjData folder");
 			return;
 		}
 
@@ -405,6 +410,12 @@ public async Task SelectNewFolder()
 			return;
 		}
 
+		if (Model.Settings.AppDataObjDataFolder == dirPath)
+		{
+			Model.Logger.Warning("No need to add - this is the predefined AppData folder");
+			return;
+		}
+
 		FolderTreeViewModel.CurrentLocalDirectory = dirPath; // this will cause the reindexing
 		var menuItem = new MenuItemViewModel(
 			dirPath,
diff --git a/Gui/Views/ObjectEditorView.axaml b/Gui/Views/ObjectEditorView.axaml
@@ -24,8 +24,9 @@
 					<SplitButton Content="{Binding LastGameObjDataFolder, StringFormat='Copy to {0} object folder'}" Command="{Binding CopyToGameObjDataCommand}" CommandParameter="{Binding LastGameObjDataFolder}" >
 						<SplitButton.Flyout>
 							<MenuFlyout Placement="Bottom">
+								<MenuItem Header="Copy to Locomotion (Steam) game folder" Command="{Binding CopyToGameObjDataCommand}" CommandParameter="{x:Static gui:GameObjDataFolder.LocomotionSteam}"/>
+								<MenuItem Header="Copy to Locomotion (GoG) game folder" Command="{Binding CopyToGameObjDataCommand}" CommandParameter="{x:Static gui:GameObjDataFolder.LocomotionGoG}"/>
 								<MenuItem Header="Copy to AppData game folder" Command="{Binding CopyToGameObjDataCommand}" CommandParameter="{x:Static gui:GameObjDataFolder.AppData}"/>
-								<MenuItem Header="Copy to Locomotion game folder" Command="{Binding CopyToGameObjDataCommand}" CommandParameter="{x:Static gui:GameObjDataFolder.Locomotion}"/>
 								<MenuItem Header="Copy to OpenLoco game folder" Command="{Binding CopyToGameObjDataCommand}" CommandParameter="{x:Static gui:GameObjDataFolder.OpenLoco}"/>
 							</MenuFlyout>
 						</SplitButton.Flyout>
diff --git a/Gui/Views/SCV5View.axaml b/Gui/Views/SCV5View.axaml
@@ -47,8 +47,9 @@
 					<SplitButton Content="{Binding LastGameObjDataFolder, StringFormat='Download missing objects to {0} object folder'}" Command="{Binding DownloadMissingObjectsToGameObjDataCommand}" CommandParameter="{Binding LastGameObjDataFolder}" Margin="4">
 						<SplitButton.Flyout>
 							<MenuFlyout Placement="Bottom">
+								<MenuItem Header="Copy to Locomotion (Steam) game folder" Command="{Binding DownloadMissingObjectsToGameObjDataCommand}" CommandParameter="{x:Static gui:GameObjDataFolder.LocomotionSteam}"/>
+								<MenuItem Header="Copy to Locomotion (GoG) game folder" Command="{Binding DownloadMissingObjectsToGameObjDataCommand}" CommandParameter="{x:Static gui:GameObjDataFolder.LocomotionGoG}"/>
 								<MenuItem Header="Copy to AppData game folder" Command="{Binding DownloadMissingObjectsToGameObjDataCommand}" CommandParameter="{x:Static gui:GameObjDataFolder.AppData}"/>
-								<MenuItem Header="Copy to Locomotion game folder" Command="{Binding DownloadMissingObjectsToGameObjDataCommand}" CommandParameter="{x:Static gui:GameObjDataFolder.Locomotion}"/>
 								<MenuItem Header="Copy to OpenLoco game folder" Command="{Binding DownloadMissingObjectsToGameObjDataCommand}" CommandParameter="{x:Static gui:GameObjDataFolder.OpenLoco}"/>
 							</MenuFlyout>
 						</SplitButton.Flyout>
diff --git a/Index/ObjectIndex.cs b/Index/ObjectIndex.cs
@@ -164,7 +164,7 @@ static void ParseFile(string directory, string filename, ConcurrentQueue<ObjectI
 		}
 
 		var remainingData = data[(S5Header.StructLength + ObjectHeader.StructLength)..];
-		var source = OriginalObjectFiles.GetFileSource(hdrs.S5.Name, hdrs.S5.Checksum);
+		var source = OriginalObjectFiles.GetFileSource(hdrs.S5.Name, hdrs.S5.Checksum, hdrs.S5.ObjectSource);
 
 		var createdTime = DateOnly.FromDateTime(File.GetCreationTimeUtc(absoluteFilename));
 		var modifiedTime = DateOnly.FromDateTime(File.GetLastWriteTimeUtc(absoluteFilename));

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static ObjectSource Convert(this DatObjectSource objectSource, string dat`
`19`	`19`	`=> objectSource switch`
`20`	`20`	`{`
`21`	`21`	`DatObjectSource.Custom => ObjectSource.Custom,`
`22`		`- DatObjectSource.Vanilla => OriginalObjectFiles.GetFileSource(datName, datChecksum),`
	`22`	`+ DatObjectSource.Vanilla => OriginalObjectFiles.GetFileSource(datName, datChecksum, objectSource),`
`23`	`23`	`DatObjectSource.OpenLoco => ObjectSource.OpenLoco,`
`24`	`24`	`_ => throw new NotImplementedException(),`
`25`	`25`	`};`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@ public record OriginalObjectFile(uint SteamChecksum, uint GoGChecksum, uint Open`
`6`	`6`
`7`	`7`	`public static class OriginalObjectFiles`
`8`	`8`	`{`
`9`		`- public static ObjectSource GetFileSource((string name, uint checksum) key)`
`10`		`- => GetFileSource(key.name, key.checksum);`
	`9`	`+ public static ObjectSource GetFileSource((string name, uint checksum) key, DatObjectSource claimedSource)`
	`10`	`+ => GetFileSource(key.name, key.checksum, claimedSource);`
`11`	`11`
`12`		`- public static ObjectSource GetFileSource(string name, uint checksum)`
	`12`	`+ public static ObjectSource GetFileSource(string name, uint checksum, DatObjectSource claimedSource)`
`13`	`13`	`{`
`14`		`- if (Names.TryGetValue(name, out var fileInfo))`
	`14`	`+ if (claimedSource == DatObjectSource.Vanilla && Names.TryGetValue(name, out var fileInfo))`
`15`	`15`	`{`
`16`	`16`	`if (checksum == fileInfo.SteamChecksum)`
`17`	`17`	`{`
`@@ -21,14 +21,11 @@ public static ObjectSource GetFileSource(string name, uint checksum)`
`21`	`21`	`{`
`22`	`22`	`return ObjectSource.LocomotionGoG;`
`23`	`23`	`}`
`24`		`- else if (checksum == fileInfo.OpenGraphicsChecksum)`
`25`		`- {`
`26`		`- return ObjectSource.OpenLoco;`
`27`		`- }`
`28`		`- else if (name == fileInfo.OpenGraphicsName)`
`29`		`- {`
`30`		`- return ObjectSource.OpenLoco;`
`31`		`- }`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ if (claimedSource == DatObjectSource.OpenLoco \|\| Names.Any(x => x.Value.OpenGraphicsName == name))`
	`27`	`+ {`
	`28`	`+ return ObjectSource.OpenLoco;`
`32`	`29`	`}`
`33`	`30`
`34`	`31`	`return ObjectSource.Custom;`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ static void QueryBuildingProducedQuantity()`
`102`	`102`	`{`
`103`	`103`	`var struc = (BuildingObject)o.LocoObject.Object;`
`104`	`104`	`var header = o.DatFileInfo.S5Header;`
`105`		`- var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);`
	`105`	`+ var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);`
`106`	`106`
`107`	`107`	`foreach (var cargo in struc.ProducedCargo.Zip(struc.ProducedQuantity))`
`108`	`108`	`{`
`@@ -149,7 +149,7 @@ static void QueryHeadquarters()`
`149`	`149`	`{`
`150`	`150`	`var struc = (BuildingObject)o.LocoObject.Object;`
`151`	`151`	`var header = o.DatFileInfo.S5Header;`
`152`		`- var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);`
	`152`	`+ var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);`
`153`	`153`
`154`	`154`	`if (struc.Flags.HasFlag(BuildingObjectFlags.IsHeadquarters))`
`155`	`155`	`{`
`@@ -216,7 +216,7 @@ static void QueryCostIndex()`
`216`	`216`	`var costIndex = (byte)costIndexProperty.GetValue(o.LocoObject.Object);`
`217`	`217`
`218`	`218`	`var header = o.DatFileInfo.S5Header;`
`219`		`- var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);`
	`219`	`+ var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);`
`220`	`220`
`221`	`221`	`results.Add((obj, source, o.LocoObject.ObjectType, costIndex));`
`222`	`222`	`}`
`@@ -255,7 +255,7 @@ static void QueryTrackStationOneSidedTrack()`
`255`	`255`	`{`
`256`	`256`	`var struc = (TrackStationObject)o.LocoObject.Object;`
`257`	`257`	`var header = o.DatFileInfo.S5Header;`
`258`		`- var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);`
	`258`	`+ var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);`
`259`	`259`
`260`	`260`	`// Build a list of all enabled TrackTraitFlags for this object`
`261`	`261`	`var enabledFlags = new List<string>();`
`@@ -315,7 +315,7 @@ static void QueryIndustryHasShadows()`
`315`	`315`	`{`
`316`	`316`	`var struc = (IndustryObject)o.LocoObject.Object;`
`317`	`317`	`var header = o.DatFileInfo.S5Header;`
`318`		`- var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);`
	`318`	`+ var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);`
`319`	`319`
`320`	`320`	`if (struc.Flags.HasFlag(IndustryObjectFlags.HasShadows))`
`321`	`321`	`{`
`@@ -357,7 +357,7 @@ static void QueryVehicleBodyUnkSprites()`
`357`	`357`	`{`
`358`	`358`	`var struc = (VehicleObject)o.LocoObject.Object;`
`359`	`359`	`var header = o.DatFileInfo.S5Header;`
`360`		`- var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);`
	`360`	`+ var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);`
`361`	`361`
`362`	`362`	`if (struc.Flags.HasFlag(VehicleObjectFlags.AlternatingCarSprite))`
`363`	`363`	`{`
`@@ -400,7 +400,7 @@ static void QueryCargoCategories()`
`400`	`400`	`var struc = (CargoObject)o.LocoObject.Object;`
`401`	`401`
`402`	`402`	`var header = o.DatFileInfo.S5Header;`
`403`		`- var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum);`
	`403`	`+ var source = OriginalObjectFiles.GetFileSource(header.Name, header.Checksum, header.ObjectSource);`
`404`	`404`
`405`	`405`	`results.Add((obj, struc.CargoCategory, o.LocoObject.StringTable.Table["Name"][LanguageId.English_UK], source));`
`406`	`406`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`namespace Gui;`
`2`	`2`
`3`		`-public enum GameObjDataFolder { AppData, Locomotion, OpenLoco }`
	`3`	`+public enum GameObjDataFolder { LocomotionSteam, LocomotionGoG, AppData, OpenLoco }`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public ObservableCollection<TileElement> CurrentTileElements`
`50`	`50`	`: [];`
`51`	`51`
`52`	`52`	`[Reactive]`
`53`		`- public GameObjDataFolder LastGameObjDataFolder { get; set; } = GameObjDataFolder.Locomotion;`
	`53`	`+ public GameObjDataFolder LastGameObjDataFolder { get; set; } = GameObjDataFolder.LocomotionSteam;`
`54`	`54`	`public ReactiveCommand<GameObjDataFolder, Unit> DownloadMissingObjectsToGameObjDataCommand { get; }`
`55`	`55`
`56`	`56`	`public SCV5ViewModel(FileSystemItem currentFile, ObjectEditorModel model)`
`@@ -141,7 +141,7 @@ async Task DownloadMissingObjects(GameObjDataFolder targetFolder)`
`141`	`141`
`142`	`142`	`foreach (var obj in CurrentS5File.RequiredObjects)`
`143`	`143`	`{`
`144`		`- if (OriginalObjectFiles.GetFileSource(obj.Name, obj.Checksum) is ObjectSource.LocomotionSteam or ObjectSource.LocomotionGoG)`
	`144`	`+ if (OriginalObjectFiles.GetFileSource(obj.Name, obj.Checksum, obj.ObjectSource) is ObjectSource.LocomotionSteam or ObjectSource.LocomotionGoG)`
`145`	`145`	`{`
`146`	`146`	`continue;`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,9 +208,14 @@ void PopulateObjDataMenu()`
`208`	`208`	`ObjDataItems.Add(new MenuItemViewModel($"[{nameof(GameObjDataFolder.AppData)}] {Model.Settings.AppDataObjDataFolder}", ReactiveCommand.Create(() => FolderTreeViewModel.CurrentLocalDirectory = Model.Settings.AppDataObjDataFolder)));`
`209`	`209`	`}`
`210`	`210`
`211`		`- if (Directory.Exists(Model.Settings.LocomotionObjDataFolder))`
	`211`	`+ if (Directory.Exists(Model.Settings.LocomotionSteamObjDataFolder))`
`212`	`212`	`{`
`213`		`- ObjDataItems.Add(new MenuItemViewModel($"[{nameof(GameObjDataFolder.Locomotion)}] {Model.Settings.LocomotionObjDataFolder}", ReactiveCommand.Create(() => FolderTreeViewModel.CurrentLocalDirectory = Model.Settings.LocomotionObjDataFolder)));`
	`213`	`+ ObjDataItems.Add(new MenuItemViewModel($"[{nameof(GameObjDataFolder.LocomotionSteam)}] {Model.Settings.LocomotionSteamObjDataFolder}", ReactiveCommand.Create(() => FolderTreeViewModel.CurrentLocalDirectory = Model.Settings.LocomotionSteamObjDataFolder)));`
	`214`	`+ }`
	`215`	`+`
	`216`	`+ if (Directory.Exists(Model.Settings.LocomotionGoGObjDataFolder))`
	`217`	`+ {`
	`218`	`+ ObjDataItems.Add(new MenuItemViewModel($"[{nameof(GameObjDataFolder.LocomotionGoG)}] {Model.Settings.LocomotionGoGObjDataFolder}", ReactiveCommand.Create(() => FolderTreeViewModel.CurrentLocalDirectory = Model.Settings.LocomotionGoGObjDataFolder)));`
`214`	`219`	`}`
`215`	`220`
`216`	`221`	`if (Directory.Exists(Model.Settings.OpenLocoObjDataFolder))`
`@@ -283,7 +288,7 @@ public async Task LoadSingleObject()`
`283`	`288`	`if (Model.TryLoadObject(new FileSystemItem(Path.GetFileName(fsi.FileName), fsi.FileName, fsi.Id, createdTime, modifiedTime, FileLocation.Local), out var uiLocoFile) && uiLocoFile != null)`
`284`	`289`	`{`
`285`	`290`	`Model.Logger.Warning($"Successfully loaded {fsi.FileName}");`
`286`		`- var source = OriginalObjectFiles.GetFileSource(uiLocoFile.DatInfo.S5Header.Name, uiLocoFile.DatInfo.S5Header.Checksum);`
	`291`	`+ var source = OriginalObjectFiles.GetFileSource(uiLocoFile.DatInfo.S5Header.Name, uiLocoFile.DatInfo.S5Header.Checksum, uiLocoFile.DatInfo.S5Header.ObjectSource);`
`287`	`292`	`var fsi2 = new FileSystemItem(uiLocoFile!.DatInfo.S5Header.Name, fsi.FileName, fsi.Id, createdTime, modifiedTime, FileLocation.Local, source);`
`288`	`293`	`SetObjectViewModel(fsi2);`
`289`	`294`	`}`
`@@ -387,15 +392,15 @@ public async Task SelectNewFolder()`
`387`	`392`	`return;`
`388`	`393`	`}`
`389`	`394`
`390`		`- if (Model.Settings.AppDataObjDataFolder == dirPath)`
	`395`	`+ if (Model.Settings.LocomotionSteamObjDataFolder == dirPath)`
`391`	`396`	`{`
`392`		`- Model.Logger.Warning("No need to add - this is the predefined AppData folder");`
	`397`	`+ Model.Logger.Warning("No need to add - this is the predefined Locomotion (Steam) ObjData folder");`
`393`	`398`	`return;`
`394`	`399`	`}`
`395`	`400`
`396`		`- if (Model.Settings.LocomotionObjDataFolder == dirPath)`
	`401`	`+ if (Model.Settings.LocomotionGoGObjDataFolder == dirPath)`
`397`	`402`	`{`
`398`		`- Model.Logger.Warning("No need to add - this is the predefined Locomotion ObjData folder");`
	`403`	`+ Model.Logger.Warning("No need to add - this is the predefined Locomotion (GoG) ObjData folder");`
`399`	`404`	`return;`
`400`	`405`	`}`
`401`	`406`
`@@ -405,6 +410,12 @@ public async Task SelectNewFolder()`
`405`	`410`	`return;`
`406`	`411`	`}`
`407`	`412`
	`413`	`+ if (Model.Settings.AppDataObjDataFolder == dirPath)`
	`414`	`+ {`
	`415`	`+ Model.Logger.Warning("No need to add - this is the predefined AppData folder");`
	`416`	`+ return;`
	`417`	`+ }`
	`418`	`+`
`408`	`419`	`FolderTreeViewModel.CurrentLocalDirectory = dirPath; // this will cause the reindexing`
`409`	`420`	`var menuItem = new MenuItemViewModel(`
`410`	`421`	`dirPath,`