add missing contstructors for objects

LeftofZen · LeftofZen · commit 1e8882e9b9ed · 2024-11-15T14:41:21.000+11:00
diff --git a/Dat/Objects/Airport/AirportBuilding.cs b/Dat/Objects/Airport/AirportBuilding.cs
@@ -13,6 +13,10 @@ public record AirportBuilding(
 		[property: LocoStructOffset(0x03)] int8_t Y
 		) : ILocoStruct
 	{
-		public bool Validate() => true;
+		public AirportBuilding() : this(0, 0, 0, 0)
+		{ }
+
+		public bool Validate()
+			=> true;
 	}
 }
diff --git a/Dat/Objects/Airport/AirportObject.cs b/Dat/Objects/Airport/AirportObject.cs
@@ -22,7 +22,7 @@ public record AirportObject(
 		[property: LocoStructOffset(0x13)] uint8_t NumBuildingVariations,
 		[property: LocoStructOffset(0x14), LocoStructVariableLoad, LocoArrayLength(AirportObject.BuildingHeightCount)] List<uint8_t> BuildingHeights,
 		[property: LocoStructOffset(0x18), LocoStructVariableLoad, LocoArrayLength(AirportObject.BuildingAnimationCount)] List<BuildingPartAnimation> BuildingAnimations,
-		[property: LocoStructOffset(0x1C), LocoStructVariableLoad, LocoArrayLength(AirportObject.BuildingVariationCount)] List<uint8_t[]> BuildingVariations,
+		[property: LocoStructOffset(0x1C), LocoStructVariableLoad, LocoArrayLength(AirportObject.BuildingVariationCount)] List<List<uint8_t>> BuildingVariations,
 		[property: LocoStructOffset(0x9C), LocoStructVariableLoad] List<AirportBuilding> BuildingPositions,
 		[property: LocoStructOffset(0xA0)] uint32_t LargeTiles,
 		[property: LocoStructOffset(0xA4)] int8_t MinX,
@@ -63,7 +63,7 @@ public ReadOnlySpan<byte> Load(ReadOnlySpan<byte> remainingData)
 				while (remainingData[++ptr_1C] != 0xFF)
 				{ }
 
-				BuildingVariations.Add(remainingData[..ptr_1C].ToArray());
+				BuildingVariations.Add(remainingData[..ptr_1C].ToArray().ToList());
 				ptr_1C++;
 				remainingData = remainingData[ptr_1C..];
 			}
@@ -119,7 +119,7 @@ public ReadOnlySpan<byte> Save()
 			// variations
 			foreach (var x in BuildingVariations)
 			{
-				ms.Write(x);
+				ms.Write(x.ToArray());
 				ms.WriteByte(0xFF);
 			}
 
diff --git a/Dat/Objects/Airport/MovementEdge.cs b/Dat/Objects/Airport/MovementEdge.cs
@@ -15,6 +15,10 @@ public record MovementEdge(
 		[property: LocoStructOffset(0x08)] uint32_t AtLeastOneClearEdges // Which edges must have at least one clear to use transition edge. should probably be some kind of flags?
 		) : ILocoStruct
 	{
-		public bool Validate() => true;
+		public MovementEdge() : this(0, 0, 0, 0, 0, 0)
+		{ }
+
+		public bool Validate()
+			=> true;
 	}
 }
diff --git a/Dat/Objects/Airport/MovementNode.cs b/Dat/Objects/Airport/MovementNode.cs
@@ -13,6 +13,10 @@ public record MovementNode(
 		[property: LocoStructOffset(0x06)] AirportMovementNodeFlags Flags
 		) : ILocoStruct
 	{
-		public bool Validate() => true;
+		public MovementNode() : this(0, 0, 0, AirportMovementNodeFlags.None)
+		{ }
+
+		public bool Validate()
+			=> true;
 	}
 }
diff --git a/Dat/Objects/Industry/BuildingPartAnimation.cs b/Dat/Objects/Industry/BuildingPartAnimation.cs
@@ -12,6 +12,9 @@ public record BuildingPartAnimation(
 		[property: LocoStructOffset(0x01)] uint8_t AnimationSpeed // Also encodes in bit 7 if the animation is position modified
 		) : ILocoStruct
 	{
+		public BuildingPartAnimation() : this(0, 0)
+		{ }
+
 		public bool Validate()
 			=> IsPowerOfTwo(NumFrames);
 
diff --git a/Dat/Objects/Industry/IndustryObject.cs b/Dat/Objects/Industry/IndustryObject.cs
@@ -26,9 +26,9 @@ public record IndustryObject(
 		[property: LocoStructOffset(0x1F)] uint8_t NumBuildingVariations,
 		[property: LocoStructOffset(0x20), LocoStructVariableLoad, LocoArrayLength(IndustryObject.BuildingHeightCount)] List<uint8_t> BuildingHeights,    // This is the height of a building image
 		[property: LocoStructOffset(0x24), LocoStructVariableLoad, LocoArrayLength(IndustryObject.BuildingAnimationCount)] List<BuildingPartAnimation> BuildingAnimations,
-		[property: LocoStructOffset(0x28), LocoStructVariableLoad, LocoArrayLength(IndustryObject.AnimationSequencesCount)] List<uint8_t[]> AnimationSequences, // Access with getAnimationSequence helper method
+		[property: LocoStructOffset(0x28), LocoStructVariableLoad, LocoArrayLength(IndustryObject.AnimationSequencesCount)] List<List<uint8_t>> AnimationSequences, // Access with getAnimationSequence helper method
 		[property: LocoStructOffset(0x38), LocoStructVariableLoad] List<IndustryObjectUnk38> var_38,    // Access with getUnk38 helper method
-		[property: LocoStructOffset(0x3C), LocoStructVariableLoad, LocoArrayLength(IndustryObject.BuildingVariationCount)] List<uint8_t[]> BuildingVariations,  // Access with getBuildingParts helper method
+		[property: LocoStructOffset(0x3C), LocoStructVariableLoad, LocoArrayLength(IndustryObject.BuildingVariationCount)] List<List<uint8_t>> BuildingVariations,  // Access with getBuildingParts helper method
 		[property: LocoStructOffset(0xBC)] uint8_t MinNumBuildings,
 		[property: LocoStructOffset(0xBD)] uint8_t MaxNumBuildings,
 		[property: LocoStructOffset(0xBE), LocoStructVariableLoad] List<uint8_t> Buildings,
@@ -103,7 +103,7 @@ public ReadOnlySpan<byte> Load(ReadOnlySpan<byte> remainingData)
 					arr = remainingData[1..size].ToArray();
 				}
 
-				AnimationSequences.Add(arr);
+				AnimationSequences.Add(arr.ToList());
 				remainingData = remainingData[(size + 1)..];
 			}
 
@@ -128,7 +128,7 @@ public ReadOnlySpan<byte> Load(ReadOnlySpan<byte> remainingData)
 					;
 				}
 
-				BuildingVariations.Add(remainingData[..ptr_1F].ToArray());
+				BuildingVariations.Add(remainingData[..ptr_1F].ToArray().ToList());
 				ptr_1F++;
 				remainingData = remainingData[ptr_1F..];
 			}
@@ -203,8 +203,8 @@ public ReadOnlySpan<byte> Save()
 				// animation sequences
 				foreach (var x in AnimationSequences)
 				{
-					ms.WriteByte((uint8_t)x.Length);
-					ms.Write(x);
+					ms.WriteByte((uint8_t)x.Count);
+					ms.Write(x.ToArray());
 				}
 
 				// unk animation related
@@ -219,7 +219,7 @@ public ReadOnlySpan<byte> Save()
 				// variation parts
 				foreach (var x in BuildingVariations)
 				{
-					ms.Write(x);
+					ms.Write(x.ToArray());
 					ms.WriteByte(0xFF);
 				}
 
diff --git a/Dat/Objects/Industry/IndustryObjectProductionRateRange.cs b/Dat/Objects/Industry/IndustryObjectProductionRateRange.cs
@@ -12,6 +12,10 @@ public record IndustryObjectProductionRateRange(
 		[property: LocoStructOffset(0x02)] uint16_t Max
 		) : ILocoStruct
 	{
-		public bool Validate() => true;
+		public IndustryObjectProductionRateRange() : this(0, 0)
+		{ }
+
+		public bool Validate()
+			=> true;
 	}
 }
diff --git a/Dat/Objects/Industry/IndustryObjectUnk38.cs b/Dat/Objects/Industry/IndustryObjectUnk38.cs
@@ -12,6 +12,11 @@ public record IndustryObjectUnk38(
 		[property: LocoStructOffset(0x01)] uint8_t var_01
 		) : ILocoStruct
 	{
-		public bool Validate() => true;
+
+		public IndustryObjectUnk38() : this(0, 0)
+		{ }
+
+		public bool Validate()
+			=> true;
 	}
 }
diff --git a/Dat/Objects/Sound/SoundObjectData.cs b/Dat/Objects/Sound/SoundObjectData.cs
@@ -13,6 +13,10 @@ public record SoundObjectData(
 		[property: LocoStructOffset(0x0C)] WaveFormatEx PcmHeader
 		) : ILocoStruct
 	{
-		public bool Validate() => Offset >= 0;
+		public SoundObjectData() : this(0, 0, 0, new WaveFormatEx())
+		{ }
+
+		public bool Validate()
+			=> Offset >= 0;
 	}
 }
diff --git a/Dat/Objects/Sound/WaveFormatEx.cs b/Dat/Objects/Sound/WaveFormatEx.cs
@@ -16,6 +16,10 @@ public record WaveFormatEx(
 		[property: LocoStructOffset(0x010)] int16_t CBSize
 		) : ILocoStruct
 	{
-		public bool Validate() => true;
+		public WaveFormatEx() : this(0, 0, 0, 0, 0, 0, 0)
+		{ }
+
+		public bool Validate()
+			=> true;
 	}
 }
diff --git a/Dat/Objects/Vehicle/SimpleAnimation.cs b/Dat/Objects/Vehicle/SimpleAnimation.cs
@@ -15,6 +15,7 @@ public record SimpleAnimation(
 		public SimpleAnimation() : this(0, 0, 0)
 		{ }
 
-		public bool Validate() => true;
+		public bool Validate()
+			=> true;
 	}
 }
diff --git a/Gui/ViewModels/DatTypes/Objects/AirportViewModel.cs b/Gui/ViewModels/DatTypes/Objects/AirportViewModel.cs
@@ -51,7 +51,7 @@ public AirportViewModel(AirportObject ao)
 			ObsoleteYear = ao.ObsoleteYear;
 			MovementNodes = new(ao.MovementNodes);
 			MovementEdges = new(ao.MovementEdges);
-			var_B6 = new(ao.var_B6);
+			var_B6 = [.. ao.var_B6];
 		}
 
 		public ILocoStruct GetAsUnderlyingType(ILocoStruct locoStruct)
@@ -78,6 +78,7 @@ public AirportObject GetAsStruct(AirportObject ao)
 				NumBuildingVariations = (uint8_t)ao.BuildingVariations.Count,
 				NumMovementEdges = (uint8_t)ao.MovementEdges.Count,
 				NumMovementNodes = (uint8_t)ao.MovementNodes.Count,
+				var_B6 = [.. ao.var_B6],
 			};
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@ public record AirportBuilding(`
`13`	`13`	`[property: LocoStructOffset(0x03)] int8_t Y`
`14`	`14`	`) : ILocoStruct`
`15`	`15`	`{`
`16`		`- public bool Validate() => true;`
	`16`	`+ public AirportBuilding() : this(0, 0, 0, 0)`
	`17`	`+ { }`
	`18`	`+`
	`19`	`+ public bool Validate()`
	`20`	`+ => true;`
`17`	`21`	`}`
`18`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ public record MovementEdge(`
`15`	`15`	`[property: LocoStructOffset(0x08)] uint32_t AtLeastOneClearEdges // Which edges must have at least one clear to use transition edge. should probably be some kind of flags?`
`16`	`16`	`) : ILocoStruct`
`17`	`17`	`{`
`18`		`- public bool Validate() => true;`
	`18`	`+ public MovementEdge() : this(0, 0, 0, 0, 0, 0)`
	`19`	`+ { }`
	`20`	`+`
	`21`	`+ public bool Validate()`
	`22`	`+ => true;`
`19`	`23`	`}`
`20`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@ public record MovementNode(`
`13`	`13`	`[property: LocoStructOffset(0x06)] AirportMovementNodeFlags Flags`
`14`	`14`	`) : ILocoStruct`
`15`	`15`	`{`
`16`		`- public bool Validate() => true;`
	`16`	`+ public MovementNode() : this(0, 0, 0, AirportMovementNodeFlags.None)`
	`17`	`+ { }`
	`18`	`+`
	`19`	`+ public bool Validate()`
	`20`	`+ => true;`
`17`	`21`	`}`
`18`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@ public record BuildingPartAnimation(`
`12`	`12`	`[property: LocoStructOffset(0x01)] uint8_t AnimationSpeed // Also encodes in bit 7 if the animation is position modified`
`13`	`13`	`) : ILocoStruct`
`14`	`14`	`{`
	`15`	`+ public BuildingPartAnimation() : this(0, 0)`
	`16`	`+ { }`
	`17`	`+`
`15`	`18`	`public bool Validate()`
`16`	`19`	`=> IsPowerOfTwo(NumFrames);`
`17`	`20`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ public record IndustryObject(`
`26`	`26`	`[property: LocoStructOffset(0x1F)] uint8_t NumBuildingVariations,`
`27`	`27`	`[property: LocoStructOffset(0x20), LocoStructVariableLoad, LocoArrayLength(IndustryObject.BuildingHeightCount)] List<uint8_t> BuildingHeights, // This is the height of a building image`
`28`	`28`	`[property: LocoStructOffset(0x24), LocoStructVariableLoad, LocoArrayLength(IndustryObject.BuildingAnimationCount)] List<BuildingPartAnimation> BuildingAnimations,`
`29`		`- [property: LocoStructOffset(0x28), LocoStructVariableLoad, LocoArrayLength(IndustryObject.AnimationSequencesCount)] List<uint8_t[]> AnimationSequences, // Access with getAnimationSequence helper method`
	`29`	`+ [property: LocoStructOffset(0x28), LocoStructVariableLoad, LocoArrayLength(IndustryObject.AnimationSequencesCount)] List<List<uint8_t>> AnimationSequences, // Access with getAnimationSequence helper method`
`30`	`30`	`[property: LocoStructOffset(0x38), LocoStructVariableLoad] List<IndustryObjectUnk38> var_38, // Access with getUnk38 helper method`
`31`		`- [property: LocoStructOffset(0x3C), LocoStructVariableLoad, LocoArrayLength(IndustryObject.BuildingVariationCount)] List<uint8_t[]> BuildingVariations, // Access with getBuildingParts helper method`
	`31`	`+ [property: LocoStructOffset(0x3C), LocoStructVariableLoad, LocoArrayLength(IndustryObject.BuildingVariationCount)] List<List<uint8_t>> BuildingVariations, // Access with getBuildingParts helper method`
`32`	`32`	`[property: LocoStructOffset(0xBC)] uint8_t MinNumBuildings,`
`33`	`33`	`[property: LocoStructOffset(0xBD)] uint8_t MaxNumBuildings,`
`34`	`34`	`[property: LocoStructOffset(0xBE), LocoStructVariableLoad] List<uint8_t> Buildings,`
`@@ -103,7 +103,7 @@ public ReadOnlySpan<byte> Load(ReadOnlySpan<byte> remainingData)`
`103`	`103`	`arr = remainingData[1..size].ToArray();`
`104`	`104`	`}`
`105`	`105`
`106`		`- AnimationSequences.Add(arr);`
	`106`	`+ AnimationSequences.Add(arr.ToList());`
`107`	`107`	`remainingData = remainingData[(size + 1)..];`
`108`	`108`	`}`
`109`	`109`
`@@ -128,7 +128,7 @@ public ReadOnlySpan<byte> Load(ReadOnlySpan<byte> remainingData)`
`128`	`128`	`;`
`129`	`129`	`}`
`130`	`130`
`131`		`- BuildingVariations.Add(remainingData[..ptr_1F].ToArray());`
	`131`	`+ BuildingVariations.Add(remainingData[..ptr_1F].ToArray().ToList());`
`132`	`132`	`ptr_1F++;`
`133`	`133`	`remainingData = remainingData[ptr_1F..];`
`134`	`134`	`}`
`@@ -203,8 +203,8 @@ public ReadOnlySpan<byte> Save()`
`203`	`203`	`// animation sequences`
`204`	`204`	`foreach (var x in AnimationSequences)`
`205`	`205`	`{`
`206`		`- ms.WriteByte((uint8_t)x.Length);`
`207`		`- ms.Write(x);`
	`206`	`+ ms.WriteByte((uint8_t)x.Count);`
	`207`	`+ ms.Write(x.ToArray());`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`// unk animation related`
`@@ -219,7 +219,7 @@ public ReadOnlySpan<byte> Save()`
`219`	`219`	`// variation parts`
`220`	`220`	`foreach (var x in BuildingVariations)`
`221`	`221`	`{`
`222`		`- ms.Write(x);`
	`222`	`+ ms.Write(x.ToArray());`
`223`	`223`	`ms.WriteByte(0xFF);`
`224`	`224`	`}`
`225`	`225`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@ public record IndustryObjectProductionRateRange(`
`12`	`12`	`[property: LocoStructOffset(0x02)] uint16_t Max`
`13`	`13`	`) : ILocoStruct`
`14`	`14`	`{`
`15`		`- public bool Validate() => true;`
	`15`	`+ public IndustryObjectProductionRateRange() : this(0, 0)`
	`16`	`+ { }`
	`17`	`+`
	`18`	`+ public bool Validate()`
	`19`	`+ => true;`
`16`	`20`	`}`
`17`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,11 @@ public record IndustryObjectUnk38(`
`12`	`12`	`[property: LocoStructOffset(0x01)] uint8_t var_01`
`13`	`13`	`) : ILocoStruct`
`14`	`14`	`{`
`15`		`- public bool Validate() => true;`
	`15`	`+`
	`16`	`+ public IndustryObjectUnk38() : this(0, 0)`
	`17`	`+ { }`
	`18`	`+`
	`19`	`+ public bool Validate()`
	`20`	`+ => true;`
`16`	`21`	`}`
`17`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@ public record SoundObjectData(`
`13`	`13`	`[property: LocoStructOffset(0x0C)] WaveFormatEx PcmHeader`
`14`	`14`	`) : ILocoStruct`
`15`	`15`	`{`
`16`		`- public bool Validate() => Offset >= 0;`
	`16`	`+ public SoundObjectData() : this(0, 0, 0, new WaveFormatEx())`
	`17`	`+ { }`
	`18`	`+`
	`19`	`+ public bool Validate()`
	`20`	`+ => Offset >= 0;`
`17`	`21`	`}`
`18`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@ public record WaveFormatEx(`
`16`	`16`	`[property: LocoStructOffset(0x010)] int16_t CBSize`
`17`	`17`	`) : ILocoStruct`
`18`	`18`	`{`
`19`		`- public bool Validate() => true;`
	`19`	`+ public WaveFormatEx() : this(0, 0, 0, 0, 0, 0, 0)`
	`20`	`+ { }`
	`21`	`+`
	`22`	`+ public bool Validate()`
	`23`	`+ => true;`
`20`	`24`	`}`
`21`	`25`	`}`