more renames

Author: LeftofZen

Dat/Objects/Industry/IndustryObject.cs

@@ -56,7 +56,7 @@ public record IndustryObject(
 		[property: LocoStructOffset(0xED), LocoStructVariableLoad, LocoArrayLength(IndustryObject.MaxWallTypeCount)] List<S5Header> WallTypes, // There can be up to 4 different wall types for an industry
 		[property: LocoStructOffset(0xF1), LocoStructVariableLoad, Browsable(false)] object_id _BuildingWall, // Selection of wall types isn't completely random from the 4 it is biased into 2 groups of 2 (wall and entrance)
 		[property: LocoStructOffset(0xF2), LocoStructVariableLoad, Browsable(false)] object_id _BuildingWallEntrance, // An alternative wall type that looks like a gate placed at random places in building perimeter
-		[property: LocoStructOffset(0xF3)] uint8_t var_F3
+		[property: LocoStructOffset(0xF3)] uint8_t MonthlyClosureChance
 		) : ILocoStruct, ILocoStructVariableData
 	{
 		public const int AnimationSequencesCount = 4;

Gui/ViewModels/DatTypes/Objects/IndustryViewModel.cs

@@ -19,6 +19,7 @@ public class IndustryViewModel : LocoObjectViewModel<IndustryObject>
 		[Reactive, Category("Production")] public BindingList<IndustryObjectProductionRateRange> InitialProductionRate { get; set; }
 		[Reactive, Category("Production"), Length(0, IndustryObject.MaxProducedCargoType)] public BindingList<S5HeaderViewModel> ProducedCargo { get; set; }
 		[Reactive, Category("Production"), Length(0, IndustryObject.MaxProducedCargoType)] public BindingList<S5HeaderViewModel> RequiredCargo { get; set; }
+		[Reactive, Category("Production")] public uint8_t MonthlyClosureChance { get; set; }
 		[Reactive, Category("Cost")] public uint8_t CostIndex { get; set; }
 		[Reactive, Category("Cost")] public int16_t BuildCostFactor { get; set; }
 		[Reactive, Category("Cost")] public int16_t SellCostFactor { get; set; }
@@ -37,11 +38,10 @@ public class IndustryViewModel : LocoObjectViewModel<IndustryObject>
 		[Reactive, Category("Building")] public S5HeaderViewModel? BuildingWallEntrance { get; set; }
 		[Reactive, Category("<unknown>")] public BindingList<IndustryObjectUnk38> var_38 { get; set; }
 		[Reactive, Category("<unknown>")] public uint8_t var_E8 { get; set; }
-		[Reactive, Category("<unknown>")] public uint8_t var_E9 { get; set; }
-		[Reactive, Category("<unknown>")] public uint8_t var_EA { get; set; }
-		[Reactive, Category("<unknown>")] public uint8_t var_EB { get; set; }
-		[Reactive, Category("<unknown>")] public uint8_t var_EC { get; set; }
-		[Reactive, Category("<unknown>")] public uint8_t var_F3 { get; set; }
+		[Reactive, Category("Farm")] public uint8_t FarmTileNumImageAngles { get; set; }
+		[Reactive, Category("Farm")] public uint8_t FarmGrowthStageWithNoProduction { get; set; }
+		[Reactive, Category("Farm")] public uint8_t FarmIdealSize { get; set; }
+		[Reactive, Category("Farm")] public uint8_t FarmNumStagesOfGrowth { get; set; }
 
 		public IndustryViewModel(IndustryObject io)
 		{
@@ -72,11 +72,11 @@ public IndustryViewModel(IndustryObject io)
 			MapColour = io.MapColour;
 			Flags = io.Flags;
 			var_E8 = io.var_E8;
-			var_E9 = io.FarmTileNumImageAngles;
-			var_EA = io.FarmGrowthStageWithNoProduction;
-			var_EB = io.FarmIdealSize;
-			var_EC = io.FarmNumStagesOfGrowth;
-			var_F3 = io.var_E8;
+			FarmTileNumImageAngles = io.FarmTileNumImageAngles;
+			FarmGrowthStageWithNoProduction = io.FarmGrowthStageWithNoProduction;
+			FarmIdealSize = io.FarmIdealSize;
+			FarmNumStagesOfGrowth = io.FarmNumStagesOfGrowth;
+			MonthlyClosureChance = io.MonthlyClosureChance;
 		}
 
 		// validation:
@@ -106,11 +106,11 @@ public override IndustryObject GetAsStruct(IndustryObject io)
 				MapColour = MapColour,
 				Flags = Flags,
 				var_E8 = var_E8,
-				FarmTileNumImageAngles = var_E9,
-				FarmGrowthStageWithNoProduction = var_EA,
-				FarmIdealSize = var_EB,
-				FarmNumStagesOfGrowth = var_EC,
-				var_F3 = var_E8,
+				FarmTileNumImageAngles = FarmTileNumImageAngles,
+				FarmGrowthStageWithNoProduction = FarmGrowthStageWithNoProduction,
+				FarmIdealSize = FarmIdealSize,
+				FarmNumStagesOfGrowth = FarmNumStagesOfGrowth,
+				MonthlyClosureChance = MonthlyClosureChance,
 			};
 	}
 }

Gui/ViewModels/DatTypes/Objects/RegionViewModel.cs

@@ -10,8 +10,8 @@ public class RegionViewModel : LocoObjectViewModel<RegionObject>
 		[Reactive] public BindingList<S5HeaderViewModel> RequiredObjects { get; set; }
 		[Reactive] public BindingList<S5HeaderViewModel> DependentObjects { get; set; }
 
-		[Reactive] public BindingList<uint8_t> var_06 { get; set; }
-		[Reactive] public BindingList<uint8_t> var_0D { get; set; }
+		[Reactive, Category("<unknown>")] public BindingList<uint8_t> var_06 { get; set; }
+		[Reactive, Category("<unknown>")] public BindingList<uint8_t> var_0D { get; set; }
 
 		public RegionViewModel(RegionObject ro)
 		{

Tests/LoadSaveTests.cs

@@ -413,7 +413,7 @@ void assertFunc(ILocoObject obj, IndustryObject struc) => Assert.Multiple(() =>
 				Assert.That(struc.FarmGrowthStageWithNoProduction, Is.EqualTo(0), nameof(struc.FarmGrowthStageWithNoProduction));
 				Assert.That(struc.FarmIdealSize, Is.EqualTo(0), nameof(struc.FarmIdealSize));
 				Assert.That(struc.FarmNumStagesOfGrowth, Is.EqualTo(0), nameof(struc.FarmNumStagesOfGrowth));
-				Assert.That(struc.var_F3, Is.EqualTo(1), nameof(struc.var_F3));
+				Assert.That(struc.MonthlyClosureChance, Is.EqualTo(1), nameof(struc.MonthlyClosureChance));
 				// Walls
 				Assert.That(struc.WallTypes, Has.Count.EqualTo(0));
 				// WallTypes
@@ -498,7 +498,7 @@ void assertFunc(ILocoObject obj, IndustryObject struc) => Assert.Multiple(() =>
 				Assert.That(struc.FarmGrowthStageWithNoProduction, Is.EqualTo(0), nameof(struc.FarmGrowthStageWithNoProduction));
 				Assert.That(struc.FarmIdealSize, Is.EqualTo(0), nameof(struc.FarmIdealSize));
 				Assert.That(struc.FarmNumStagesOfGrowth, Is.EqualTo(0), nameof(struc.FarmNumStagesOfGrowth));
-				Assert.That(struc.var_F3, Is.EqualTo(1), nameof(struc.var_F3));
+				Assert.That(struc.MonthlyClosureChance, Is.EqualTo(1), nameof(struc.MonthlyClosureChance));
 				// Walls
 				Assert.That(struc.WallTypes, Has.Count.EqualTo(0));
 				// WallTypes