Fix enemy shuffling

TheUnlocked · Aug 27, 2021 · a1a3de1 · a1a3de1
1 parent ce38576
commit a1a3de1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/DarkestDungeonRandomizer.csproj b/DarkestDungeonRandomizer.csproj
@@ -5,7 +5,7 @@
         <TargetFramework>netcoreapp5.0</TargetFramework>
         <LangVersion>preview</LangVersion>
 
-	    <Version>0.8</Version>
+	    <Version>0.9</Version>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Randomizers/EnemyShuffler.cs b/Randomizers/EnemyShuffler.cs
@@ -40,22 +40,21 @@ public void Randomize()
 
                 foreach (var level in levels)
                 {
-                    Darkest[] shuffledDungeonFiles = null!;
                     var dungeonFiles = dungeons.Select(dungeon => Darkest.LoadFromFile(model.GetGameDataPath(Path.Combine("dungeons", dungeon, $"{dungeon}.{level}.mash.darkest"))));
                     if (model.RandomizeMonsters)
                     {
                         var (hallEnemies, roomEnemies, stallEnemies) = GetAllEnemies(dungeonFiles);
                         var hallEnemyReplacements = ShuffleMap(hallEnemies);
                         var roomEnemyReplacements = ShuffleMap(roomEnemies);
                         var stallEnemyReplacements = ShuffleMap(stallEnemies);
-                        shuffledDungeonFiles = ReplaceEnemies(dungeonFiles, hallEnemyReplacements, roomEnemyReplacements, stallEnemyReplacements).ToArray();
+                        dungeonFiles = ReplaceEnemies(dungeonFiles, hallEnemyReplacements, roomEnemyReplacements, stallEnemyReplacements);
                     }
                     if (model.RandomizeBosses)
                     {
                         // Exclude shrieker!
-                        var bossLayouts = GetAllBossLayouts(dungeonFiles).ToArray();
+                        var bossLayouts = GetAllBossLayouts(dungeonFiles);
                         var shuffledBossLayouts = bossLayouts.Shuffle(random);
-                        shuffledDungeonFiles = ReplaceBosses(dungeonFiles, shuffledBossLayouts).ToArray();
+                        dungeonFiles = ReplaceBosses(dungeonFiles, shuffledBossLayouts);
 
                         JObject questTypeFile = JObject.Parse(File.ReadAllText(model.GetGameDataPath(Path.Combine("campaign", "quest", "quest.types.json"))));
                         var bossLayoutConversion = bossLayouts.Zip(shuffledBossLayouts, (original, shuffled) => (original, shuffled));
@@ -77,7 +76,7 @@ public void Randomize()
                         File.WriteAllText(Path.Combine(questDir.FullName, "quest.types.json"), questTypeFile.ToString());
                     }
 
-                    _ = dungeons.Zip(shuffledDungeonFiles, (dungeon, darkest) =>
+                    _ = dungeons.Zip(dungeonFiles, (dungeon, darkest) =>
                     {
                         darkest.WriteToFile(Path.Combine(model.ModDirectory.FullName, "dungeons", dungeon, $"{dungeon}.{level}.mash.darkest"));
                         return 0;