Merge pull request #631 from TheTrackerCouncil/bug-fixes

Bug fixes

Author: MattEqualsCoder

src/TrackerCouncil.Smz3.Data/RandomizerVersion.cs

@@ -6,13 +6,13 @@ public class RandomizerVersion
 {
     // Update this whenever we have breaking logic changes which might affect
     // old seeds. Only use the major version number.
-    public static Version Version => new(7, 0);
+    public static Version Version => new(8, 0);
 
     public static string VersionString => Version.ToString();
 
     public static int MajorVersion => Version.Major;
 
-    public static Version PreReplaceDungeonStateVersion => new Version(6, 0);
+    public static Version PreReplaceDungeonStateVersion => new(7, 0);
 
     public static bool IsVersionPreReplaceDungeonState(int version) => version <= PreReplaceDungeonStateVersion.Major;
 }

src/TrackerCouncil.Smz3.Data/ViewModels/GenerationWindowLogicViewModel.cs

@@ -17,7 +17,7 @@ public class GenerationWindowLogicViewModel : ViewModelBase
     [DynamicFormObject(groupName: "All")]
     public CasPatches CasPatches { get; set; } = new();
 
-    public bool CanChangeGameSettings { get; set; }
+    public bool CanChangeGameSettings { get; set; } = true;
 
     public bool IsPlando
     {

src/TrackerCouncil.Smz3.Data/WorldData/Location.cs

@@ -407,7 +407,7 @@ public string RandomName
     }
 
 
-    public IHasTreasure? GetTreasureRegion() => Region as IHasTreasure;
+    public IHasTreasure? GetTreasureRegion() => Type == LocationType.NotInDungeon ? null : Region as IHasTreasure;
 
     public event EventHandler? ClearedUpdated;
     public event EventHandler? MarkedItemUpdated;

src/TrackerCouncil.Smz3.Data/WorldData/Regions/IHasBoss.cs

@@ -30,6 +30,12 @@ public interface IHasBoss
 
     LocationId? BossLocationId { get; }
 
+    /// <summary>
+    /// If the boss and location are tied where one can't be received without the other
+    /// (e.g. Zelda dungeons)
+    /// </summary>
+    public bool UnifiedBossAndItemLocation { get; }
+
     Region Region => (Region)this;
 
     public bool BossDefeated

src/TrackerCouncil.Smz3.Data/WorldData/Regions/SuperMetroid/Brinstar/KraidsLair.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using TrackerCouncil.Smz3.Shared;
 using TrackerCouncil.Smz3.Data.Configuration.ConfigTypes;
 using TrackerCouncil.Smz3.Data.Options;
 using TrackerCouncil.Smz3.Data.Services;
@@ -35,6 +34,8 @@ public KraidsLair(World world, Config config, IMetadataService? metadata, Tracke
 
     public LocationId? BossLocationId => LocationId.KraidsLairVariaSuit;
 
+    public bool UnifiedBossAndItemLocation => false;
+
     public Reward Reward { get; set; } = null!;
 
     public RewardType DefaultRewardType => RewardType.KraidToken;

src/TrackerCouncil.Smz3.Data/WorldData/Regions/SuperMetroid/Maridia/InnerMaridia.cs

@@ -41,6 +41,8 @@ public InnerMaridia(World world, Config config, IMetadataService? metadata, Trac
 
     public LocationId? BossLocationId => LocationId.InnerMaridiaSpaceJump;
 
+    public bool UnifiedBossAndItemLocation => false;
+
     public Reward Reward { get; set; } = null!;
 
     public RewardType DefaultRewardType => RewardType.DraygonToken;

src/TrackerCouncil.Smz3.Data/WorldData/Regions/SuperMetroid/Norfair/LowerNorfairEast.cs

@@ -36,6 +36,8 @@ public LowerNorfairEast(World world, Config config, IMetadataService? metadata,
 
     public LocationId? BossLocationId => LocationId.LowerNorfairRidleyTank;
 
+    public bool UnifiedBossAndItemLocation => false;
+
     public Reward Reward { get; set; } = null!;
 
     public RewardType DefaultRewardType => RewardType.RidleyToken;

src/TrackerCouncil.Smz3.Data/WorldData/Regions/SuperMetroid/WreckedShip.cs

@@ -37,6 +37,8 @@ public WreckedShip(World world, Config config, IMetadataService? metadata, Track
 
     public LocationId? BossLocationId => LocationId.WreckedShipWestSuper;
 
+    public bool UnifiedBossAndItemLocation => false;
+
     public Reward Reward { get; set; } = null!;
 
     public RewardType DefaultRewardType => RewardType.PhantoonToken;

src/TrackerCouncil.Smz3.Data/WorldData/Regions/Zelda/CastleTower.cs

@@ -40,6 +40,8 @@ public CastleTower(World world, Config config, IMetadataService? metadata, Track
 
     public LocationId? BossLocationId => null;
 
+    public bool UnifiedBossAndItemLocation => false;
+
     public Reward Reward { get; set; } = null!;
 
     public FoyerRoom Foyer { get; }

src/TrackerCouncil.Smz3.Data/WorldData/Regions/Zelda/DesertPalace.cs

@@ -91,6 +91,8 @@ public DesertPalace(World world, Config config, IMetadataService? metadata, Trac
 
     public bool IsShuffledReward => true;
 
+    public bool UnifiedBossAndItemLocation => true;
+
     public override List<string> AlsoKnownAs { get; } = ["Dessert Palace"];
 
     public LocationId? BossLocationId => LocationId.DesertPalaceLanmolas;