Added a missing value to FoxEntity that is required by Fox Engine.

Author: Atvaark

FoxTool/Fox/FoxClass.cs

@@ -8,7 +8,6 @@ public class FoxClass : IXmlSerializable
     {
         public string Name { get; set; }
         public string Super { get; set; }
-        public string TestUnknown { get; set; }
         public string Version { get; set; }
 
         public XmlSchema GetSchema()
@@ -33,8 +32,7 @@ public void WriteXml(XmlWriter writer)
 
         protected bool Equals(FoxClass other)
         {
-            return string.Equals(Name, other.Name) && string.Equals(Super, other.Super) &&
-                   string.Equals(TestUnknown, other.TestUnknown);
+            return string.Equals(Name, other.Name) && string.Equals(Super, other.Super);
         }
 
         public override bool Equals(object obj)
@@ -51,7 +49,6 @@ public override int GetHashCode()
             {
                 var hashCode = (Name != null ? Name.GetHashCode() : 0);
                 hashCode = (hashCode*397) ^ (Super != null ? Super.GetHashCode() : 0);
-                hashCode = (hashCode*397) ^ (TestUnknown != null ? TestUnknown.GetHashCode() : 0);
                 return hashCode;
             }
         }

FoxTool/Fox/FoxEntity.cs

@@ -25,9 +25,8 @@ public FoxEntity()
 
         public ulong ClassNameHash { get; set; }
         public string ClassName { get; set; }
-        public byte ClassId { get; set; }
+        public short Unknown { get; set; }
         public short Version { get; set; }
-        public byte SuperClassId { get; set; }
         public uint Address { get; set; }
 
         public IEnumerable<FoxProperty> StaticProperties
@@ -48,10 +47,12 @@ public XmlSchema GetSchema()
         public void ReadXml(XmlReader reader)
         {
             ClassName = reader.GetAttribute("class");
+            Version = short.Parse(reader.GetAttribute("classVersion"));
             string addr = reader.GetAttribute("addr");
             Address = addr.StartsWith("0x")
                 ? uint.Parse(addr.Substring(2, addr.Length - 2), NumberStyles.AllowHexSpecifier)
                 : uint.Parse(addr);
+            Unknown = short.Parse(reader.GetAttribute("unknown"));
 
             var isEmptyElement = reader.IsEmptyElement;
             reader.ReadStartElement("entity");
@@ -91,7 +92,11 @@ public void ReadXml(XmlReader reader)
         public void WriteXml(XmlWriter writer)
         {
             writer.WriteAttributeString("class", ClassName);
+            writer.WriteAttributeString("classVersion", Version.ToString());
             writer.WriteAttributeString("addr", String.Format("0x{0:X8}", Address));
+            // TODO: Rename unknown1 attributes
+            writer.WriteAttributeString("unknown", Unknown.ToString());
+
 
             writer.WriteStartElement("staticProperties");
             foreach (var staticProperty in StaticProperties)
@@ -123,8 +128,7 @@ private void Read(Stream input)
         {
             BinaryReader reader = new BinaryReader(input, Encoding.Default, true);
             short headerSize = reader.ReadInt16();
-            ClassId = reader.ReadByte();
-            SuperClassId = reader.ReadByte();
+            Unknown = reader.ReadInt16();
             short padding1 = reader.ReadInt16();
             uint magicNumber1 = reader.ReadUInt32();
             Address = reader.ReadUInt32();
@@ -185,12 +189,12 @@ public void Write(Stream output)
             uint size = (uint) (endPosition - headerPosition);
             output.Position = headerPosition;
             writer.Write(HeaderSize);
-            writer.Write(ClassId);
-            writer.Write(SuperClassId);
+            writer.Write(Unknown);
             writer.WriteZeros(2);
             writer.Write(MagicNumber);
             writer.Write(Address);
-            writer.WriteZeros(14);
+            writer.WriteZeros(12);
+            writer.Write(Version);
             writer.Write(ClassNameHash);
             writer.Write(Convert.ToUInt16(StaticProperties.Count()));
             writer.Write(Convert.ToUInt16(DynamicProperties.Count()));

FoxTool/Fox/FoxFile.cs

@@ -151,8 +151,7 @@ private void GenerateClasses()
             {
                 Name = "Entity",
                 Super = "",
-                Version = "2",
-                TestUnknown = ""
+                Version = "2"
             };
             _classes.Add(entityClass);
 
@@ -169,8 +168,7 @@ private void GenerateClasses()
                 FoxClass foxClass = new FoxClass
                 {
                     Name = entity.ClassName,
-                    Version = entity.Version.ToString(),
-                    TestUnknown = entity.SuperClassId.ToString()
+                    Version = entity.Version.ToString()
                 };
 
                 if (_classes.Contains(foxClass) == false)

FoxTool/Fox/Types/Values/FoxFilePtr.cs

@@ -73,7 +73,7 @@ public XmlSchema GetSchema()
 
         public void WriteXml(XmlWriter writer)
         {
-            if(FileName == null)
+            if (FileName == null)
                 FileNameHash.WriteXml(writer);
             else
                 writer.WriteString(FileName);

FoxTool/Fox/Types/Values/FoxString.cs

@@ -72,7 +72,7 @@ public XmlSchema GetSchema()
 
         public void WriteXml(XmlWriter writer)
         {
-            if(String == null)
+            if (String == null)
                 StringHash.WriteXml(writer);
             else
                 writer.WriteString(String);

FoxTool/Hashing.cs

@@ -8,7 +8,7 @@ internal static ulong HashString(string text)
         {
             if (text == null) throw new ArgumentNullException("text");
             const ulong seed0 = 0x9ae16a3b2f90404f;
-            ulong seed1 = text.Length > 0 ? (uint)((text[0]) << 16) + (uint)text.Length : 0;
+            ulong seed1 = text.Length > 0 ? (uint) ((text[0]) << 16) + (uint) text.Length : 0;
             return CityHash.CityHash.CityHash64WithSeeds(text + "\0", seed0, seed1) & 0xFFFFFFFFFFFF;
         }
     }