Merge pull request #396 from Towandaa/TestSprite

TR2 #395
LostArtefacts · Nov 11, 2022 · 4f57d31 · 4f57d31
2 parents d3fa760 + 23b2b3d
commit 4f57d31
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/TRRandomizerCore/Editors/TR2RandoEditor.cs b/TRRandomizerCore/Editors/TR2RandoEditor.cs
@@ -34,7 +34,12 @@ protected override void StoreConfig(Config config)
 
         protected override int GetSaveTarget(int numLevels)
         {
-            return base.GetSaveTarget(numLevels) + Settings.GetSaveTarget(numLevels);
+            int target = base.GetSaveTarget(numLevels) + Settings.GetSaveTarget(numLevels);
+            if (Settings.RandomizeItems && Settings.RandomizeItemSprites)
+            {
+                target += numLevels;
+            }
+            return target;
         }
 
         protected override void SaveImpl(AbstractTRScriptEditor scriptEditor, TRSaveMonitor monitor)
@@ -252,6 +257,12 @@ protected override void SaveImpl(AbstractTRScriptEditor scriptEditor, TRSaveMoni
                         }.Randomize(Settings.NightModeSeed);
                     }
                 }
+
+                if (!monitor.IsCancelled && Settings.RandomizeItems && Settings.RandomizeItemSprites)
+                {
+                    monitor.FireSaveStateBeginning(TRSaveCategory.Custom, "Randomizing Sprites");
+                    itemRandomizer.RandomizeLevelsSprites();
+                }
             }
         }
     }

diff --git a/TRRandomizerCore/Randomizers/TR2/TR2ItemRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/TR2ItemRandomizer.cs
@@ -61,8 +61,8 @@ public override void Randomize(int seed)
 
                 RandomizeSeraph();
 
-                if (Settings.RandomizeItemSprites)
-                    RandomizeSprites();
+               // if (Settings.RandomizeItemSprites)
+                 //   RandomizeSprites();
 
                 //Write back the level file
                 SaveLevelInstance();
@@ -74,6 +74,27 @@ public override void Randomize(int seed)
             }
         }
 
+        public void RandomizeLevelsSprites()
+        {
+
+            foreach (TR2ScriptedLevel lvl in Levels)
+            {
+                //Read the level into a combined data/script level object
+                LoadLevelInstance(lvl);
+
+                RandomizeSprites();
+
+                //Write back the level file
+                SaveLevelInstance();
+
+                if (!TriggerProgress())
+                {
+                    break;
+                }
+            }
+
+        }
+
 
         private void RandomizeSprites()
         {