Gate teleport: change colors only if not yet activated (#6)

Dalet · May 25, 2019 · 2def2d4 · 2def2d4
1 parent 6d8c482
commit 2def2d4
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/140-speedrun-timer/LevelObject/Cheats.cs b/140-speedrun-timer/LevelObject/Cheats.cs
@@ -250,14 +250,19 @@ void TeleportToBeatLayerSwitch(int id)
 				return;
 			}
 
-			if (id >= 0 && id < _beatSwitches.Count)
+			if (id < 0 || id >= _beatSwitches.Count)
 			{
-				TeleportToBeatLayerSwitch(_beatSwitches[id]);
+				return;
 			}
-			// change the colors of the level and player according to the gate
-			var player = Globals.player.GetComponent<MyCharacterController>();
-			player.visualPlayer.SetColor((id % 2 == 0) ? Color.black : Color.white, 1f);
-			CheatColorSphere(id + 1);
+			var beatSwitch = _beatSwitches[id];
+			if (beatSwitch.globalBeatLayer > Globals.beatMaster.GetCurrentBeatLayer())
+			{
+				// change the colors of the level and player according to the gate
+				var player = Globals.player.GetComponent<MyCharacterController>();
+				player.visualPlayer.SetColor((id % 2 == 0) ? Color.black : Color.white, 1f);
+				CheatColorSphere(id + 1);
+			}
+			TeleportToBeatLayerSwitch(beatSwitch);
 		}
 
 		void CheatColorSphere(int beatIndex)