Fix porting bug for hair randomizer, add some debug methods for prope…

…rty checking
ME3Tweaks · Mar 25, 2021 · caba575 · caba575
1 parent 0c6e876
commit caba575
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 13 deletions.
diff --git a/ALOTInstaller b/ALOTInstaller
diff --git a/ME2Randomizer/Classes/Randomizers/ME2/Misc/NPCHair.cs b/ME2Randomizer/Classes/Randomizers/ME2/Misc/NPCHair.cs
@@ -63,7 +63,7 @@ private static bool ForcedRun(ExportEntry hairMeshExport)
                 var newHair = isfemaleHair ? HairListFemale.RandomElement() : HairListMale.RandomElement();
                 if (newHair.ObjectName.Name == entry.ObjectName.Name)
                     return false; // We are not changing this
-                Debug.WriteLine($"Changing hair mesh: {entry.ObjectName} -> {newHair.ObjectName}, object {hairMeshExport.FullPath}, class {entry.ClassName}");
+                MERLog.Information($"{Path.GetFileName(hairMeshExport.FileRef.FilePath)} Changing hair mesh: {entry.ObjectName} -> {newHair.ObjectName}, object {hairMeshExport.FullPath}, class {entry.ClassName}");
                 var newHairMdl = PackageTools.PortExportIntoPackage(hairMeshExport.FileRef, newHair);
                 var mdlBin = ObjectBinary.From<SkeletalMesh>(newHairMdl);
                 obj.Value = newHairMdl.UIndex;

diff --git a/ME2Randomizer/Classes/Randomizers/ME2/Misc/PawnMovementSpeed.cs b/ME2Randomizer/Classes/Randomizers/ME2/Misc/PawnMovementSpeed.cs
@@ -75,7 +75,7 @@ public static bool RandomizeMovementSpeed(ExportEntry export, RandomizationOptio
                 // Generate a newized movement speed. This will result in some duplicate data (since some may already exist in the local file) 
                 // But it will be way less complicated to just add new ones
 
-                MERLog.Information($@"Randomizing movement speed for {export.UIndex}");
+                //MERLog.Information($@"Randomizing movement speed for {export.UIndex}");
                 movementInfo.Value = AddNewRandomizedMovementSpeed(export);
                 export.WriteProperty(movementInfo);
             }

diff --git a/ME2Randomizer/Classes/Randomizers/ME2/Misc/RHolograms.cs b/ME2Randomizer/Classes/Randomizers/ME2/Misc/RHolograms.cs
@@ -62,7 +62,7 @@ private static void RandomizeVIMaterial(ExportEntry exp)
             var data = exp.Data;
             //RandomizeRGBA(data, 0x70C, false);
             RandomizeRGBA(data, 0x72C, false);
-            MERLog.Information(@"Randomized VI material");
+            MERLog.Information($@"Randomized VI material {exp.InstancedFullPath} in {exp.FileRef.FilePath}");
             exp.Data = data;
         }
 

diff --git a/ME2Randomizer/Classes/Randomizers/Randomizer.cs b/ME2Randomizer/Classes/Randomizers/Randomizer.cs
@@ -185,13 +185,13 @@ private void PerformRandomization(object sender, DoWorkEventArgs e)
                     mainWindow.CurrentOperationText = $"Randomizing game files [{currentFileNumber}/{files.Count()}]";
 
 #if DEBUG
-                    if (true
-                    //&& !file.Contains("OmgHub", StringComparison.InvariantCultureIgnoreCase)
-                    //&& !file.Contains("SFXGame", StringComparison.InvariantCultureIgnoreCase)
-                    && !file.Contains("HorCr1", StringComparison.InvariantCultureIgnoreCase)
-                    //&& !file.Contains("ProFre", StringComparison.InvariantCultureIgnoreCase)
-                    )
-                        return;
+                    //if (true
+                    ////&& !file.Contains("OmgHub", StringComparison.InvariantCultureIgnoreCase)
+                    ////&& !file.Contains("SFXGame", StringComparison.InvariantCultureIgnoreCase)
+                    //&& !file.Contains("Hub", StringComparison.InvariantCultureIgnoreCase)
+                    ////&& !file.Contains("ProFre", StringComparison.InvariantCultureIgnoreCase)
+                    //)
+                    //    return;
 #endif
                     try
                     {

diff --git a/ME2Randomizer/DebugTools/DebugWindow.xaml b/ME2Randomizer/DebugTools/DebugWindow.xaml
@@ -17,6 +17,9 @@
         <Button DockPanel.Dock="Right" Click="CheckImports_Click" Padding="20,0,20,0" Visibility="Visible">
             <fonts:OutlinedTextBlock Text="Check imports in DLC mod" Fill="#f3fbfe" Stroke="Black" FontFamily="{StaticResource AeroLight}" FontSize="12" StrokeThickness="2" />
         </Button>
+        <Button DockPanel.Dock="Right" Click="CheckProperties_Click" Padding="20,0,20,0" Visibility="Visible">
+            <fonts:OutlinedTextBlock Text="Check properties in DLC mod" Fill="#f3fbfe" Stroke="Black" FontFamily="{StaticResource AeroLight}" FontSize="12" StrokeThickness="2" />
+        </Button>
         <Button DockPanel.Dock="Right" Click="BuildStartupFile_Click" Padding="20,0,20,0" Visibility="Visible">
             <fonts:OutlinedTextBlock Text="Build startup file" Fill="#f3fbfe" Stroke="Black" FontFamily="{StaticResource AeroLight}" FontSize="12" StrokeThickness="2" />
         </Button>

diff --git a/ME2Randomizer/DebugTools/DebugWindow.xaml.cs b/ME2Randomizer/DebugTools/DebugWindow.xaml.cs
@@ -39,6 +39,11 @@ private void DataFinder_Click(object sender, RoutedEventArgs e)
             DataFinder df = new DataFinder(mw);
         }
 
+        private void CheckProperties_Click(object sender, RoutedEventArgs e)
+        {
+            ME2Debug.TestPropertiesInMERFS();
+        }
+
         private void CheckImports_Click(object sender, RoutedEventArgs e)
         {
             ME2Debug.TestAllImportsInMERFS();

diff --git a/ME2Randomizer/DebugTools/ME2Debug.cs b/ME2Randomizer/DebugTools/ME2Debug.cs
@@ -32,12 +32,19 @@ public static void GetExportsInPersistentThatAreAlsoInSub()
 
             var sameExports = subExports.Intersect(newExports).ToList();
 
-            foreach(var v in sameExports)
+            foreach (var v in sameExports)
             {
                 Debug.WriteLine(v);
             }
         }
 
+        public static void TestPropertiesInMERFS()
+        {
+            var dlcModPath = Path.Combine(MEDirectories.GetDefaultGamePath(MERFileSystem.Game), "BioGame", "DLC", $"DLC_MOD_{MERFileSystem.Game}Randomizer", "CookedPC");
+            ReferenceCheckPackage rcp = new ReferenceCheckPackage();
+            bool checkCanceled = false;
+            EntryChecker.CheckReferences(rcp, dlcModPath, ref checkCanceled, EntryChecker.NonLocalizedStringConveter, x => Debug.WriteLine(x));
+        }
 
         public static void TestAllImportsInMERFS()
         {

diff --git a/ME2Randomizer/ME2Randomizer.csproj b/ME2Randomizer/ME2Randomizer.csproj
@@ -91,7 +91,7 @@
     <Product>Mass Effect 2 Randomizer</Product>
     <Description>Randomizer for Mass Effect 2</Description>
     <Copyright>2019-2021 ME3Tweaks</Copyright>
-    <Version>0.9.16</Version>
+    <Version>0.9.17</Version>
     <Authors>ME3Tweaks</Authors>
   </PropertyGroup>