Merge branch 'master' of https://github.com/JarnoWesthof/TsRandomizer

t3hf1gm3nt · Jul 26, 2022 · 8524d57 · 8524d57
2 parents a16c91e + bb9020e
commit 8524d57
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/TsRandomizer/Extensions/Helper.cs b/TsRandomizer/Extensions/Helper.cs
@@ -131,6 +131,7 @@ public static List<ItemIdentifier> GetAllLoot()
 					&& o != EInventoryUseItemType.HistoricalDocuments
 					&& o != EInventoryUseItemType.FoodSynth
 					&& o != EInventoryUseItemType.GalaxyStone
+					&& o != EInventoryUseItemType.PlaceHolderItem1
 					)
 				.ToArray();
 			var equipment =

diff --git a/TsRandomizer/LevelObjects/RoomTriggers.cs b/TsRandomizer/LevelObjects/RoomTriggers.cs
@@ -135,9 +135,14 @@ static RoomTrigger()
 				SpawnBoss(level, seedOptions, TargetBossId);
 			}));
 			RoomTriggers.Add(new RoomTrigger(1, 0, (level, itemLocation, seedOptions, gameSettings, screenManager) => {
+				// Inverted mode triggers
 				if (!seedOptions.Inverted || level.GameSave.GetSaveBool("TSRandomizerHasTeleportedPlayer")) return;
 
 				level.GameSave.SetValue("TSRandomizerHasTeleportedPlayer", true);
+				level.GameSave.SetValue("HasUsedCityTS", true);
+				level.GameSave.SetCutsceneTriggered("City1_Frame", true);
+				level.GameSave.SetCutsceneTriggered("City2_Spindle", true);
+				level.GameSave.SetCutsceneTriggered("City3_Warp", true);
 				level.GameSave.SetCutsceneTriggered("LakeDesolation1_Entrance", true); // Fixes music when returning to Lake Desolation later
 
 				level.RequestChangeLevel(new LevelChangeRequest { LevelID = 3, RoomID = 28 }); // Waterfall cutscene