Skip to content

Commit 31ebcad

Browse files
committed
update land and water object costFactor variables
1 parent 0705b68 commit 31ebcad

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

Dat/Objects/LandObject.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ public record LandObject(
2828
[property: LocoStructOffset(0x05)] LandObjectFlags Flags,
2929
[property: LocoStructOffset(0x06), Browsable(false)] object_id CliffEdgeHeader1,
3030
[property: LocoStructOffset(0x07), Browsable(false), LocoPropertyMaybeUnused] object_id CliffEdgeHeader2,
31-
[property: LocoStructOffset(0x08)] int8_t CostFactor,
32-
[property: LocoStructOffset(0x09)] uint8_t var_09,
31+
[property: LocoStructOffset(0x08)] int16_t CostFactor,
3332
[property: LocoStructOffset(0x0A), Browsable(false)] image_id Image,
3433
[property: LocoStructOffset(0x0E), Browsable(false)] image_id var_0E,
3534
[property: LocoStructOffset(0x12), Browsable(false)] image_id CliffEdgeImage,

Dat/Objects/WaterObject.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ public record WaterObject(
1414
[property: LocoStructOffset(0x00), LocoString, Browsable(false)] string_id Name,
1515
[property: LocoStructOffset(0x02)] uint8_t CostIndex,
1616
[property: LocoStructOffset(0x03), LocoPropertyMaybeUnused] uint8_t var_03,
17-
[property: LocoStructOffset(0x04)] int8_t CostFactor,
18-
[property: LocoStructOffset(0x05), LocoPropertyMaybeUnused] uint8_t var_05,
17+
[property: LocoStructOffset(0x04)] int16_t CostFactor,
1918
[property: LocoStructOffset(0x06), Browsable(false)] image_id Image,
2019
[property: LocoStructOffset(0x0A), Browsable(false)] image_id MapPixelImage
2120
) : ILocoStruct, IImageTableNameProvider

Tests/LoadSaveTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,6 @@ void assertFunc(ILocoObject obj, LandObject struc) => Assert.Multiple(() =>
554554
Assert.That(struc.CliffEdgeHeader1, Is.EqualTo(0), nameof(struc.CliffEdgeHeader1));
555555
Assert.That(struc.CliffEdgeHeader2, Is.EqualTo(0), nameof(struc.CliffEdgeHeader2));
556556
Assert.That(struc.CostFactor, Is.EqualTo(20), nameof(struc.CostFactor));
557-
Assert.That(struc.var_09, Is.EqualTo(0), nameof(struc.var_09));
558557
Assert.That(struc.var_0E, Is.EqualTo(0), nameof(struc.var_0E));
559558
Assert.That(struc.CliffEdgeImage, Is.EqualTo(0), nameof(struc.CliffEdgeImage));
560559
Assert.That(struc.MapPixelImage, Is.EqualTo(0), nameof(struc.MapPixelImage));
@@ -1078,7 +1077,6 @@ void assertFunc(ILocoObject obj, WaterObject struc) => Assert.Multiple(() =>
10781077
Assert.That(struc.CostIndex, Is.EqualTo(2), nameof(struc.CostIndex));
10791078
Assert.That(struc.var_03, Is.EqualTo(0), nameof(struc.var_03));
10801079
Assert.That(struc.CostFactor, Is.EqualTo(51), nameof(struc.CostFactor));
1081-
Assert.That(struc.var_05, Is.EqualTo(0), nameof(struc.var_05));
10821080
//Assert.That(struc.var_0A, Is.EqualTo(0), nameof(struc.var_0A));
10831081

10841082
Assert.That(obj.G1Elements, Has.Count.EqualTo(76));

0 commit comments

Comments
 (0)