new magics and finally solve TextureGui0 and 1 magics

garysplay · Sep 24, 2021 · d2009cb · d2009cb
1 parent 7d8f468
commit d2009cb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/RainbowForge/Magic.cs b/RainbowForge/Magic.cs
@@ -16,8 +16,8 @@ public enum Magic : ulong
 		CompiledUltraResolutionTextureMap = 0x9F492D22,
 		CompiledFutureResolutionTextureMap = 0x3876CCDF,
 		CompiledTextureMapData = 0xc30c4b3d,
-		TextureGui0 = 0x9468B9E2,
-		TextureGui1 = 0x05A61FAD,
+		CompiledLowResolutionGuiTextureMap = 0x9468B9E2,
+		CompiledMediumResolutionGuiTextureMap = 0x05A61FAD,
 		CompiledSoundMedia = 0x427411A3, // Wwise sound
 		BuildTable = 0x22ECBE63,
 		BuildColumn = 0x36839608,
@@ -799,7 +799,18 @@ public enum Magic : ulong
 		PhoenixWidgetData = 0x1B3B6644,
 		PhoenixVideoData = 0xB16F9CAE,
 		PhoenixEnumData = 0xB7ABC60E,
-		PhoenixSoundData = 0xE12986CE
+		PhoenixSoundData = 0xE12986CE,
+		PhoenixWidgetTypeData = 0xA5A10525,
+		PhoenixTextStyleData = 0x005557B9,
+		PhoenixImageAtlasData = 0xDF8E96F1,
+		PhoenixFontCharacterSetData = 0x0CFB284C,
+		RuntimeRenderScalingFactorSettings = 0xBB5542A0,
+		LaserReinforcementDeployableData = 0x5D86305B,
+		R6GameplayInteractionsPreset = 0xDBAA67AC,
+		R6SeasonalTrainingChallenges = 0xF5AC3340,
+		RuntimeAntiAliasingSettings = 0xA89F658D,
+		LaserReinforcementSystemController = 0x2DF799F3,
+		PhoenixColorPaletteData = 0x037B5227,
 	}
 
 	public enum ContainerMagic : uint

diff --git a/RainbowForge/MagicHelper.cs b/RainbowForge/MagicHelper.cs
@@ -6,17 +6,13 @@ namespace RainbowForge
 {
 	public static class MagicHelper
 	{
-		public static readonly HashSet<ulong> UnknownMagics = new()
+		public static readonly HashSet<uint> UnknownMagics = new()
 		{
-			// Named but not correctly
-			0x1014FA99, // FileContainer
-			0x57FBAA34, // File container magic
-			0x9468B9E2, // TextureGui0
-			0x05A61FAD, // TextureGui1
 			// Notable magics
 			0x61CDA86C, // Not ShotClassificationInfo even though the CRC fits, this magic is unicode font-related
 			// Totally unknown
-			0xBB5542A0, 0xDBAA67AC, 0x2FEF6C7F, 0xF5AC3340, 0x01DD1BAE, 0x07E763B3, 0x854A3D0B, 0x650F34CF, 0x6A52331D, 0x297D86AF, 0x87EEAF47, 0xA89F658D, 0x431843B9, 0xC8241D45
+			0x2FEF6C7F, 0x01DD1BAE, 0x07E763B3, 0x854A3D0B, 0x650F34CF, 0x6A52331D, 0x297D86AF, 0x87EEAF47, 0x431843B9, 0xC8241D45,
+			0x9DFC17AC
 		};
 
 		public static void AssertEquals(Magic magic, ulong value)
@@ -43,8 +39,8 @@ public static AssetType GetFiletype(ulong magic)
 				Magic.CompiledHighResolutionTextureMap => AssetType.Texture,
 				Magic.CompiledUltraResolutionTextureMap => AssetType.Texture,
 				Magic.CompiledFutureResolutionTextureMap => AssetType.Texture,
-				Magic.TextureGui0 => AssetType.Texture,
-				Magic.TextureGui1 => AssetType.Texture,
+				Magic.CompiledLowResolutionGuiTextureMap => AssetType.Texture,
+				Magic.CompiledMediumResolutionGuiTextureMap => AssetType.Texture,
 				Magic.CompiledSoundMedia => AssetType.Sound,
 				Magic.EntityBuilder => AssetType.FlatArchive,
 				Magic.WeaponData => AssetType.FlatArchive,