|
7 | 7 | namespace Celeste.Mod.SpringCollab2020.Entities { |
8 | 8 | [CustomEntity("SpringCollab2020/bubblePushField")] |
9 | 9 | class BubblePushField : Entity { |
10 | | - public enum ActivationMode { |
11 | | - Always, OnlyWhenFlagActive, OnlyWhenFlagInactive |
| 10 | + public enum ActivationMode { |
| 11 | + Always, OnlyWhenFlagActive, OnlyWhenFlagInactive |
12 | 12 | } |
13 | 13 |
|
14 | 14 | public float Strength; |
@@ -83,10 +83,10 @@ public override void Update() { |
83 | 83 |
|
84 | 84 | Session session = SceneAs<Level>().Session; |
85 | 85 | if ((activationMode == ActivationMode.OnlyWhenFlagActive && !session.GetFlag(flag)) |
86 | | - || (activationMode == ActivationMode.OnlyWhenFlagInactive && session.GetFlag(flag))) { |
87 | | - |
88 | | - // the bubble push field is currently turned off by a session flag. |
89 | | - return; |
| 86 | + || (activationMode == ActivationMode.OnlyWhenFlagInactive && session.GetFlag(flag))) { |
| 87 | + |
| 88 | + // the bubble push field is currently turned off by a session flag. |
| 89 | + return; |
90 | 90 | } |
91 | 91 |
|
92 | 92 | FramesSinceSpawn++; |
@@ -206,7 +206,7 @@ public override void Added(Entity entity) { |
206 | 206 | case PushDirection.Left: |
207 | 207 | Origin = new Vector2(BubbleField.CenterRight.X, Rand.Range(BubbleField.BottomRight.Y, BubbleField.TopRight.Y)); |
208 | 208 | End = new Vector2(BubbleField.CenterLeft.X, Rand.Range(BubbleField.BottomLeft.Y, BubbleField.TopLeft.Y)); |
209 | | - FramesMaxAlive = (int) Rand.Range(20, BubbleField.Height / BubbleField.Strength * .5f); |
| 209 | + FramesMaxAlive = (int) Rand.Range(20, BubbleField.Width / BubbleField.Strength * .5f); |
210 | 210 | break; |
211 | 211 | } |
212 | 212 |
|
|
0 commit comments