Switch parameter order in DreamHoldable constructor

Author: aonkeeper4

src/Components/DreamHoldable.cs

@@ -17,7 +17,7 @@ public bool AllowDreamDash
 
     private readonly Action onActivate, onDeactivate;
 
-    public DreamHoldable(Collider dreamDashCollider, Action onActivate = null, Action onDeactivate = null, float cannotHoldDelay = 0.1f)
+    public DreamHoldable(Collider dreamDashCollider, float cannotHoldDelay = 0.1f, Action onActivate = null, Action onDeactivate = null)
         : base(cannotHoldDelay)
     {
         DreamDashCollider = new DreamDashCollider(dreamDashCollider, OnDreamDashEnter, OnDreamDashExit);

src/Entities/DreamBlocks/DreamJellyfish.cs

@@ -40,6 +40,7 @@ public DreamJellyfish(Vector2 position, bool bubble, bool tutorial)
         Remove(Hold);
         Add(Hold = DreamHold = new DreamHoldable(
             new Hitbox(28, 16, -13, -18),
+            0.3f,
             () =>
             {
                 dreamSprite.Enabled = true;
@@ -52,8 +53,7 @@ public DreamJellyfish(Vector2 position, bool bubble, bool tutorial)
                 dreamSprite.Enabled = false;
                 dreamSprite.Flash = 1f;
                 Audio.Play(CustomSFX.game_dreamJellyfish_jelly_use);
-            },
-            0.3f
+            }
         )
         {
             PickupCollider = new Hitbox(20f, 22f, -10f, -16f),
@@ -69,7 +69,7 @@ public DreamJellyfish(Vector2 position, bool bubble, bool tutorial)
             },
         });
 
-        // The Dreamdash Collider does not shift down when this entity is inverted (via GravityHelper)
+        // The Dreamdash Collider does not shift down when this entity is inverted (via GravityHelper).
         // So let's add a listener that does this for us.
         Component listener = GravityHelper.CreateGravityListener?.Invoke(this, (_, value, _) =>
         {

src/Entities/DreamBlocks/DreamTheoCrystal.cs

@@ -21,17 +21,18 @@ internal class DreamTheoCrystal : TheoCrystal
 
     public DreamTheoCrystal(EntityData data, Vector2 offset) : base(data, offset)
     {
-        Add(overlaySprite = CommunalHelperGFX.SpriteBank.Create("dreamTheoCrystalOverlay"));
-
         Remove(sprite);
         Add(sprite = dreamSprite = new DreamSprite(CommunalHelperGFX.SpriteBank.Create("dreamTheoCrystal"), particleBounds)
         {
             OnChange = (_, current) => overlaySprite.Play(current, true)
         });
 
+        Add(overlaySprite = CommunalHelperGFX.SpriteBank.Create("dreamTheoCrystalOverlay"));
+
         Remove(Hold);
         Add(Hold = DreamHold = new DreamHoldable(
             new Hitbox(20, 20, -10, -20),
+            0.1f,
             () =>
             {
                 dreamSprite.Enabled = true;
@@ -43,8 +44,7 @@ public DreamTheoCrystal(EntityData data, Vector2 offset) : base(data, offset)
                 dreamSprite.Enabled = false;
                 dreamSprite.Flash = 1f;
                 Audio.Play(CustomSFX.game_dreamJellyfish_jelly_use);
-            },
-            0.1f
+            }
         )
         {
             PickupCollider = new Hitbox(16f, 22f, -8f, -16f),
@@ -64,12 +64,14 @@ public DreamTheoCrystal(EntityData data, Vector2 offset) : base(data, offset)
             },
         });
 
-        // The Dreamdash Collider does not shift down when this entity is inverted (via GravityHelper)
-        // So let's add a listener that does this for us.
+        // The Dreamdash Collider does not shift down when this entity is inverted (via GravityHelper).
+        // Nor does the overlay sprite get flipped.
+        // So let's add a listener that does both of these for us.
         Component listener = GravityHelper.CreateGravityListener?.Invoke(this, (_, value, _) =>
         {
             bool inverted = value == (int) GravityType.Inverted;
-            DreamHold.DreamDashCollider.Collider.Position.Y = inverted ? 0 : -18; // a bit hacky
+            DreamHold.DreamDashCollider.Collider.Position.Y = inverted ? 0 : -20; // a bit hacky
+            overlaySprite.Scale.Y = inverted ? -1 : 1;
         });
         if (listener is not null)
             Add(listener);