Move puzzle reassignment

Puzzle2 reassignment to continue to support the dragon in every level is now moved to pre-processing.

Author: lahm86

TRRandomizerCore/Editors/TR2ClassicEditor.cs

@@ -80,12 +80,6 @@ protected override int GetSaveTarget(int numLevels)
         // TRX pre-processing
         target += numLevels;
 
-        if (Settings.ReassignPuzzleItems)
-        {
-            // For TR2ModelAdjuster
-            target += numLevels;
-        }
-
         if (Settings.RandomizeEnemies)
         {
             // 3 for multithreading cross-level work
@@ -187,6 +181,7 @@ protected override void SaveImpl(AbstractTRScriptEditor scriptEditor, TRSaveMoni
                 SaveMonitor = monitor,
                 TextureMonitor = textureMonitor,
                 ItemFactory = itemFactory,
+                Settings = Settings,
             }.Run();
         }
 
@@ -206,21 +201,6 @@ protected override void SaveImpl(AbstractTRScriptEditor scriptEditor, TRSaveMoni
             }.Randomize(Settings.SecretSeed);
         }
 
-        if (!monitor.IsCancelled && Settings.ReassignPuzzleItems)
-        {
-            // P2 items are converted to P3 in case the dragon is present as the dagger type is hardcoded.
-            // Must take place before enemy randomization. OG P2 key items must be zoned based on being P3.
-            monitor.FireSaveStateBeginning(TRSaveCategory.Custom, "Adjusting level models");
-            new TR2ModelAdjuster
-            {
-                ScriptEditor = scriptEditor,
-                Levels = levels,
-                BasePath = wipDirectory,
-                BackupPath = backupDirectory,
-                SaveMonitor = monitor
-            }.AdjustModels();
-        }
-
         if (!monitor.IsCancelled && Settings.RandomizeItems)
         {
             monitor.FireSaveStateBeginning(TRSaveCategory.Custom, "Randomizing items");

TRRandomizerCore/Processors/TR2/TR2ModelAdjuster.cs

@@ -1,4 +1,5 @@
 using TRLevelControl.Model;
+using TRRandomizerCore.Editors;
 using TRRandomizerCore.Helpers;
 using TRRandomizerCore.Processors.Shared;
 using TRRandomizerCore.Processors.TR2;
@@ -13,6 +14,7 @@ public class TR2XPreProcessor : TR2LevelProcessor
 
     public required TR2TextureMonitorBroker TextureMonitor { get; set; }
     public required ItemFactory<TR2Entity> ItemFactory { get; set; }
+    public required RandomizerSettings Settings { get; set; }
 
     public void Run()
     {
@@ -22,7 +24,7 @@ public void Run()
             new TR2XDataTask() { TextureMonitor = TextureMonitor },
             new TR2XFixLaraTask() { TextureMonitor = TextureMonitor },
             new TR2XEnemyTask() { ItemFactory = ItemFactory },
-            new TR2XPickupTask(),
+            new TR2XPickupTask() { ReassignPuzzleItems = Settings.ReassignPuzzleItems },
         };
 
         var commonProcessor = new TRXCommonProcessor(ScriptEditor, _minTR2XVersion);

TRRandomizerCore/Processors/TR2/TR2XPreProcessor.cs

@@ -10,6 +10,8 @@ public class TR2XPickupTask : ITR2ProcessorTask
     private static readonly PickupInfo _info =
         JsonUtils.ReadFile<PickupInfo>("Resources/TR2/pickup_info.json");
 
+    public bool ReassignPuzzleItems { get; set; }
+
     public void Run(TR2CombinedLevel level)
     {
         var typeTargets = _info.LevelTargets.TryGetValue(level.Name, out var levelTypes)
@@ -20,6 +22,34 @@ public void Run(TR2CombinedLevel level)
             ScalePickup(type, level.Data.Models[type], factor);
             FixPickup(type, level.Data.Models[type], level.Name);
         }
+
+        AlterPuzzles(level);
+    }
+
+    private void AlterPuzzles(TR2CombinedLevel level)
+    {
+        if (level.Is(TR2LevelNames.LAIR) || !ReassignPuzzleItems)
+        {
+            return;
+        }
+
+        // P2 items are converted to P3 in case the dragon is present to ensure the dagger can be safely imported.
+        // OG P2 key items must be zoned based on being P3.
+        foreach (var (oldType, newType) in new Dictionary<TR2Type, TR2Type>
+        {
+            [TR2Type.Puzzle2_M_H] = TR2Type.Puzzle3_M_H,
+            [TR2Type.PuzzleHole2] = TR2Type.PuzzleHole3,
+            [TR2Type.PuzzleDone2] = TR2Type.PuzzleDone3,
+        })
+        {
+            level.Data.Models.ChangeKey(oldType, newType);
+            level.Data.Entities.FindAll(e => e.TypeID == oldType)
+                .ForEach(e => e.TypeID = newType);
+        }
+
+        level.Data.Sprites.ChangeKey(TR2Type.Puzzle2_S_P, TR2Type.Puzzle3_S_P);
+        level.Data.Entities.FindAll(e => e.TypeID == TR2Type.Puzzle2_S_P)
+                .ForEach(e => e.TypeID = TR2Type.Puzzle3_S_P);
     }
 
     public static void ScalePickup(TR2Type type, TRModel model, float factor)