From 0e94781129f366c2d8166d91f7f77024a64852fa Mon Sep 17 00:00:00 2001 From: Septharoth Date: Sun, 13 Mar 2022 13:45:48 -0400 Subject: [PATCH] Update pub record tests --- EOLib.IO.Test/Pub/EIFRecordTest.cs | 7 ++++--- EOLib.IO.Test/Pub/ENFRecordTest.cs | 14 +++++++++----- EOLib.IO.Test/Pub/ESFRecordTest.cs | 25 +++++++++++++++++++------ 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/EOLib.IO.Test/Pub/EIFRecordTest.cs b/EOLib.IO.Test/Pub/EIFRecordTest.cs index 46e6daf80..3c51d803b 100644 --- a/EOLib.IO.Test/Pub/EIFRecordTest.cs +++ b/EOLib.IO.Test/Pub/EIFRecordTest.cs @@ -277,7 +277,7 @@ private static byte[] GetExpectedBytesWithoutName(EIFRecord rec, INumberEncoderS ret.AddRange(nes.EncodeNumber(rec.Accuracy, 2)); ret.AddRange(nes.EncodeNumber(rec.Evade, 2)); ret.AddRange(nes.EncodeNumber(rec.Armor, 2)); - ret.AddRange(Enumerable.Repeat((byte)254, 1)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte19, 1)); ret.AddRange(nes.EncodeNumber(rec.Str, 1)); ret.AddRange(nes.EncodeNumber(rec.Int, 1)); ret.AddRange(nes.EncodeNumber(rec.Wis, 1)); @@ -301,9 +301,10 @@ private static byte[] GetExpectedBytesWithoutName(EIFRecord rec, INumberEncoderS ret.AddRange(nes.EncodeNumber(rec.AgiReq, 2)); ret.AddRange(nes.EncodeNumber(rec.ConReq, 2)); ret.AddRange(nes.EncodeNumber(rec.ChaReq, 2)); - ret.AddRange(Enumerable.Repeat((byte)254, 2)); + ret.AddRange(nes.EncodeNumber(rec.Element, 1)); + ret.AddRange(nes.EncodeNumber(rec.ElementPower, 1)); ret.AddRange(nes.EncodeNumber(rec.Weight, 1)); - ret.AddRange(Enumerable.Repeat((byte)254, 1)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte56, 1)); ret.AddRange(nes.EncodeNumber((byte)rec.Size, 1)); return ret.ToArray(); diff --git a/EOLib.IO.Test/Pub/ENFRecordTest.cs b/EOLib.IO.Test/Pub/ENFRecordTest.cs index 98b83e321..29fdb80f7 100644 --- a/EOLib.IO.Test/Pub/ENFRecordTest.cs +++ b/EOLib.IO.Test/Pub/ENFRecordTest.cs @@ -176,21 +176,25 @@ private static byte[] GetExpectedBytesWithoutName(ENFRecord rec, INumberEncoderS var ret = new List(); ret.AddRange(nes.EncodeNumber(rec.Graphic, 2)); - ret.AddRange(Enumerable.Repeat((byte)254, 1)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte2, 1)); ret.AddRange(nes.EncodeNumber(rec.Boss, 2)); ret.AddRange(nes.EncodeNumber(rec.Child, 2)); ret.AddRange(nes.EncodeNumber((short)rec.Type, 2)); ret.AddRange(nes.EncodeNumber(rec.VendorID, 2)); ret.AddRange(nes.EncodeNumber(rec.HP, 3)); - ret.AddRange(Enumerable.Repeat((byte)254, 2)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort14, 2)); ret.AddRange(nes.EncodeNumber(rec.MinDam, 2)); ret.AddRange(nes.EncodeNumber(rec.MaxDam, 2)); ret.AddRange(nes.EncodeNumber(rec.Accuracy, 2)); ret.AddRange(nes.EncodeNumber(rec.Evade, 2)); ret.AddRange(nes.EncodeNumber(rec.Armor, 2)); - ret.AddRange(Enumerable.Repeat((byte)254, 10)); - ret.AddRange(nes.EncodeNumber(rec.Exp, 2)); - ret.AddRange(Enumerable.Repeat((byte)254, 1)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte26, 1)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort27, 2)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort29, 2)); + ret.AddRange(nes.EncodeNumber(rec.ElementWeak, 2)); + ret.AddRange(nes.EncodeNumber(rec.ElementWeakPower, 2)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte35, 1)); + ret.AddRange(nes.EncodeNumber(rec.Exp, 3)); return ret.ToArray(); } diff --git a/EOLib.IO.Test/Pub/ESFRecordTest.cs b/EOLib.IO.Test/Pub/ESFRecordTest.cs index 47fbb998f..31206d294 100644 --- a/EOLib.IO.Test/Pub/ESFRecordTest.cs +++ b/EOLib.IO.Test/Pub/ESFRecordTest.cs @@ -183,18 +183,31 @@ private static byte[] GetExpectedBytesWithoutNames(ESFRecord rec, INumberEncoder ret.AddRange(nes.EncodeNumber(rec.TP, 2)); ret.AddRange(nes.EncodeNumber(rec.SP, 2)); ret.AddRange(nes.EncodeNumber(rec.CastTime, 1)); - ret.AddRange(Enumerable.Repeat((byte)254, 2)); - ret.AddRange(nes.EncodeNumber((byte)rec.Type, 1)); - ret.AddRange(Enumerable.Repeat((byte)254, 5)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte9, 1)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte10, 1)); + ret.AddRange(nes.EncodeNumber((int)rec.Type, 3)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte14, 1)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort15, 2)); ret.AddRange(nes.EncodeNumber((byte)rec.TargetRestrict, 1)); ret.AddRange(nes.EncodeNumber((byte)rec.Target, 1)); - ret.AddRange(Enumerable.Repeat((byte)254, 4)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte19, 1)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte20, 1)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort21, 2)); ret.AddRange(nes.EncodeNumber(rec.MinDam, 2)); ret.AddRange(nes.EncodeNumber(rec.MaxDam, 2)); ret.AddRange(nes.EncodeNumber(rec.Accuracy, 2)); - ret.AddRange(Enumerable.Repeat((byte)254, 5)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort29, 2)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort31, 2)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte33, 1)); ret.AddRange(nes.EncodeNumber(rec.HP, 2)); - ret.AddRange(Enumerable.Repeat((byte)254, 15)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort36, 2)); + ret.AddRange(nes.EncodeNumber(rec.UnkByte38, 1)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort39, 2)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort41, 2)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort43, 2)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort45, 2)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort47, 2)); + ret.AddRange(nes.EncodeNumber(rec.UnkShort49, 2)); return ret.ToArray(); }