Merge pull request #163 from EverestAPI/flag_entities_on_transition

Hide flag-toggled entities properly on transitions when flag is disabled

Author: 0x0ade

Entities/FlagToggleComponent.cs

@@ -21,7 +21,10 @@ public FlagToggleComponent(string flag, bool inverted, Action onDisable = null,
 
         public override void Update() {
             base.Update();
+            UpdateFlag();
+        }
 
+        public void UpdateFlag() {
             if ((!inverted && SceneAs<Level>().Session.GetFlag(flag) != Enabled)
                 || (inverted && SceneAs<Level>().Session.GetFlag(flag) == Enabled)) {
 

Entities/FlagToggleStarRotateSpinner.cs

@@ -1,5 +1,6 @@
 using Celeste.Mod.Entities;
 using Microsoft.Xna.Framework;
+using Monocle;
 
 namespace Celeste.Mod.SpringCollab2020.Entities {
     [CustomEntity("SpringCollab2020/FlagToggleStarRotateSpinner")]
@@ -10,6 +11,11 @@ public FlagToggleStarRotateSpinner(EntityData data, Vector2 offset) : base(data,
             Add(toggle = new FlagToggleComponent(data.Attr("flag"), data.Bool("inverted")));
         }
 
+        public override void Added(Scene scene) {
+            base.Added(scene);
+            toggle.UpdateFlag();
+        }
+
         public override void Update() {
             if (toggle.Enabled) {
                 // update the entity as usual

Entities/FlagToggleStarTrackSpinner.cs

@@ -1,5 +1,6 @@
 using Celeste.Mod.Entities;
 using Microsoft.Xna.Framework;
+using Monocle;
 
 namespace Celeste.Mod.SpringCollab2020.Entities {
     [CustomEntity("SpringCollab2020/FlagToggleStarTrackSpinner")]
@@ -10,6 +11,11 @@ public FlagToggleStarTrackSpinner(EntityData data, Vector2 offset) : base(data,
             Add(toggle = new FlagToggleComponent(data.Attr("flag"), data.Bool("inverted")));
         }
 
+        public override void Added(Scene scene) {
+            base.Added(scene);
+            toggle.UpdateFlag();
+        }
+
         public override void Update() {
             if (toggle.Enabled) {
                 // update the entity as usual

Entities/FlagToggleWaterfall.cs

@@ -33,6 +33,8 @@ public override void Awake(Scene scene) {
             enteringSfx = self.Get<SoundSource>("enteringSfx");
             loopingSfxEvent = loopingSfx.EventName;
             enteringSfxEvent = enteringSfx.EventName;
+
+            toggle.UpdateFlag();
         }
 
         public override void Update() {