Fix for #120, delete some old untouched code

post-kerbin-mining-corporation · Sep 22, 2024 · 5584729 · 5584729
1 parent bd7ff25
commit 5584729
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 35 deletions.
diff --git a/GameData/Waterfall/Plugins/Waterfall.dll b/GameData/Waterfall/Plugins/Waterfall.dll
diff --git a/Source/Waterfall/EffectControllers/WaterfallController.cs b/Source/Waterfall/EffectControllers/WaterfallController.cs
@@ -121,15 +121,6 @@ public void SetOverride(bool mode)
       overridden = mode;
     }
 
-    /// <summary>
-    ///   Sets the override value, not controlled by the game, likely an editor UI
-    /// </summary>
-    /// <param name="value"></param>
-    public void SetOverrideValue(float value)
-    {
-      overrideValue = value;
-    }
-
     public virtual void UpgradeToCurrentVersion(Version loadedVersion)
     {
 

diff --git a/Source/Waterfall/EffectModifiers/EffectModifier.cs b/Source/Waterfall/EffectModifiers/EffectModifier.cs
@@ -71,7 +71,7 @@ public virtual void Init(WaterfallEffect effect)
       Controller = parentEffect.parentModule.AllControllersDict.TryGetValue(controllerName, out var controller) ? controller : null;
       if (Controller == null)
       {
-        Utils.LogError($"[EffectModifier]: Controller {controllerName} not found for modifier {fxName} in effect {effect.name} in module {effect.parentModule.moduleID}");
+        Utils.LogWarning($"[EffectModifier]: Controller {controllerName} not found for modifier {fxName} in effect {effect.name} in module {effect.parentModule.moduleID}");
       }
       else
       {
@@ -167,15 +167,21 @@ protected virtual void ApplySubtract(float[] strength) { }
 
     public virtual void CreateOrAttachToIntegrator<T>(List<T> integrators) where T : EffectIntegrator
     {
-      if (integrators == null || !ValidForIntegrator) return;
-      T target = integrators.FirstOrDefault(x => IntegratorSuitable(x));
-      if (target == null)
+      if (Controller != null)
       {
-        target = CreateIntegrator() as T;
-        integrators.Add(target);
+        if (integrators == null || !ValidForIntegrator) return;
+        T target = integrators.FirstOrDefault(x => IntegratorSuitable(x));
+        if (target == null)
+        {
+          target = CreateIntegrator() as T;
+          integrators.Add(target);
+        }
+        else target.AddModifier(this);
+        integrator = target;
+      } else 
+      {
+        Utils.LogWarning($"[EffectModifier]: Controller {controllerName} is null and will not be added to the integrator list");
       }
-      else target.AddModifier(this);
-      integrator = target;
     }
 
     public virtual void RemoveFromIntegrator<T>(List<T> integrators) where T : EffectIntegrator

diff --git a/Source/Waterfall/Modules/ModuleWaterfallFX.cs b/Source/Waterfall/Modules/ModuleWaterfallFX.cs
@@ -337,24 +337,6 @@ private void LoadControllers(ConfigNode node)
     public string GetModuleTitle() => "";
 
     public override string GetInfo() => "";
-
-    private static readonly float[] EmptyControllerResult = new float[1];
-
-    /// <summary>
-    ///   Gets the value of the requested controller by name
-    /// </summary>
-    /// <param name="controllerName"></param>
-    /// <returns></returns>
-    public float[] GetControllerValues(string controllerName)
-    {
-      if (allControllers.TryGetValue(controllerName, out var controller))
-        return controller.Get();
-      else
-      {
-        return EmptyControllerResult;
-      }
-    }
-
     /// <summary>
     ///   Gets the list of controllers
     /// </summary>