Skip to content

Commit 2b9f49b

Browse files
LeftofZenLeftofZen
committed
clean up object unique ids
1 parent 04a4adf commit 2b9f49b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+267
-251
lines changed

‎Dat/Types/GlobalUsings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
global using char_t = System.Byte;
55
global using coord_t = System.Int16;
6-
global using DbKey = System.UInt64;
6+
global using UniqueObjectId = System.UInt64;
77
global using image_id = System.UInt32;
88
global using int16_t = System.Int16;
99
global using int32_t = System.Int32;

‎DataQuery/Program.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static void QueryIndustryHasShadows(string dir, Logger logger, ObjectIndex index
2828
{
2929
try
3030
{
31-
var o = SawyerStreamReader.LoadFullObjectFromFile(Path.Combine(dir, obj.Filename), logger);
31+
var o = SawyerStreamReader.LoadFullObjectFromFile(Path.Combine(dir, obj.FileName), logger);
3232
if (o?.LocoObject != null)
3333
{
3434
var struc = (IndustryObject)o.Value.LocoObject.Object;
@@ -43,7 +43,7 @@ static void QueryIndustryHasShadows(string dir, Logger logger, ObjectIndex index
4343
}
4444
catch (Exception ex)
4545
{
46-
Console.WriteLine($"{obj.Filename} - {ex.Message}");
46+
Console.WriteLine($"{obj.FileName} - {ex.Message}");
4747
}
4848
}
4949

@@ -65,7 +65,7 @@ static void QueryVehicleBodyUnkSprites(string dir, Logger logger, ObjectIndex in
6565
{
6666
try
6767
{
68-
var o = SawyerStreamReader.LoadFullObjectFromFile(Path.Combine(dir, obj.Filename), logger);
68+
var o = SawyerStreamReader.LoadFullObjectFromFile(Path.Combine(dir, obj.FileName), logger);
6969
if (o?.LocoObject != null)
7070
{
7171
var struc = (VehicleObject)o.Value.LocoObject.Object;
@@ -80,7 +80,7 @@ static void QueryVehicleBodyUnkSprites(string dir, Logger logger, ObjectIndex in
8080
}
8181
catch (Exception ex)
8282
{
83-
Console.WriteLine($"{obj.Filename} - {ex.Message}");
83+
Console.WriteLine($"{obj.FileName} - {ex.Message}");
8484
}
8585
}
8686

@@ -102,7 +102,7 @@ static void QueryCargoCategories(string dir, Logger logger, ObjectIndex index)
102102
{
103103
try
104104
{
105-
var o = SawyerStreamReader.LoadFullObjectFromFile(Path.Combine(dir, obj.Filename), logger);
105+
var o = SawyerStreamReader.LoadFullObjectFromFile(Path.Combine(dir, obj.FileName), logger);
106106
if (o?.LocoObject != null)
107107
{
108108
var struc = (CargoObject)o.Value.LocoObject.Object;
@@ -115,7 +115,7 @@ static void QueryCargoCategories(string dir, Logger logger, ObjectIndex index)
115115
}
116116
catch (Exception ex)
117117
{
118-
Console.WriteLine($"{obj.Filename} - {ex.Message}");
118+
Console.WriteLine($"{obj.FileName} - {ex.Message}");
119119
}
120120
}
121121

@@ -136,7 +136,7 @@ static void QueryCostIndices(string dir, Logger logger, ObjectIndex index)
136136
{
137137
try
138138
{
139-
var o = SawyerStreamReader.LoadFullObjectFromFile(Path.Combine(dir, obj.Filename), logger);
139+
var o = SawyerStreamReader.LoadFullObjectFromFile(Path.Combine(dir, obj.FileName), logger);
140140
if (o?.LocoObject != null)
141141
{
142142
var struc = o.Value.LocoObject.Object;
@@ -171,7 +171,7 @@ static void QueryCostIndices(string dir, Logger logger, ObjectIndex index)
171171
}
172172
catch (Exception ex)
173173
{
174-
Console.WriteLine($"{obj.Filename} - {ex.Message}");
174+
Console.WriteLine($"{obj.FileName} - {ex.Message}");
175175
}
176176
}
177177

‎DataSanitiser/Program.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ async static void WritexxHash3()
1818
{
1919
if (index.TryFind((lookup.DatName, lookup.DatChecksum), out var entry))
2020
{
21-
var filename = Path.Combine(objDirectory, entry.Filename);
21+
var filename = Path.Combine(objDirectory, entry.FileName);
2222
var bytes = File.ReadAllBytes(filename);
2323
lookup.xxHash3 = XxHash3.HashToUInt64(bytes);
2424
}
@@ -53,7 +53,7 @@ async static void WriteStringTable()
5353
{
5454
if (index.TryFind((obj.DatObjects.First().DatName, obj.DatObjects.First().DatChecksum), out var entry))
5555
{
56-
var filename = Path.Combine(objDirectory, entry.Filename);
56+
var filename = Path.Combine(objDirectory, entry.FileName);
5757
var bytes = File.ReadAllBytes(filename);
5858

5959
try
@@ -62,7 +62,7 @@ async static void WriteStringTable()
6262

6363
if (dat == null)
6464
{
65-
Console.WriteLine($"Failed to read {entry.Filename}");
65+
Console.WriteLine($"Failed to read {entry.FileName}");
6666
continue;
6767
}
6868

@@ -82,7 +82,7 @@ async static void WriteStringTable()
8282
}
8383
catch (Exception ex)
8484
{
85-
Console.WriteLine($"Exception, failed to read {entry.Filename}, exception={ex}");
85+
Console.WriteLine($"Exception, failed to read {entry.FileName}, exception={ex}");
8686
continue;
8787
}
8888
}

‎DatabaseImporter/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ static void SeedDb(LocoDbContext db, bool deleteExisting)
211211
objectMetadataDict.Add(objIndex.DisplayName, newMetadata);
212212
}
213213

214-
var filename = Path.Combine(objDirectory, objIndex.Filename);
214+
var filename = Path.Combine(objDirectory, objIndex.FileName);
215215
var creationTime = objIndex.ObjectSource is ObjectSource.LocomotionSteam or ObjectSource.LocomotionGoG
216216
? gameReleaseDate
217217
: File.GetLastWriteTimeUtc(filename); // this is the "Modified" time as shown in Windows

‎Definitions/DTO/DtoAuthorEntry.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
namespace OpenLoco.Definitions.DTO
44
{
55
public record DtoAuthorEntry(
6-
DbKey Id,
6+
UniqueObjectId Id,
77
string Name) : IHasId;
88
}

‎Definitions/DTO/DtoDatObjectEntry.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ namespace OpenLoco.Definitions.DTO
22
{
33

44
public record DtoDatObjectEntry(
5-
DbKey Id,
5+
UniqueObjectId Id,
66
string DatName,
77
uint DatChecksum,
88
ulong xxHash3,
9-
DbKey ObjectId)
9+
UniqueObjectId ObjectId)
1010
{
1111
public string? DatBytes { get; set; }
1212
}

‎Definitions/DTO/DtoExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ [.. x.Packs.Select(x => x.ToDtoEntry())],
2727
[.. x.Object.DatObjects.Select(x => x.ToDtoEntry())],
2828
x.Object.StringTable.ToDtoDescriptor(x.Object.Id));
2929

30-
public static DtoStringTableDescriptor ToDtoDescriptor(this ICollection<TblStringTable> x, DbKey ObjectId)
30+
public static DtoStringTableDescriptor ToDtoDescriptor(this ICollection<TblStringTable> x, UniqueObjectId ObjectId)
3131
{
3232
var table = x
3333
.Select(x => x.ToDtoEntry())

‎Definitions/DTO/DtoItemPackDescriptor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace OpenLoco.Definitions.DTO
44
{
55
public record DtoItemPackDescriptor<T>(
6-
DbKey Id,
6+
UniqueObjectId Id,
77
string Name,
88
string? Description,
99
DateTimeOffset? CreatedDate,

‎Definitions/DTO/DtoItemPackEntry.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace OpenLoco.Definitions.DTO
44
{
55
public record DtoItemPackEntry(
6-
DbKey Id,
6+
UniqueObjectId Id,
77
string Name,
88
string? Description,
99
DateTimeOffset? CreatedDate,

‎Definitions/DTO/DtoLicenceEntry.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace OpenLoco.Definitions.DTO
44
{
55
public record DtoLicenceEntry(
6-
DbKey Id,
6+
UniqueObjectId Id,
77
string Name,
88
string LicenceText) : IHasId;
99
}

0 commit comments

Comments
 (0)