Skip to content

Commit 503cfa4

Browse files
committed
Fix bubbles disappearing early in left-facing bubble columns
1 parent 3355c3f commit 503cfa4

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Entities/BubblePushField.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
namespace Celeste.Mod.SpringCollab2020.Entities {
88
[CustomEntity("SpringCollab2020/bubblePushField")]
99
class BubblePushField : Entity {
10-
public enum ActivationMode {
11-
Always, OnlyWhenFlagActive, OnlyWhenFlagInactive
10+
public enum ActivationMode {
11+
Always, OnlyWhenFlagActive, OnlyWhenFlagInactive
1212
}
1313

1414
public float Strength;
@@ -83,10 +83,10 @@ public override void Update() {
8383

8484
Session session = SceneAs<Level>().Session;
8585
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;
9090
}
9191

9292
FramesSinceSpawn++;
@@ -206,7 +206,7 @@ public override void Added(Entity entity) {
206206
case PushDirection.Left:
207207
Origin = new Vector2(BubbleField.CenterRight.X, Rand.Range(BubbleField.BottomRight.Y, BubbleField.TopRight.Y));
208208
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);
210210
break;
211211
}
212212

0 commit comments

Comments
 (0)