Merge pull request #16 from ChrisAdderley/dev

Dev
post-kerbin-mining-corporation · Aug 22, 2020 · cff080d · cff080d
2 parents d536761 + 825213f
commit cff080d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 6 deletions.
diff --git a/GameData/Waterfall/Patches/Squad/liquidEngineSwivel.cfg b/GameData/Waterfall/Patches/Squad/liquidEngineSwivel.cfg
@@ -107,7 +107,7 @@
     TEMPLATE
     {
       // This is the name of the template to use
-      templateName = waterfall-kerlox-sustainer-1
+      templateName = waterfall-kerolox-sustainer-1
       // This field allows you to override the parentTransform name in the EFFECTS contained in the template
       overrideParentTransform = thrustTransform
       position = 0,0,0

diff --git a/GameData/Waterfall/Plugins/Waterfall.dll b/GameData/Waterfall/Plugins/Waterfall.dll
diff --git a/GameData/Waterfall/Versioning/Waterfall.version b/GameData/Waterfall/Versioning/Waterfall.version
@@ -6,7 +6,7 @@
     {
         "MAJOR":0,
         "MINOR":1,
-        "PATCH":1,
+        "PATCH":2,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/Source/Waterfall/Effects/WaterfallEffect.cs b/Source/Waterfall/Effects/WaterfallEffect.cs
@@ -262,6 +262,7 @@ public void AddModifier(EffectModifier mod)
 
     public void SetEnabled(bool state)
     {
+      if (effectTransforms != null)
       foreach (Transform t in effectTransforms)
       {
         if (state)

diff --git a/Source/Waterfall/Modules/ModuleWaterfallFX.cs b/Source/Waterfall/Modules/ModuleWaterfallFX.cs
@@ -130,14 +130,19 @@ public override void OnLoad(ConfigNode node)
         allFX = new List<WaterfallEffect>();
       } else
       {
-        allFX.Clear();
+        if (effectNodes.Length > 0 && allFX.Count > 0 || allFX.Count > 0 && templateNodes.Length >0)
+        {
+          CleanupEffects();
+          allFX.Clear();
+        }
       }
 
       foreach (ConfigNode fxDataNode in effectNodes)
       {
         allFX.Add(new WaterfallEffect(fxDataNode));
       }
 
+
       Utils.Log(String.Format("[ModuleWaterfallFX]: Loading Template effects on moduleID {0}", moduleID), LogType.Modules);
       foreach (ConfigNode templateNode in templateNodes)
       {
@@ -160,7 +165,7 @@ public override void OnLoad(ConfigNode node)
         {
           allFX.Add(new WaterfallEffect(fx, positionOffset, rotationOffset, scaleOffset, overrideTransformName));
         }
-        Utils.Log($"[ModuleWaterfallFX]: Loaded effect template {template}", LogType.Modules);
+        Utils.Log($"[ModuleWaterfallFX]: Loaded effect template {template.templateName}", LogType.Modules);
       }
 
       Utils.Log($"[ModuleWaterfallFX]: Finished loading {allFX.Count} effects", LogType.Modules);

diff --git a/Source/Waterfall/WaterfallData.cs b/Source/Waterfall/WaterfallData.cs
@@ -11,7 +11,7 @@ namespace Waterfall
   /// <summary>
   /// Class to load shaders and config level data for the mod.
   /// </summary>
-  [KSPAddon(KSPAddon.Startup.AllGameScenes, false)]
+  [KSPAddon(KSPAddon.Startup.Instantly, false)]
   public  class WaterfallData: MonoBehaviour
   { 
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+v0.1.2
+------
+- Bugfixes
+
 v0.1.1
 ------
 - Fixed parsing of plume rotation in templates

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 ===============
-Waterfall 0.1.1
+Waterfall 0.1.2
 ===============
 
 TBW