Update Ahorn plugin

Author: maddie480

Ahorn/entities/maxHelpingHandFlagSwitchGate.jl

@@ -7,8 +7,8 @@ using ..Ahorn, Maple
     shakeTime::Number=0.5, moveTime::Number=1.8, moveSpeed::Number=60.0, moveEased::Bool=true, allowReturn::Bool=false, moveSound::String="event:/game/general/touchswitch_gate_open", finishedSound::String="event:/game/general/touchswitch_gate_finish",
     smoke::Bool=true, surfaceIndex::Int16=convert(Int16, 8), particles::Bool=true, speedMode::Bool=false) =
     Entity("MaxHelpingHand/FlagSwitchGate", x=x1, y=y1, nodes=Tuple{Int, Int}[(x2, y2)], width=width, height=height, sprite=sprite, persistent=persistent, flag=flag, icon=icon,
-    inactiveColor=inactiveColor, activeColor=activeColor, finishColor=finishColor, shakeTime=shakeTime, moveTime=moveTime, moveEased=moveEased, allowReturn=allowReturn, moveSound=moveSound, finishedSound=finishedSound,
-    smoke=smoke, surfaceIndex=surfaceIndex, particles=particles)
+    inactiveColor=inactiveColor, activeColor=activeColor, finishColor=finishColor, shakeTime=shakeTime, moveTime=moveTime, moveSpeed=moveSpeed, moveEased=moveEased, allowReturn=allowReturn, moveSound=moveSound, finishedSound=finishedSound,
+    smoke=smoke, surfaceIndex=surfaceIndex, particles=particles, speedMode=speedMode)
 
 function gateFinalizer(entity)
     x, y = Ahorn.position(entity)
@@ -35,6 +35,14 @@ const placements = Ahorn.PlacementDict(
 
 Ahorn.editingOrder(entity::FlagSwitchGate) = String["x", "y", "width", "height", "flag", "inactiveColor", "activeColor", "finishColor", "hitSound", "moveSound", "finishedSound", "shakeTime", "moveTime", "moveSpeed", "icon", "sprite", "surfaceIndex", "allowReturn", "moveEased", "persistent", "particles", "smoke", "speedMode"]
 
+function Ahorn.editingIgnored(entity::FlagSwitchGate, multiple::Bool=false)
+    if get(entity.data, "speedMode", false)
+        return String["moveTime", "moveEased"]
+    else
+        return String["moveSpeed"]
+    end
+end
+
 Ahorn.editingOptions(entity::FlagSwitchGate) = Dict{String, Any}(
     "sprite" => textures,
     "icon" => bundledIcons,

Entities/FlagSwitchGate.cs

@@ -271,12 +271,9 @@ private IEnumerator moveSequence(Vector2 node, bool goingBack) {
             int particleAt = 0;
 
             Tween tween;
-            if (speedMode)
-            {
-                tween = Tween.Create(Tween.TweenMode.Oneshot, null, (float)Math.Round(((Vector2.Distance(start, node)) / moveSpeed), 3), start: true);
-            }
-            else
-            {
+            if (speedMode) {
+                tween = Tween.Create(Tween.TweenMode.Oneshot, null, (float) Math.Round(((Vector2.Distance(start, node)) / moveSpeed), 3), start: true);
+            } else {
                 tween = Tween.Create(Tween.TweenMode.Oneshot, moveEased ? Ease.CubeOut : null, moveTime + (moveEased ? 0.2f : 0f), start: true);
             }
 
@@ -299,7 +296,7 @@ private IEnumerator moveSequence(Vector2 node, bool goingBack) {
             };
             Add(tween);
 
-            float moveTimeLeft = speedMode ? (float)Math.Round(((Vector2.Distance(start, node)) / moveSpeed), 3) : moveTime;
+            float moveTimeLeft = speedMode ? (float) Math.Round(((Vector2.Distance(start, node)) / moveSpeed), 3) : moveTime;
             while (moveTimeLeft > 0f) {
                 yield return null;
                 moveTimeLeft -= Engine.DeltaTime;