Merge pull request #155 from EverestAPI/floatier-space-block-change

Floatier space block change

Author: Cruor

Ahorn/entities/floatierSpaceBlock.jl

@@ -2,7 +2,7 @@ module SpringCollab2020FloatierSpaceBlock
 
 using ..Ahorn, Maple
 
-@mapdef Entity "SpringCollab2020/floatierSpaceBlock" FloatierSpaceBlock(x::Integer, y::Integer, width::Integer=Maple.defaultBlockWidth, height::Integer=Maple.defaultBlockHeight, tiletype::String="3", disableSpawnOffset::Bool=false, floatinessMultiplier::Number=1.0, bounceBackMultiplier::Number=1.0)
+@mapdef Entity "SpringCollab2020/floatierSpaceBlock" FloatierSpaceBlock(x::Integer, y::Integer, width::Integer=Maple.defaultBlockWidth, height::Integer=Maple.defaultBlockHeight, tiletype::String="3", disableSpawnOffset::Bool=false, floatinessMultiplier::Number=1.0, bounceBackMultiplier::Number=1.0, dashOffsetMultiplier::Number=1.0)
 
 const placements = Ahorn.PlacementDict(
     "Floatier Space Block (Spring Collab 2020)" => Ahorn.EntityPlacement(

Ahorn/lang/en_gb.lang

@@ -36,6 +36,7 @@ placements.entities.SpringCollab2020/floatierSpaceBlock.tooltips.disableSpawnOff
 placements.entities.SpringCollab2020/floatierSpaceBlock.tooltips.floatinessMultiplier=A multiplier for how far the block sinks.
 placements.entities.SpringCollab2020/floatierSpaceBlock.tooltips.tiletype=Determines the visual appearance of the wall.
 placements.entities.SpringCollab2020/floatierSpaceBlock.tooltips.bounceBackMultiplier=A multiplier for how fast the block bounces back when dashed into.
+placements.entities.SpringCollab2020/floatierSpaceBlock.tooltips.dashOffsetMultiplier=A multiplier for how far the block gets pushed back when dashed into.
 
 # Invisible Light Source
 placements.entities.SpringCollab2020/invisibleLightSource.tooltips.alpha=Opacity of the light. Makes the bloom near the light stronger.

Entities/FloatierSpaceBlock.cs

@@ -10,6 +10,7 @@ namespace Celeste.Mod.SpringCollab2020.Entities {
     public class FloatierSpaceBlock : FloatySpaceBlock {
         public float floatinessBoost;
         public float dashEaseMultiplier;
+        public float dashOffsetMultiplier;
 
         private static FieldInfo sinkTimerInfo = typeof(FloatySpaceBlock).GetField("sinkTimer", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.GetField);
         private static FieldInfo yLerpInfo = typeof(FloatySpaceBlock).GetField("yLerp", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.GetField);
@@ -22,6 +23,7 @@ public class FloatierSpaceBlock : FloatySpaceBlock {
         public FloatierSpaceBlock(EntityData data, Vector2 offset) : base(data, offset) {
             floatinessBoost = data.Float("floatinessMultiplier", 1);
             dashEaseMultiplier = data.Float("bounceBackMultiplier", 1);
+            dashOffsetMultiplier = data.Float("dashOffsetMultiplier", floatinessBoost);
         }
 
         public static void Load() {
@@ -81,7 +83,7 @@ public override void Update() {
 
         private void MoveToTarget() {
             float sineWavePos = (float) Math.Sin((float)sineWaveInfo.GetValue(this)) * 4f;
-            Vector2 dashOffset = Calc.YoYo(Ease.QuadIn((float)dashEaseInfo.GetValue(this))) * (Vector2)dashDirectionInfo.GetValue(this) * 8f * floatinessBoost;
+            Vector2 dashOffset = Calc.YoYo(Ease.QuadIn((float)dashEaseInfo.GetValue(this))) * (Vector2)dashDirectionInfo.GetValue(this) * 8f * dashOffsetMultiplier;
             for (int i = 0; i < 2; i++) {
                 foreach (KeyValuePair<Platform, Vector2> move in Moves) {
                     Platform key = move.Key;