Add option to remove TR3 crystals

Author: lahm86

CHANGELOG.md

@@ -1,4 +1,5 @@
 ## [Unreleased](https://github.com/LostArtefacts/TR-Rando/compare/V1.11.0...master) - xxxx-xx-xx
+- added an option to remove crystals in classic TR3
 
 ## [V1.11.0](https://github.com/LostArtefacts/TR-Rando/compare/V1.10.2...V1.11.0) - 2025-10-05
 - added support for TR1X 4.15 (now the minimum version supported) (#803)

TRRandomizerCore/Editors/RandomizerSettings.cs

@@ -149,6 +149,7 @@ public class RandomizerSettings
     public bool AutoLaunchGame { get; set; }
     public bool AddReturnPaths { get; set; }
     public bool FixOGBugs { get; set; }
+    public bool RemoveCrystals { get; set; }
 
     public bool RandomizeItemTypes { get; set; }
     public bool RandomizeItemPositions { get; set; }
@@ -343,6 +344,7 @@ public void ApplyConfig(Config config)
         AutoLaunchGame = config.GetBool(nameof(AutoLaunchGame));
         AddReturnPaths = config.GetBool(nameof(AddReturnPaths), true);
         FixOGBugs = config.GetBool(nameof(FixOGBugs), true);
+        RemoveCrystals = config.GetBool(nameof(RemoveCrystals));
 
         RandomizeSecretRewardsPhysical = config.GetBool(nameof(RandomizeSecretRewardsPhysical));
         SecretRewardsPhysicalSeed = config.GetInt(nameof(SecretRewardsPhysicalSeed), defaultSeed);
@@ -515,6 +517,7 @@ public void StoreConfig(Config config)
         config[nameof(AutoLaunchGame)] = AutoLaunchGame;
         config[nameof(AddReturnPaths)] = AddReturnPaths;
         config[nameof(FixOGBugs)] = FixOGBugs;
+        config[nameof(RemoveCrystals)] = RemoveCrystals;
 
         config[nameof(RandomizeSecretRewardsPhysical)] = RandomizeSecretRewardsPhysical;
         config[nameof(SecretRewardsPhysicalSeed)] = SecretRewardsPhysicalSeed;

TRRandomizerCore/Processors/TR3/TR3SequenceProcessor.cs

@@ -148,6 +148,19 @@ private void AdjustLevel(TR3CombinedLevel level)
                 }
             }
         }
+
+        if (Settings.RemoveCrystals)
+        {
+            for (int i = 0; i < level.Data.Entities.Count; i++)
+            {
+                var item = level.Data.Entities[i];
+                if (item.TypeID == TR3Type.SaveCrystal_P)
+                {
+                    item.TypeID = TR3Type.LookAtItem_H;
+                    ItemFactory.FreeItem(level.Name, i);
+                }
+            }
+        }
     }
 
     private void ImportUPV(TR3CombinedLevel level)

TRRandomizerCore/TRRandomizerController.cs

@@ -1211,6 +1211,12 @@ public bool FixOGBugs
         set => LevelRandomizer.FixOGBugs = value;
     }
 
+    public bool RemoveCrystals
+    {
+        get => LevelRandomizer.RemoveCrystals;
+        set => LevelRandomizer.RemoveCrystals = value;
+    }
+
     public bool RandomizeVfx
     {
         get => LevelRandomizer.RandomizeVfx;

TRRandomizerCore/TRRandomizerType.cs

@@ -71,4 +71,5 @@ public enum TRRandomizerType
     Wireframe,
     HideDeadTrexes,
     Vehicles,
+    RemoveCrystals,
 }

TRRandomizerCore/TRVersionSupport.cs

@@ -180,6 +180,7 @@ internal class TRVersionSupport
         TRRandomizerType.LevelSequence,
         TRRandomizerType.NightMode,
         TRRandomizerType.Outfit,
+        TRRandomizerType.RemoveCrystals,
         TRRandomizerType.ReturnPaths,
         TRRandomizerType.RewardRooms,
         TRRandomizerType.Secret,

TRRandomizerView/Model/ControllerOptions.cs

@@ -28,7 +28,7 @@ public class ControllerOptions : INotifyPropertyChanged
 
     private GameMode _gameMode;
     private GameMode[] _gameModes;
-    private bool _addReturnPaths, _fixOGBugs, _disableDemos, _autoLaunchGame;
+    private bool _addReturnPaths, _fixOGBugs, _disableDemos, _autoLaunchGame, _removeCrystals;
 
     private BoolItemControlClass _randomizeLevelSequencing;
     private BoolItemControlClass _isHardSecrets, _allowGlitched, _guaranteeSecrets, _useRandomSecretModels, _enableUWCornerSecrets;
@@ -1548,6 +1548,16 @@ public bool FixOGBugs
         }
     }
 
+    public bool RemoveCrystals
+    {
+        get => _removeCrystals;
+        set
+        {
+            _removeCrystals = value;
+            FirePropertyChanged();
+        }
+    }
+
     public bool DisableDemos
     {
         get => _disableDemos;
@@ -3056,6 +3066,7 @@ public void Load(TRRandomizerController controller)
         AutoLaunchGame = _controller.AutoLaunchGame;
         AddReturnPaths = _controller.AddReturnPaths;
         FixOGBugs = _controller.FixOGBugs;
+        RemoveCrystals = _controller.RemoveCrystals;
 
         SpriteRandoModes = Enum.GetValues<SpriteRandoMode>();
         SpriteRandoMode = _controller.SpriteRandoMode;
@@ -3289,6 +3300,7 @@ public void Save()
         _controller.AutoLaunchGame = AutoLaunchGame;
         _controller.AddReturnPaths = AddReturnPaths;
         _controller.FixOGBugs = FixOGBugs;
+        _controller.RemoveCrystals = RemoveCrystals;
 
         _controller.SpriteRandoMode = SpriteRandoMode;
         _controller.RandomizeItemSprites = RandomizeItemSprites;
@@ -3373,6 +3385,7 @@ public void Unload()
     public bool IsItemSpriteTypeSupported => IsRandomizationSupported(TRRandomizerType.ItemSprite);
     public bool IsReturnPathsTypeSupported => IsRandomizationSupported(TRRandomizerType.ReturnPaths);
     public bool IsGeneralBugFixesTypeSupported => IsRandomizationSupported(TRRandomizerType.GeneralBugFixes);
+    public bool IsRemoveCrystalsTypeSupported => IsRandomizationSupported(TRRandomizerType.RemoveCrystals);
 
     private bool IsRandomizationSupported(TRRandomizerType randomizerType)
     {

TRRandomizerView/Windows/GlobalSettingsWindow.xaml

@@ -54,6 +54,7 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
@@ -104,6 +105,18 @@
                 Grid.Column="1"
                 Visibility="{Binding IsGeneralBugFixesTypeSupported, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolToCollapsedConverter}}"
                 Text="Fix original level bugs and oversights, such as missing textures or untriggered enemies."/>
+
+            <CheckBox
+                Grid.Row="4"
+                Visibility="{Binding IsRemoveCrystalsTypeSupported, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolToCollapsedConverter}}"
+                IsChecked="{Binding RemoveCrystals, Mode=TwoWay}"
+                Content="Remove crystals"/>
+            <TextBlock
+                Grid.Row="4"
+                Grid.Column="1"
+                Visibility="{Binding IsRemoveCrystalsTypeSupported, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolToCollapsedConverter}}">
+                Removes all savegame/healing crystal items.
+            </TextBlock>
         </Grid>
 
         <Border