Skip to content

Commit 8b5d9d2

Browse files
committed
Fix several very silly bugs
1 parent 429314b commit 8b5d9d2

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/Components/DreamHoldable.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace Celeste.Mod.CommunalHelper.Components;
55

6+
[TrackedAs(typeof(Holdable))]
67
internal class DreamHoldable : Holdable
78
{
89
private static readonly MethodInfo m_Player_Pickup = typeof(Player).GetMethod("Pickup", BindingFlags.NonPublic | BindingFlags.Instance);
@@ -114,7 +115,7 @@ internal static void Unload()
114115

115116
private static bool Holdable_Check(On.Celeste.Holdable.orig_Check orig, Holdable self, Player player)
116117
{
117-
return (self is not DreamHoldable holdable || !holdable.AllowDreamDash || !player.DashAttacking) && orig(self, player);
118+
return (self is DreamHoldable holdable && holdable.AllowDreamDash && player.DashAttacking) ? false : orig(self, player);
118119
}
119120

120121
private static bool Holdable_HitSpring(On.Celeste.Holdable.orig_HitSpring orig, Holdable self, Spring spring)

src/Entities/DreamBlocks/DreamJellyfish.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,14 @@ public DreamJellyfish(Vector2 position, bool bubble, bool tutorial)
4747
new Hitbox(28, 16, -13, -18),
4848
() =>
4949
{
50+
Sprite.Enabled = true;
5051
Sprite.Flash = 0.5f;
5152
Sprite.Scale = new Vector2(1.3f, 1.2f);
5253
Audio.Play(CustomSFX.game_dreamJellyfish_jelly_refill);
5354
},
5455
() =>
5556
{
57+
Sprite.Enabled = false;
5658
Sprite.Flash = 1f;
5759
Audio.Play(CustomSFX.game_dreamJellyfish_jelly_use);
5860
},
@@ -66,6 +68,10 @@ public DreamJellyfish(Vector2 position, bool bubble, bool tutorial)
6668
OnRelease = OnRelease,
6769
SpeedGetter = () => Speed,
6870
OnHitSpring = HitSpring,
71+
SpeedSetter = delegate(Vector2 speed)
72+
{
73+
Speed = speed;
74+
},
6975
});
7076

7177
// The Dreamdash Collider does not shift down when this entity is inverted (via GravityHelper)

0 commit comments

Comments
 (0)