Merge pull request #2656 from planetarium/bugfix/adv-boss/add-breakth…

…rough-floor Fix floor order
planetarium · Jun 27, 2024 · a281f48 · a281f48
2 parents cad9bb4 + a5b7e7c
commit a281f48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Lib9c/Action/AdventureBoss/SweepAdventureBoss.cs b/Lib9c/Action/AdventureBoss/SweepAdventureBoss.cs
@@ -187,7 +187,6 @@ public override IWorld Execute(IActionContext context)
                 .First(row => row.BossId == latestSeason.BossId).Id;
             var floorRows = states.GetSheet<AdventureBossFloorSheet>().OrderedList
                 .Where(row => row.AdventureBossId == adventureBossId).ToList();
-            var firstFloorId = floorRows.First(r => r.Floor == 1).Id;
             var floorId = floorRows.First(r => r.Floor == explorer.Floor).Id;
 
             var simulator = new AdventureBossSimulator(

diff --git a/Lib9c/Battle/AdventureBoss/AdventureBossSimulator.cs b/Lib9c/Battle/AdventureBoss/AdventureBossSimulator.cs
@@ -246,7 +246,7 @@ public Player Simulate()
             return Player;
         }
 
-        public void AddBreakthrough(IEnumerable<int> floorIdList,
+        public void AddBreakthrough(List<int> floorIdList,
             AdventureBossFloorWaveSheet adventureBossFloorWaveSheet)
         {
             if (Log.events.Count == 0)
@@ -255,10 +255,11 @@ public void AddBreakthrough(IEnumerable<int> floorIdList,
             }
 
             // Add event in reversed order to keep insert position
-            foreach (var floorId in floorIdList)
+            for (var i = 0; i < floorIdList.Count; i++)
             {
+                var floorId = floorIdList[i];
                 var floorWave = adventureBossFloorWaveSheet[floorId].Waves[0];
-                Log.events.Insert(1, new Breakthrough(Player, floorId, floorWave.Monsters));
+                Log.events.Insert(i + 1, new Breakthrough(Player, floorId, floorWave.Monsters));
             }
         }