Skip to content

Commit 797f2e7

Browse files
committed
rename vehicle colourtype to specialcolourschemeindex
1 parent 31ebcad commit 797f2e7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Dat/Objects/Vehicle/VehicleObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public record VehicleObject(
2121
[property: LocoStructOffset(0x0A)] uint8_t Reliability,
2222
[property: LocoStructOffset(0x0B)] uint8_t RunCostIndex,
2323
[property: LocoStructOffset(0x0C)] int16_t RunCostFactor,
24-
[property: LocoStructOffset(0x0E)] uint8_t ColourType,
24+
[property: LocoStructOffset(0x0E)] uint8_t SpecialColourSchemeIndex, // this is an instance property and doesn't need to be saved in the definition as it can be calculated from other properties
2525
[property: LocoStructOffset(0x0F)] uint8_t NumCompatibleVehicles,
2626
[property: LocoStructOffset(0x10), LocoArrayLength(8), LocoStructVariableLoad] List<S5Header> CompatibleVehicles,
2727
[property: LocoStructOffset(0x20), LocoArrayLength(4), LocoStructVariableLoad] List<S5Header> RequiredTrackExtras,

Gui/ViewModels/DatTypes/Objects/VehicleViewModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class VehicleViewModel : LocoObjectViewModel<VehicleObject>
3030
[Reactive, Category("Cost"), Range(0, int16_t.MaxValue)] public int16_t RunCostFactor { get; set; }
3131
[Reactive, Category("<unknown>")] public uint8_t var_04 { get; set; }
3232
[Reactive, Category("<unknown>")] public uint8_t var_113 { get; set; }
33-
[Reactive, Category("Sprites")] public uint8_t ColourType { get; set; }
33+
[Reactive, Category("Sprites")] public uint8_t SpecialColourSchemeIndex { get; set; } // called "ColourType" in the loco codebase
3434
[Reactive, Category("Sprites"), Editable(false)] public BindingList<VehicleObjectCar> CarComponents { get; set; }
3535
[Reactive, Category("Sprites"), Editable(false)] public BindingList<BodySprite> BodySprites { get; set; }
3636
[Reactive, Category("Sprites"), Editable(false)] public BindingList<BogieSprite> BogieSprites { get; set; }
@@ -62,7 +62,7 @@ public VehicleViewModel(VehicleObject vo)
6262
Reliability = vo.Reliability;
6363
RunCostIndex = vo.RunCostIndex;
6464
RunCostFactor = vo.RunCostFactor;
65-
ColourType = vo.ColourType;
65+
SpecialColourSchemeIndex = vo.SpecialColourSchemeIndex;
6666
CompatibleVehicles = new(vo.CompatibleVehicles.ConvertAll(x => new S5HeaderViewModel(x)));
6767
RequiredTrackExtras = new(vo.RequiredTrackExtras.ConvertAll(x => new S5HeaderViewModel(x)));
6868
CarComponents = new(vo.CarComponents);
@@ -108,7 +108,7 @@ public override VehicleObject GetAsStruct(VehicleObject vo)
108108
Reliability = Reliability,
109109
RunCostIndex = RunCostIndex,
110110
RunCostFactor = RunCostFactor,
111-
ColourType = ColourType,
111+
SpecialColourSchemeIndex = SpecialColourSchemeIndex,
112112
Power = Power,
113113
Speed = Speed,
114114
RackSpeed = RackSpeed,

Tests/LoadSaveTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ void assertFunc(ILocoObject obj, VehicleObject struc) => Assert.Multiple(() =>
10061006
Assert.That(struc.Reliability, Is.EqualTo(88), nameof(struc.Reliability));
10071007
Assert.That(struc.RunCostIndex, Is.EqualTo(4), nameof(struc.RunCostIndex));
10081008
Assert.That(struc.RunCostFactor, Is.EqualTo(55), nameof(struc.RunCostFactor));
1009-
Assert.That(struc.ColourType, Is.EqualTo(9), nameof(struc.ColourType));
1009+
Assert.That(struc.SpecialColourSchemeIndex, Is.EqualTo(9), nameof(struc.SpecialColourSchemeIndex));
10101010
Assert.That(struc.NumCompatibleVehicles, Is.EqualTo(0), nameof(struc.NumCompatibleVehicles));
10111011
//CollectionAssert.AreEqual(Enumerable.Repeat(0, 8).ToArray(), struc.CompatibleVehicles, nameof(struc.CompatibleVehicles));
10121012
//CollectionAssert.AreEqual(Enumerable.Repeat(0, 4).ToArray(), struc.RequiredTrackExtras, nameof(struc.RequiredTrackExtras));

0 commit comments

Comments
 (0)