Skip to content

Commit

Permalink
Rename Unk values in pub records
Browse files Browse the repository at this point in the history
  • Loading branch information
@Septharoth
Septharoth committed Mar 13, 2022
1 parent fc83caa commit 2c258e8
Show file tree
Hide file tree
Showing 4 changed files with 125 additions and 145 deletions.
34 changes: 13 additions & 21 deletions EOLib.IO/Pub/EIFRecord.cs
View file
Expand Up @@ -30,7 +30,7 @@ public class EIFRecord : IPubRecord
public short Evade { get; set; }
public short Armor { get; set; }

public byte UnkB { get; set; }
public byte UnkByte19 { get; set; }

public byte Str { get; set; }
public byte Int { get; set; }
Expand Down Expand Up @@ -72,12 +72,12 @@ public class EIFRecord : IPubRecord
public short ConReq { get; set; }
public short ChaReq { get; set; }

public byte UnkD { get; set; } // Element (?)
public byte UnkE { get; set; } // Element Power (?)
public byte Element { get; set; }
public byte ElementPower { get; set; }

public byte Weight { get; set; }

public byte UnkF { get; set; }
public byte UnkByte56 { get; set; }

public ItemSize Size { get; set; }

Expand Down Expand Up @@ -121,7 +121,7 @@ public byte[] SerializeToByteArray(INumberEncoderService numberEncoderService)
mem.Write(numberEncoderService.EncodeNumber(Evade, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(Armor, 2), 0, 2);

mem.WriteByte(numberEncoderService.EncodeNumber(UnkB, 1)[0]);
mem.WriteByte(numberEncoderService.EncodeNumber(UnkByte19, 1)[0]);

mem.WriteByte(numberEncoderService.EncodeNumber(Str, 1)[0]);
mem.WriteByte(numberEncoderService.EncodeNumber(Int, 1)[0]);
Expand Down Expand Up @@ -151,11 +151,11 @@ public byte[] SerializeToByteArray(INumberEncoderService numberEncoderService)
mem.Write(numberEncoderService.EncodeNumber(ConReq, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(ChaReq, 2), 0, 2);

mem.WriteByte(numberEncoderService.EncodeNumber(UnkD, 1)[0]);
mem.WriteByte(numberEncoderService.EncodeNumber(UnkE, 1)[0]);
mem.WriteByte(numberEncoderService.EncodeNumber(Element, 1)[0]);
mem.WriteByte(numberEncoderService.EncodeNumber(ElementPower, 1)[0]);

mem.WriteByte(numberEncoderService.EncodeNumber(Weight, 1)[0]);
mem.WriteByte(numberEncoderService.EncodeNumber(UnkF, 1)[0]);
mem.WriteByte(numberEncoderService.EncodeNumber(UnkByte56, 1)[0]);
mem.WriteByte(numberEncoderService.EncodeNumber((byte)Size, 1)[0]);
}

Expand All @@ -167,14 +167,6 @@ public void DeserializeFromByteArray(byte[] recordBytes, INumberEncoderService n
if (recordBytes.Length != DATA_SIZE)
throw new ArgumentOutOfRangeException(nameof(recordBytes), "Data is not properly sized for correct deserialization");


Console.Write(this.Name + " [");
for (int i = 0; i < recordBytes.Length; i++)
{
Console.Write(recordBytes[i] + "[pos:" + i + "], ");
}
Console.Write("]\n");

Graphic = (short)numberEncoderService.DecodeNumber(recordBytes[0], recordBytes[1]);
Type = (ItemType)numberEncoderService.DecodeNumber(recordBytes[2]);
SubType = (ItemSubType)numberEncoderService.DecodeNumber(recordBytes[3]);
Expand All @@ -188,7 +180,7 @@ public void DeserializeFromByteArray(byte[] recordBytes, INumberEncoderService n
Evade = (short)numberEncoderService.DecodeNumber(recordBytes[15], recordBytes[16]);
Armor = (short)numberEncoderService.DecodeNumber(recordBytes[17], recordBytes[18]);

UnkB = (byte)numberEncoderService.DecodeNumber(recordBytes[19]);
UnkByte19 = (byte)numberEncoderService.DecodeNumber(recordBytes[19]);

Str = (byte)numberEncoderService.DecodeNumber(recordBytes[20]);
Int = (byte)numberEncoderService.DecodeNumber(recordBytes[21]);
Expand Down Expand Up @@ -218,15 +210,15 @@ public void DeserializeFromByteArray(byte[] recordBytes, INumberEncoderService n
ConReq = (short)numberEncoderService.DecodeNumber(recordBytes[49], recordBytes[50]);
ChaReq = (short)numberEncoderService.DecodeNumber(recordBytes[51], recordBytes[52]);

UnkD = (byte)numberEncoderService.DecodeNumber(recordBytes[53]);
UnkE = (byte)numberEncoderService.DecodeNumber(recordBytes[54]);
Element = (byte)numberEncoderService.DecodeNumber(recordBytes[53]);
ElementPower = (byte)numberEncoderService.DecodeNumber(recordBytes[54]);

Weight = (byte)numberEncoderService.DecodeNumber(recordBytes[55]);
UnkF = (byte)numberEncoderService.DecodeNumber(recordBytes[56]);
UnkByte56 = (byte)numberEncoderService.DecodeNumber(recordBytes[56]);
Size = (ItemSize)numberEncoderService.DecodeNumber(recordBytes[57]);

if (ID == 365 && Name == "Gun")
SubType = ItemSubType.Ranged;
}
}
}
}
59 changes: 27 additions & 32 deletions EOLib.IO/Pub/ENFRecord.cs
View file
Expand Up @@ -19,13 +19,13 @@ public class ENFRecord : IPubRecord

public int Graphic { get; set; }

public byte UnkA { get; set; }
public byte UnkByte2 { get; set; }

public short Boss { get; set; }
public short Child { get; set; }
public NPCType Type { get; set; }

public short UnkB { get; set; }
public short UnkShort14 { get; set; }

public short VendorID { get; set; }

Expand All @@ -38,12 +38,14 @@ public class ENFRecord : IPubRecord
public short Evade { get; set; }
public short Armor { get; set; }

public byte UnkC { get; set; }
public short UnkD { get; set; }
public short UnkE { get; set; }
public short UnkF { get; set; }
public short UnkG { get; set; }
public byte UnkH { get; set; }
public byte UnkByte26 { get; set; }
public short UnkShort27 { get; set; }
public short UnkShort29 { get; set; }

public short ElementWeak { get; set; }
public short ElementWeakPower { get; set; }

public byte UnkByte35 { get; set; }

public int Exp { get; set; }

Expand Down Expand Up @@ -76,28 +78,28 @@ public byte[] SerializeToByteArray(INumberEncoderService numberEncoderService)

mem.Write(numberEncoderService.EncodeNumber(Graphic, 2), 0, 2);

mem.WriteByte(numberEncoderService.EncodeNumber(UnkA, 1)[0]);
mem.WriteByte(numberEncoderService.EncodeNumber(UnkByte2, 1)[0]);

mem.Write(numberEncoderService.EncodeNumber(Boss, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(Child, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber((short)Type, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(VendorID, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(HP, 3), 0, 3);

mem.Write(numberEncoderService.EncodeNumber(UnkB, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(UnkShort14, 2), 0, 2);

mem.Write(numberEncoderService.EncodeNumber(MinDam, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(MaxDam, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(Accuracy, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(Evade, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(Armor, 2), 0, 2);

mem.WriteByte(numberEncoderService.EncodeNumber(UnkC, 1)[0]);
mem.Write(numberEncoderService.EncodeNumber(UnkD, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(UnkE, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(UnkF, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(UnkG, 2), 0, 2);
mem.WriteByte(numberEncoderService.EncodeNumber(UnkH, 1)[0]);
mem.WriteByte(numberEncoderService.EncodeNumber(UnkByte26, 1)[0]);
mem.Write(numberEncoderService.EncodeNumber(UnkShort27, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(UnkShort29, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(ElementWeak, 2), 0, 2);
mem.Write(numberEncoderService.EncodeNumber(ElementWeakPower, 2), 0, 2);
mem.WriteByte(numberEncoderService.EncodeNumber(UnkByte35, 1)[0]);

mem.Write(numberEncoderService.EncodeNumber(Exp, 3), 0, 3);
}
Expand All @@ -110,24 +112,17 @@ public void DeserializeFromByteArray(byte[] recordBytes, INumberEncoderService n
if (recordBytes.Length != DATA_SIZE)
throw new ArgumentOutOfRangeException(nameof(recordBytes), "Data is not properly sized for correct deserialization");

Console.Write(this.Name + " [");
for (int i = 0; i < recordBytes.Length; i++)
{
Console.Write(recordBytes[i] + "[pos:" + i + "], ");
}
Console.Write("]\n");

Graphic = numberEncoderService.DecodeNumber(recordBytes[0], recordBytes[1]);

UnkA = (byte)numberEncoderService.DecodeNumber(recordBytes[2]);
UnkByte2 = (byte)numberEncoderService.DecodeNumber(recordBytes[2]);

Boss = (short)numberEncoderService.DecodeNumber(recordBytes[3], recordBytes[4]);
Child = (short)numberEncoderService.DecodeNumber(recordBytes[5], recordBytes[6]);
Type = (NPCType)numberEncoderService.DecodeNumber(recordBytes[7], recordBytes[8]);
VendorID = (short)numberEncoderService.DecodeNumber(recordBytes[9], recordBytes[10]);
HP = numberEncoderService.DecodeNumber(recordBytes[11], recordBytes[12], recordBytes[13]);

UnkB = (short)numberEncoderService.DecodeNumber(recordBytes[14], recordBytes[15]);
UnkShort14 = (short)numberEncoderService.DecodeNumber(recordBytes[14], recordBytes[15]);

MinDam = (short)numberEncoderService.DecodeNumber(recordBytes[16], recordBytes[17]);
MaxDam = (short)numberEncoderService.DecodeNumber(recordBytes[18], recordBytes[19]);
Expand All @@ -136,14 +131,14 @@ public void DeserializeFromByteArray(byte[] recordBytes, INumberEncoderService n
Evade = (short)numberEncoderService.DecodeNumber(recordBytes[22], recordBytes[23]);
Armor = (short)numberEncoderService.DecodeNumber(recordBytes[24], recordBytes[25]);

UnkC = (byte)numberEncoderService.DecodeNumber(recordBytes[26]);
UnkD = (short)numberEncoderService.DecodeNumber(recordBytes[27], recordBytes[28]);
UnkE = (short)numberEncoderService.DecodeNumber(recordBytes[29], recordBytes[30]);
UnkF = (short)numberEncoderService.DecodeNumber(recordBytes[31], recordBytes[32]);
UnkG = (short)numberEncoderService.DecodeNumber(recordBytes[33], recordBytes[34]);
UnkH = (byte)numberEncoderService.DecodeNumber(recordBytes[35]);
UnkByte26 = (byte)numberEncoderService.DecodeNumber(recordBytes[26]);
UnkShort27 = (short)numberEncoderService.DecodeNumber(recordBytes[27], recordBytes[28]);
UnkShort29 = (short)numberEncoderService.DecodeNumber(recordBytes[29], recordBytes[30]);
ElementWeak = (short)numberEncoderService.DecodeNumber(recordBytes[31], recordBytes[32]);
ElementWeakPower = (short)numberEncoderService.DecodeNumber(recordBytes[33], recordBytes[34]);
UnkByte35 = (byte)numberEncoderService.DecodeNumber(recordBytes[35]);

Exp = numberEncoderService.DecodeNumber(recordBytes[36], recordBytes[37], recordBytes[38]);
}
}
}
}

0 comments on commit 2c258e8

Please sign in to comment.