Merge pull request Jarno458#86 from TriumphantBass/fix/refresh-boss-save

Fix setting the IsVileteSaved flag on non-randomized boss runs
t3hf1gm3nt · Jun 7, 2022 · edaf267 · edaf267
2 parents 056028c + 4992a35
commit edaf267
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/TsRandomizer/LevelObjects/RoomTriggers.cs b/TsRandomizer/LevelObjects/RoomTriggers.cs
@@ -468,15 +468,16 @@ static RoomTrigger()
 			RoomTriggers.Add(new RoomTrigger(8, 13, (level, itemLocation, seedOptions, gameSettings, screenManager) => {
 				if (seedOptions.GassMaw)
 					FillRoomWithGas(level);
-				if (gameSettings.BossRando.Value 
-					&& level.GameSave.GetSaveBool("TSRando_IsBossDead_Maw")
+				if (!level.GameSave.GetSaveBool("TSRando_IsBossDead_Maw"))
+					return;
+				level.GameSave.SetValue("TSRando_IsVileteSaved", true);
+				if (gameSettings.BossRando.Value
 					&& !level.GameSave.GetSaveBool("IsVileteSaved"))
 				{
 					var enumValue = CutsceneEnumType.GetEnumValue("CavesPast6_MawBoom");
-					level.GameSave.SetValue("TSRando_IsVileteSaved", true);
 					CreateAndCallCutsceneMethod.InvokeStatic(enumValue, level, new Point(200, 200));
-					return;
 				}
+				BestiaryManager.RefreshBossSaveFlags(level);
 			}));
 			RoomTriggers.Add(new RoomTrigger(8, 21, (level, itemLocation, seedOptions, gameSettings, screenManager) => {
 				if (seedOptions.GassMaw) FillRoomWithGas(level);

diff --git a/TsRandomizer/Screens/GameplayScreen.cs b/TsRandomizer/Screens/GameplayScreen.cs
@@ -92,6 +92,8 @@ public override void Initialize(ItemLocationMap _, GCM gameContentManager)
 				OrbDamageManager.PopulateOrbLookups(Level.GameSave, settings.DamageRando.Value, settings.DamageRandoOverrides.Value);
 
 			BestiaryManager.UpdateBestiary(Level, settings);
+			if (!saveFile.GetSaveBool("IsFightingBoss"))
+				BestiaryManager.RefreshBossSaveFlags(Level);
 
 			if (seedOptions.Archipelago)
 			{