Merge Feature-mass_effect

EliotVU · EliotVU · commit 3e1dfb562f9e · 2024-10-10T01:14:32.000+02:00
# Conflicts:
#	src/Core/Classes/UDefaultProperty.cs
#	src/Eliot.UELib.csproj
#	src/UnrealPackage.cs
diff --git a/src/Branch/PackageObjectLegacyVersion.cs b/src/Branch/PackageObjectLegacyVersion.cs
@@ -159,6 +159,8 @@ public enum PackageObjectLegacyVersion
 
         NetObjectCountAdded = 322,
 
+        CompressionAdded = 334,
+
         NumberAddedToName = 343,
 
         // FIXME: Version 374-491; Delegate source type changed from Name to Object
diff --git a/src/Branch/UE3/SFX/Classes/UStringRefProperty.cs b/src/Branch/UE3/SFX/Classes/UStringRefProperty.cs
@@ -0,0 +1,20 @@
+﻿using UELib.Core;
+
+namespace UELib.Branch.UE3.SFX.Classes
+{
+    [UnrealRegisterClass]
+    [BuildGeneration(BuildGeneration.SFX)]
+    public class UStringRefProperty : UProperty
+    {
+        protected override void Deserialize()
+        {
+            base.Deserialize();
+        }
+
+        /// <inheritdoc/>
+        public override string GetFriendlyType()
+        {
+            return "stringref";
+        }
+    }
+}
diff --git a/src/Branch/UE3/SFX/EngineBranch.SFX.cs b/src/Branch/UE3/SFX/EngineBranch.SFX.cs
@@ -0,0 +1,42 @@
+﻿using UELib.Branch.UE3.SFX.Tokens;
+using UELib.Core.Tokens;
+using static UELib.Core.UStruct.UByteCodeDecompiler;
+
+namespace UELib.Branch.UE3.SFX
+{
+    public class EngineBranchSFX : DefaultEngineBranch
+    {
+        public EngineBranchSFX(BuildGeneration generation) : base(generation)
+        {
+        }
+
+        public override void Setup(UnrealPackage linker)
+        {
+            base.Setup(linker);
+
+            // FIXME: Temporary workaround
+            if (linker.LicenseeVersion == 1008)
+            {
+                linker.Summary.LicenseeVersion = 112;
+            }
+        }
+
+        protected override void SetupSerializer(UnrealPackage linker)
+        {
+            SetupSerializer<PackageSerializerSFX>();
+        }
+
+        protected override TokenMap BuildTokenMap(UnrealPackage linker)
+        {
+            var tokenMap = base.BuildTokenMap(linker);
+            tokenMap[0x4F] = typeof(StringRefConstToken);
+            // IfLocal
+            tokenMap[0x63] = typeof(UnresolvedToken);
+            // IfInstance
+            tokenMap[0x64] = typeof(UnresolvedToken);
+            // NamedFunction
+            tokenMap[0x65] = typeof(UnresolvedToken);
+            return tokenMap;
+        }
+    }
+}
diff --git a/src/Branch/UE3/SFX/PackageSerializer.SFX.cs b/src/Branch/UE3/SFX/PackageSerializer.SFX.cs
@@ -0,0 +1,62 @@
+﻿using UELib.Annotations;
+
+namespace UELib.Branch.UE3.SFX
+{
+    [UsedImplicitly]
+    public class PackageSerializerSFX : PackageSerializerBase
+    {
+        public override void Serialize(IUnrealStream stream, UNameTableItem item)
+        {
+            stream.Write(item._Name);
+            if (stream.LicenseeVersion >= 142 && stream.LicenseeVersion != 1008)
+            {
+                return;
+            }
+
+            if (stream.LicenseeVersion >= 102)
+            {
+                stream.Write((uint)item._Flags);
+                return;
+            }
+
+            stream.Write(item._Flags);
+        }
+
+        public override void Deserialize(IUnrealStream stream, UNameTableItem item)
+        {
+            stream.Read(out item._Name);
+            if (stream.LicenseeVersion >= 142 && stream.LicenseeVersion != 1008)
+            {
+                return;
+            }
+
+            if (stream.LicenseeVersion >= 102)
+            {
+                stream.Read(out item._Flags);
+                return;
+            }
+            
+            stream.Read(out item._Flags);
+        }
+
+        public override void Serialize(IUnrealStream stream, UImportTableItem item)
+        {
+            item.Serialize(stream);
+        }
+
+        public override void Deserialize(IUnrealStream stream, UImportTableItem item)
+        {
+            item.Deserialize(stream);
+        }
+
+        public override void Serialize(IUnrealStream stream, UExportTableItem item)
+        {
+            item.Serialize(stream);
+        }
+
+        public override void Deserialize(IUnrealStream stream, UExportTableItem item)
+        {
+            item.Deserialize(stream);
+        }
+    }
+}
diff --git a/src/Branch/UE3/SFX/Tokens/StringRefConstToken.cs b/src/Branch/UE3/SFX/Tokens/StringRefConstToken.cs
@@ -0,0 +1,23 @@
+﻿using UELib.Core;
+using UELib.ObjectModel.Annotations;
+using UELib.Tokens;
+
+namespace UELib.Branch.UE3.SFX.Tokens
+{
+    [ExprToken(ExprToken.StringConst)]
+    public class StringRefConstToken : UStruct.UByteCodeDecompiler.Token
+    {
+        public int Value;
+        
+        public override void Deserialize(IUnrealStream stream)
+        {
+            stream.Read(out Value);
+            Decompiler.AlignSize(sizeof(int));
+        }
+
+        public override string Decompile()
+        {
+            return base.Decompile();
+        }
+    }
+}
diff --git a/src/Core/Tables/UNameTableItem.cs b/src/Core/Tables/UNameTableItem.cs
@@ -16,14 +16,14 @@ public string Name
             get => _Name;
             set => _Name = value;
         }
-        private string _Name;
+        internal string _Name;
 
         public ulong Flags
         {
             get => _Flags;
             set => _Flags = value;
         }
-        private ulong _Flags;
+        internal ulong _Flags;
 
         public ushort NonCasePreservingHash;
         public ushort CasePreservingHash;
diff --git a/src/Decompiler/app.config b/src/Decompiler/app.config
diff --git a/src/Eliot.UELib.csproj b/src/Eliot.UELib.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <DefineConstants>DECOMPILE;BINARYMETADATA;UE1;UE2;UE3;UE4;VENGEANCE;SWAT4;UNREAL2;INFINITYBLADE;BORDERLANDS2;GOW2;APB;SPECIALFORCE2;XIII;SINGULARITY;THIEF_DS;DEUSEX_IW;BORDERLANDS;MIRRORSEDGE;BIOSHOCK;HAWKEN;UT;DISHONORED;REMEMBERME;ALPHAPROTOCOL;VANGUARD;TERA;MKKE;TRANSFORMERS;XCOM2;DD2;DCUO;AA2;SPELLBORN;BATMAN;MOH;ROCKETLEAGUE;DNF;LSGAME;UNDYING;HP;DEVASTATION;BATTLEBORN;SPLINTERCELL;AHIT;GIGANTIC;ENDWAR;SG1</DefineConstants>
+    <DefineConstants>DECOMPILE;BINARYMETADATA;UE1;UE2;UE3;UE4;VENGEANCE;SWAT4;UNREAL2;INFINITYBLADE;BORDERLANDS2;GOW2;APB;SPECIALFORCE2;XIII;SINGULARITY;THIEF_DS;DEUSEX_IW;BORDERLANDS;MIRRORSEDGE;BIOSHOCK;HAWKEN;UT;DISHONORED;REMEMBERME;ALPHAPROTOCOL;VANGUARD;TERA;MKKE;TRANSFORMERS;XCOM2;DD2;DCUO;AA2;SPELLBORN;BATMAN;MOH;ROCKETLEAGUE;DNF;LSGAME;UNDYING;HP;DEVASTATION;BATTLEBORN;SPLINTERCELL;AHIT;GIGANTIC;ENDWAR;SG1;MASS_EFFECT</DefineConstants>
     <TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>UELib</RootNamespace>
diff --git a/src/Eliot.UELib.sln.DotSettings b/src/Eliot.UELib.sln.DotSettings
@@ -1,5 +1,6 @@
 ﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=UELib_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SFX/@EntryIndexedValue">SFX</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Endian/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=parm/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Parms/@EntryIndexedValue">True</s:Boolean>
diff --git a/src/UnrealBuild.cs b/src/UnrealBuild.cs
@@ -18,7 +18,7 @@ public enum BuildGeneration
         UE1,
 
         /// <summary>
-        /// Modified version for Harry Potter's Unreal Engine 1
+        /// Modified version for Harry Potter's Unreal Engine 1.
         /// </summary>
         HP,
 
@@ -30,7 +30,7 @@ public enum BuildGeneration
         UE2,
 
         /// <summary>
-        /// Heavily modified Unreal Engine 2 by Ion Storm for Thief: Deadly Shadows
+        /// Heavily modified Unreal Engine 2 by Ion Storm for Thief: Deadly Shadows.
         /// </summary>
         Flesh,
 
@@ -50,14 +50,14 @@ public enum BuildGeneration
         Vengeance,
 
         /// <summary>
-        /// Heavily modified Unreal Engine 2.5 for Splinter Cell
+        /// Heavily modified Unreal Engine 2.5 for Splinter Cell.
         ///
         /// Not yet supported.
         /// </summary>
         Lead,
 
         /// <summary>
-        /// Modified Unreal Engine 2 for Xbox e.g. Unreal Championship 2: The Liandri Conflict
+        /// Modified Unreal Engine 2 for Xbox e.g. Unreal Championship 2: The Liandri Conflict.
         /// </summary>
         UE2X,
 
@@ -68,17 +68,22 @@ public enum BuildGeneration
         /// </summary>
         UE3,
 
+        /// <summary>
+        /// A modified Unreal Engine 3 for the Mass Effect series.
+        /// </summary>
+        SFX,
+        
         /// <summary>
         /// Rocksteady Studios
         ///
-        /// Heavily modified Unreal Engine 3 for the Arkham series
+        /// Heavily modified Unreal Engine 3 for the Arkham series.
         /// </summary>
         RSS,
 
         /// <summary>
         /// High Moon Studios
         ///
-        /// Heavily modified Unreal Engine 3 for Transformers and Deadpool etc
+        /// Heavily modified Unreal Engine 3 for Transformers and Deadpool etc.
         /// </summary>
         HMS,
 
diff --git a/src/UnrealFlags.cs b/src/UnrealFlags.cs
@@ -42,7 +42,12 @@ public bool HasFlags(ulong flags)
         {
             return (_Flags & flags) != 0;
         }
-
+        
+        public static explicit operator int(UnrealFlags<TEnum> flags)
+        {
+            return (int)flags._Flags;
+        }
+        
         public static explicit operator uint(UnrealFlags<TEnum> flags)
         {
             return (uint)flags._Flags;
diff --git a/src/UnrealPackage.cs b/src/UnrealPackage.cs
diff --git a/src/UnrealStream.cs b/src/UnrealStream.cs

Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@ public string Name`
`16`	`16`	`get => _Name;`
`17`	`17`	`set => _Name = value;`
`18`	`18`	`}`
`19`		`- private string _Name;`
	`19`	`+ internal string _Name;`
`20`	`20`
`21`	`21`	`public ulong Flags`
`22`	`22`	`{`
`23`	`23`	`get => _Flags;`
`24`	`24`	`set => _Flags = value;`
`25`	`25`	`}`
`26`		`- private ulong _Flags;`
	`26`	`+ internal ulong _Flags;`
`27`	`27`
`28`	`28`	`public ushort NonCasePreservingHash;`
`29`	`29`	`public ushort CasePreservingHash;`