fix incorrect validations

LeftofZen · LeftofZen · commit 8ea67dae6226 · 2025-10-09T17:54:29.000+11:00
diff --git a/Definitions/ObjectModels/Objects/Airport/AirportObject.cs b/Definitions/ObjectModels/Objects/Airport/AirportObject.cs
@@ -31,11 +31,12 @@ public class AirportObject : ILocoStruct, IHasBuildingComponents
 
 	public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
 	{
-		var bcValidationContext = new ValidationContext(BuildingComponents);
-		foreach (var result in BuildingComponents.Validate(bcValidationContext))
-		{
-			yield return result;
-		}
+		// not applicable for AirportObject
+		//var bcValidationContext = new ValidationContext(BuildingComponents);
+		//foreach (var result in BuildingComponents.Validate(bcValidationContext))
+		//{
+		//	yield return result;
+		//}
 
 		if (CostIndex >= Constants.CurrencyMultiplicationFactorArraySize)
 		{
diff --git a/Definitions/ObjectModels/Objects/Dock/DockObject.cs b/Definitions/ObjectModels/Objects/Dock/DockObject.cs
@@ -18,11 +18,12 @@ public class DockObject : ILocoStruct, IHasBuildingComponents
 
 	public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
 	{
-		var bcValidationContext = new ValidationContext(BuildingComponents);
-		foreach (var result in BuildingComponents.Validate(bcValidationContext))
-		{
-			yield return result;
-		}
+		// not applicable for DockObject
+		//var bcValidationContext = new ValidationContext(BuildingComponents);
+		//foreach (var result in BuildingComponents.Validate(bcValidationContext))
+		//{
+		//	yield return result;
+		//}
 
 		if (CostIndex >= Constants.CurrencyMultiplicationFactorArraySize)
 		{
diff --git a/Definitions/ObjectModels/Objects/Industry/IndustryObject.cs b/Definitions/ObjectModels/Objects/Industry/IndustryObject.cs
@@ -66,10 +66,11 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 			yield return new ValidationResult("TotalOfTypeInScenario must be between 1 and 32", [nameof(TotalOfTypeInScenario)]);
 		}
 
-		if (SellCostFactor >= 0)
-		{
-			yield return new ValidationResult($"{nameof(SellCostFactor)} must be less than 0 {nameof(SellCostFactor)}", [nameof(SellCostFactor)]);
-		}
+		// it costs money to setll an Industry
+		//if (SellCostFactor >= 0)
+		//{
+		//	yield return new ValidationResult($"{nameof(SellCostFactor)} must be less than 0 {nameof(SellCostFactor)}", [nameof(SellCostFactor)]);
+		//}
 
 		if (BuildCostFactor <= 0)
 		{
diff --git a/Definitions/ObjectModels/Objects/LevelCrossing/LevelCrossingObject.cs b/Definitions/ObjectModels/Objects/LevelCrossing/LevelCrossingObject.cs
@@ -18,22 +18,22 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 	{
 		if (SellCostFactor >= 0)
 		{
-			yield return new ValidationResult($"{nameof(SellCostFactor)} must be less than 0 {nameof(SellCostFactor)}", [nameof(SellCostFactor)]);
+			yield return new ValidationResult($"{nameof(SellCostFactor)} must be less than 0. {nameof(SellCostFactor)}={SellCostFactor}", [nameof(SellCostFactor)]);
 		}
 
 		if (BuildCostFactor <= 0)
 		{
-			yield return new ValidationResult($"{nameof(BuildCostFactor)} must be greater than 0", [nameof(BuildCostFactor)]);
+			yield return new ValidationResult($"{nameof(BuildCostFactor)} must be greater than 0. {nameof(BuildCostFactor)}={BuildCostFactor}", [nameof(BuildCostFactor)]);
 		}
 
 		if (-SellCostFactor > BuildCostFactor)
 		{
-			yield return new ValidationResult($"-{nameof(SellCostFactor)} must be less than or equal to {nameof(BuildCostFactor)}.", [nameof(SellCostFactor), nameof(BuildCostFactor)]);
+			yield return new ValidationResult($"-{nameof(SellCostFactor)} must be less than or equal to {nameof(BuildCostFactor)}. {nameof(BuildCostFactor)}={BuildCostFactor} {nameof(SellCostFactor)}={SellCostFactor}", [nameof(SellCostFactor), nameof(BuildCostFactor)]);
 		}
 
-		if (ClosingFrames is not 1 or 2 or 4 or 8 or 16 or 32)
+		if (ClosingFrames is not (1 or 2 or 4 or 8 or 16 or 32))
 		{
-			yield return new ValidationResult("ClosingFrames must be a power of two between 1 and 32 (inclusive)", [nameof(ClosingFrames)]);
+			yield return new ValidationResult($"ClosingFrames must be a power of two between 1 and 32 (inclusive). {nameof(ClosingFrames)}={ClosingFrames}", [nameof(ClosingFrames)]);
 		}
 	}
 }
diff --git a/Definitions/ObjectModels/Objects/TrackSignal/TrackSignalObject.cs b/Definitions/ObjectModels/Objects/TrackSignal/TrackSignalObject.cs
@@ -24,7 +24,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 			yield return new ValidationResult($"{nameof(AnimationSpeed)} must be 0, 1, 3, 7, or 15.", [nameof(AnimationSpeed)]);
 		}
 
-		if (NumFrames is not 4 or 7 or 10)
+		if (NumFrames is not (4 or 7 or 10))
 		{
 			yield return new ValidationResult($"{nameof(NumFrames)} must be 4, 7, or 10.", [nameof(NumFrames)]);
 		}
diff --git a/Definitions/ObjectModels/Objects/Tree/TreeObject.cs b/Definitions/ObjectModels/Objects/Tree/TreeObject.cs
@@ -35,7 +35,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 			yield return new ValidationResult($"The negative of {nameof(ClearCostFactor)} must be less than or equal to ~90% of {nameof(BuildCostFactor)}.", [nameof(ClearCostFactor), nameof(BuildCostFactor)]);
 		}
 
-		if (NumRotations is not 1 or 2 or 4)
+		if (NumRotations is not (1 or 2 or 4))
 		{
 			yield return new ValidationResult($"{nameof(NumRotations)} must be either 1, 2, or 4.", [nameof(NumRotations)]);
 		}
diff --git a/Definitions/ObjectModels/Objects/Vehicle/BodySprite.cs b/Definitions/ObjectModels/Objects/Vehicle/BodySprite.cs
@@ -28,17 +28,17 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 	{
 		if (Flags.HasFlag(BodySpriteFlags.HasSprites))
 		{
-			if (NumFlatRotationFrames is not 8 or 16 or 32 or 64 or 128)
+			if (NumFlatRotationFrames is not (8 or 16 or 32 or 64 or 128))
 			{
 				yield return new ValidationResult($"{nameof(NumFlatRotationFrames)} must be one of the following values: 8, 16, 32, 64, 128.", [nameof(NumFlatRotationFrames)]);
 			}
 
-			if (NumSlopedRotationFrames is not 4 or 8 or 16 or 32)
+			if (NumSlopedRotationFrames is not (4 or 8 or 16 or 32))
 			{
 				yield return new ValidationResult($"{nameof(NumSlopedRotationFrames)} must be one of the following values: 8, 16, 32, 64, 128.", [nameof(NumSlopedRotationFrames)]);
 			}
 
-			if (NumAnimationFrames is not 1 or 2 or 4)
+			if (NumAnimationFrames is not (1 or 2 or 4))
 			{
 				yield return new ValidationResult($"{nameof(NumAnimationFrames)} must be one of the following values: 1, 2, 4.", [nameof(NumAnimationFrames)]);
 			}
@@ -48,7 +48,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 				yield return new ValidationResult($"{nameof(NumCargoLoadFrames)} must be between 1 and 5 inclusive.", [nameof(NumCargoLoadFrames)]);
 			}
 
-			if (NumRollFrames is not 1 or 3)
+			if (NumRollFrames is not (1 or 3))
 			{
 				yield return new ValidationResult($"{nameof(NumRollFrames)} must be one of the following values: 1, 3.", [nameof(NumRollFrames)]);
 			}
diff --git a/Definitions/ObjectModels/Objects/Vehicle/BogieSprite.cs b/Definitions/ObjectModels/Objects/Vehicle/BogieSprite.cs
@@ -20,7 +20,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
 	{
 		if (Flags.HasFlag(BogieSpriteFlags.HasSprites))
 		{
-			if (RollStates is not 1 or 2 or 4)
+			if (RollStates is not (1 or 2 or 4))
 			{
 				yield return new ValidationResult($"{nameof(RollStates)} must be either 1, 2, or 4 when {nameof(Flags)} includes {nameof(BogieSpriteFlags.HasSprites)}.", [nameof(RollStates), nameof(Flags)]);
 			}

Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,11 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex`
`66`	`66`	`yield return new ValidationResult("TotalOfTypeInScenario must be between 1 and 32", [nameof(TotalOfTypeInScenario)]);`
`67`	`67`	`}`
`68`	`68`
`69`		`- if (SellCostFactor >= 0)`
`70`		`- {`
`71`		`- yield return new ValidationResult($"{nameof(SellCostFactor)} must be less than 0 {nameof(SellCostFactor)}", [nameof(SellCostFactor)]);`
`72`		`- }`
	`69`	`+ // it costs money to setll an Industry`
	`70`	`+ //if (SellCostFactor >= 0)`
	`71`	`+ //{`
	`72`	`+ // yield return new ValidationResult($"{nameof(SellCostFactor)} must be less than 0 {nameof(SellCostFactor)}", [nameof(SellCostFactor)]);`
	`73`	`+ //}`
`73`	`74`
`74`	`75`	`if (BuildCostFactor <= 0)`
`75`	`76`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,22 +18,22 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex`
`18`	`18`	`{`
`19`	`19`	`if (SellCostFactor >= 0)`
`20`	`20`	`{`
`21`		`- yield return new ValidationResult($"{nameof(SellCostFactor)} must be less than 0 {nameof(SellCostFactor)}", [nameof(SellCostFactor)]);`
	`21`	`+ yield return new ValidationResult($"{nameof(SellCostFactor)} must be less than 0. {nameof(SellCostFactor)}={SellCostFactor}", [nameof(SellCostFactor)]);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`if (BuildCostFactor <= 0)`
`25`	`25`	`{`
`26`		`- yield return new ValidationResult($"{nameof(BuildCostFactor)} must be greater than 0", [nameof(BuildCostFactor)]);`
	`26`	`+ yield return new ValidationResult($"{nameof(BuildCostFactor)} must be greater than 0. {nameof(BuildCostFactor)}={BuildCostFactor}", [nameof(BuildCostFactor)]);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`if (-SellCostFactor > BuildCostFactor)`
`30`	`30`	`{`
`31`		`- yield return new ValidationResult($"-{nameof(SellCostFactor)} must be less than or equal to {nameof(BuildCostFactor)}.", [nameof(SellCostFactor), nameof(BuildCostFactor)]);`
	`31`	`+ yield return new ValidationResult($"-{nameof(SellCostFactor)} must be less than or equal to {nameof(BuildCostFactor)}. {nameof(BuildCostFactor)}={BuildCostFactor} {nameof(SellCostFactor)}={SellCostFactor}", [nameof(SellCostFactor), nameof(BuildCostFactor)]);`
`32`	`32`	`}`
`33`	`33`
`34`		`- if (ClosingFrames is not 1 or 2 or 4 or 8 or 16 or 32)`
	`34`	`+ if (ClosingFrames is not (1 or 2 or 4 or 8 or 16 or 32))`
`35`	`35`	`{`
`36`		`- yield return new ValidationResult("ClosingFrames must be a power of two between 1 and 32 (inclusive)", [nameof(ClosingFrames)]);`
	`36`	`+ yield return new ValidationResult($"ClosingFrames must be a power of two between 1 and 32 (inclusive). {nameof(ClosingFrames)}={ClosingFrames}", [nameof(ClosingFrames)]);`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex`
`24`	`24`	`yield return new ValidationResult($"{nameof(AnimationSpeed)} must be 0, 1, 3, 7, or 15.", [nameof(AnimationSpeed)]);`
`25`	`25`	`}`
`26`	`26`
`27`		`- if (NumFrames is not 4 or 7 or 10)`
	`27`	`+ if (NumFrames is not (4 or 7 or 10))`
`28`	`28`	`{`
`29`	`29`	`yield return new ValidationResult($"{nameof(NumFrames)} must be 4, 7, or 10.", [nameof(NumFrames)]);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex`
`35`	`35`	`yield return new ValidationResult($"The negative of {nameof(ClearCostFactor)} must be less than or equal to ~90% of {nameof(BuildCostFactor)}.", [nameof(ClearCostFactor), nameof(BuildCostFactor)]);`
`36`	`36`	`}`
`37`	`37`
`38`		`- if (NumRotations is not 1 or 2 or 4)`
	`38`	`+ if (NumRotations is not (1 or 2 or 4))`
`39`	`39`	`{`
`40`	`40`	`yield return new ValidationResult($"{nameof(NumRotations)} must be either 1, 2, or 4.", [nameof(NumRotations)]);`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,17 +28,17 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex`
`28`	`28`	`{`
`29`	`29`	`if (Flags.HasFlag(BodySpriteFlags.HasSprites))`
`30`	`30`	`{`
`31`		`- if (NumFlatRotationFrames is not 8 or 16 or 32 or 64 or 128)`
	`31`	`+ if (NumFlatRotationFrames is not (8 or 16 or 32 or 64 or 128))`
`32`	`32`	`{`
`33`	`33`	`yield return new ValidationResult($"{nameof(NumFlatRotationFrames)} must be one of the following values: 8, 16, 32, 64, 128.", [nameof(NumFlatRotationFrames)]);`
`34`	`34`	`}`
`35`	`35`
`36`		`- if (NumSlopedRotationFrames is not 4 or 8 or 16 or 32)`
	`36`	`+ if (NumSlopedRotationFrames is not (4 or 8 or 16 or 32))`
`37`	`37`	`{`
`38`	`38`	`yield return new ValidationResult($"{nameof(NumSlopedRotationFrames)} must be one of the following values: 8, 16, 32, 64, 128.", [nameof(NumSlopedRotationFrames)]);`
`39`	`39`	`}`
`40`	`40`
`41`		`- if (NumAnimationFrames is not 1 or 2 or 4)`
	`41`	`+ if (NumAnimationFrames is not (1 or 2 or 4))`
`42`	`42`	`{`
`43`	`43`	`yield return new ValidationResult($"{nameof(NumAnimationFrames)} must be one of the following values: 1, 2, 4.", [nameof(NumAnimationFrames)]);`
`44`	`44`	`}`
`@@ -48,7 +48,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex`
`48`	`48`	`yield return new ValidationResult($"{nameof(NumCargoLoadFrames)} must be between 1 and 5 inclusive.", [nameof(NumCargoLoadFrames)]);`
`49`	`49`	`}`
`50`	`50`
`51`		`- if (NumRollFrames is not 1 or 3)`
	`51`	`+ if (NumRollFrames is not (1 or 3))`
`52`	`52`	`{`
`53`	`53`	`yield return new ValidationResult($"{nameof(NumRollFrames)} must be one of the following values: 1, 3.", [nameof(NumRollFrames)]);`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex`
`20`	`20`	`{`
`21`	`21`	`if (Flags.HasFlag(BogieSpriteFlags.HasSprites))`
`22`	`22`	`{`
`23`		`- if (RollStates is not 1 or 2 or 4)`
	`23`	`+ if (RollStates is not (1 or 2 or 4))`
`24`	`24`	`{`
`25`	`25`	`yield return new ValidationResult($"{nameof(RollStates)} must be either 1, 2, or 4 when {nameof(Flags)} includes {nameof(BogieSpriteFlags.HasSprites)}.", [nameof(RollStates), nameof(Flags)]);`
`26`	`26`	`}`