Finish 1.9.0

Author: EliotVU

CHANGELOG.md

@@ -1,5 +1,15 @@
 #
 
+## [1.9.0](https://github.com/EliotVU/Unreal-Library/releases/tag/1.9.0)
+
+* ad530643 Support for Tom Clancy's Rainbow Six: Vegas
+* ad530643 Support for Tom Clancy's Rainbow Six: Vegas 2
+* 2979a15b Support for early UE3 packages including:
+  * RoboHordes
+* e1879b89 Support for deserialization and decompilation for Gigantic's UJsonNodeRoot and UMoJsonObject #102
+* Fixed minor issues with early UE3 games affecting:
+  * Tom Clancy's EndWar
+
 ## [1.8.1](https://github.com/EliotVU/Unreal-Library/releases/tag/1.8.1)
 
 * Fixed and improved support for Template/UComponent objects (UE3)

src/Branch/PackageObjectLegacyVersion.cs

@@ -57,7 +57,10 @@ public enum PackageObjectLegacyVersion
         AddedCppTextToUStruct = 120,
         FontPagesDisplaced = 122,
 
-        // FIXME: Version
+        // FIXME: Version 138? Cheating with 160 to avoid issues with DNF and Spellborn
+        AddedFuncMapToUState = 160,
+
+        // FIXME: Version 138? Cheating with 160 to avoid issues with DNF and Spellborn
         MovedFriendlyNameToUFunction = 160,
 
         // The estimated version changes that came after the latest known UE2 build.
@@ -73,9 +76,6 @@ public enum PackageObjectLegacyVersion
         /// </summary>
         IsLocalAddedToDelegateFunctionToken = 181,
 
-        // FIXME: Version, added somewhere between 186 ... 230
-        AddedStateStackToUStateFrame = 187,
-
         // FIXME: Version 128-178
         AddedDelegateSourceToUDelegateProperty = 185,
 
@@ -85,16 +85,31 @@ public enum PackageObjectLegacyVersion
         // FIXME: Version
         RangeConstTokenDeprecated = UE3,
 
-        // FIXME: Version
+        // FIXME: Version 118?
         FastSerializeStructs = UE3,
 
         // FIXME: Version
         EnumTagNameAddedToBytePropertyTag = UE3,
 
+        // FIXME: Version
+        DisplacedHideCategories = UE3,
+
+        /// <summary>
+        /// FIXME: Version
+        /// No version check in RoboHordes (200)
+        /// 
+        /// Deprecated with <seealso cref="ComponentMapDeprecated"/>
+        /// </summary>
+        AddedComponentMapToExports = UE3,
+
+        // Added somewhere between 186 ... 230
+        // 189 according to RoboHordes
+        AddedStateStackToUStateFrame = 189,
+
         ObjectFlagsSizeExpandedTo64Bits = 195,
 
-        // FIXME: Version, def not <= 178, found in GoW but no version check, so this approximation should do :)
-        TemplateDataAddedToUComponent = 200,
+        // FIXME: Version, def not <= 178, not found in RoboHordes (198,200), but found in GoW without a version check, so this approximation should do :)
+        TemplateDataAddedToUComponent = 201,
 
         // 208 according to EndWar
         PackageImportsDeprecated = 208,
@@ -105,22 +120,29 @@ public enum PackageObjectLegacyVersion
         // 219 according to EndWar
         DisplacedScriptPropertiesWithClassDefaultObject = 219,
 
-        // FIXME: Version
-        AddedFuncMapToUState = 220,
+        ArchetypeAddedToExports = 220,
 
         /// <summary>
-        ///     And ComponentMap
+        /// FIXME: Version
+        /// No version check in all of RoboHordes (200), EndWar (223), and R6Vegas (241)
         /// </summary>
-        ArchetypeAddedToExports = 220,
-
-        PropertyFlagsSizeExpandedTo64Bits = 220,
+        PropertyFlagsSizeExpandedTo64Bits = UE3,
 
         // 222 according to EndWar
         AddedInterfacesFeature = 222,
 
+        // 223 according to EndWar
+        RefactoredPropertyTags = 223,
+
         // 227 according to the GoW client
         FixedVerticesToArrayFromPoly = 227,
 
+        /// <summary>
+        /// FIXME: Version
+        /// Not attested with EndWar (223) and R6Vegas (241)
+        /// </summary>
+        AddedStructFlagsToScriptStruct = 242,
+
         ExportFlagsAddedToExports = 247,
         ComponentClassBridgeMapDeprecated = 248,
         SerialSizeConditionRemoved = 249,
@@ -258,6 +280,6 @@ public enum PackageObjectLegacyVersion
         AddedNativeClassNameToUClass = 813,
 
         AddedATITCToUTexture2D = 857,
-        AddedETCToUTexture2D = 864
+        AddedETCToUTexture2D = 864,
     }
 }

src/Branch/UE3/GIGANTIC/Core/Classes/UJsonNodeRoot.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Linq;
+using System.Text;
+using UELib.Core;
+using UELib.UnrealScript;
+
+namespace UELib.Branch.UE3.GIGANTIC.Core.Classes
+{
+    public class UJsonNodeRoot : UObject
+    {
+        public UMap<string, UMoJsonObject> JsonObjects;
+
+        public UJsonNodeRoot()
+        {
+            ShouldDeserializeOnDemand = true;
+        }
+
+        protected override void Deserialize()
+        {
+            base.Deserialize();
+
+            int c = _Buffer.ReadInt32();
+            _Buffer.Record(nameof(c), c);
+
+            JsonObjects = new UMap<string, UMoJsonObject>(c);
+            for (int i = 0; i < c; ++i)
+            {
+                _Buffer.Read(out string key);
+                _Buffer.Record(nameof(key), key);
+
+                // In the engine 'ReadObject<UMoJsonObject>' is overriden here to serialize as a string / value
+                var jsonObject = new UMoJsonObject();
+                jsonObject.Deserialize(_Buffer);
+                _Buffer.Record(nameof(jsonObject), jsonObject);
+
+                JsonObjects.Add(key, jsonObject);
+            }
+
+            //_Buffer.Record(nameof(JsonObjects), JsonObjects);
+        }
+
+        public override string Decompile()
+        {
+            if (ShouldDeserializeOnDemand && JsonObjects == null)
+            {
+                BeginDeserializing();
+            }
+
+            if (JsonObjects == null)
+            {
+                return base.Decompile();
+            }
+
+            var str = new StringBuilder(JsonObjects.Count * 16);
+
+            str.Append(UDecompilingState.Tabs);
+            str.Append("[");
+            str.Append(Environment.NewLine);
+            UDecompilingState.AddTab();
+
+            foreach (var pair in JsonObjects)
+            {
+                str.Append(UDecompilingState.Tabs);
+                str.Append(PropertyDisplay.FormatLiteral(pair.Key));
+                str.Append(":");
+                str.Append(" ");
+
+                string value = pair.Value.Decompile();
+
+                if (pair.Value == JsonObjects.Last().Value)
+                {
+                    continue;
+                }
+
+                str.Append(value);
+                str.Append(",");
+                str.Append(Environment.NewLine);
+            }
+
+            UDecompilingState.RemoveTab();
+            str.Append(Environment.NewLine);
+            str.Append(UDecompilingState.Tabs);
+            str.Append("]");
+
+            return str.ToString();
+        }
+    }
+}