Merge pull request #74 from Nils277/development

1.3.6
Nils277 · May 11, 2022 · 8ba79dd · 8ba79dd
2 parents ad40dc2 + 7ba765d
commit 8ba79dd
Show file tree

Hide file tree

Showing 18 changed files with 122 additions and 46 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,11 @@
+# v1.3.6  *-Spaaaaaace-*
+*[Released 11.MAY.2022]*
+
+**Bug Fixes:**
+
+* Fixed incorrect volume of parts with switchable resources
+* Fixed incompatibility issues with Simple Repaint 
+
 # v1.3.4  *-Over the shoulder boulder holder-*
 *[Released 28.APRIL.2022]*
 

diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,8 @@
+v1.3.6 [Released 11.MAY.2022] ~Spaaaaaace~
+	Bug Fixes:
+		- Fixed incorrect volume of parts with switchable resources
+		- Fixed incompatibility issues with Simple Repaint 
+-------------------------------------------------------
 v1.3.4 [Released 28.APRIL.2022] ~Over the shoulder boulder holder~
 	Update:
         - Recompile for KSP 1.12.3

diff --git a/For Release/GameData/KerbetrotterLtd/000_KerbetrotterTools/Plugins/KerbetrotterTools.dll b/For Release/GameData/KerbetrotterLtd/000_KerbetrotterTools/Plugins/KerbetrotterTools.dll
diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/FelineUtilityRover.version b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/FelineUtilityRover.version
@@ -12,7 +12,7 @@
     "VERSION": {
         "MAJOR": 1,
         "MINOR": 3,
-        "PATCH": 4
+        "PATCH": 6
     },
 
     "KSP_VERSION": {

diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Patches/SimpleRepaint.cfg b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Patches/SimpleRepaint.cfg
@@ -0,0 +1,11 @@
+//Ignore parts that cause problems in combination with Simple Repaint
+
+@PART[*]:HAS[@MODULE[ModuleKerbetrotterResourceSwitch]]:BEFORE[zzz_SimpleRepaint]
+{
+	%SR_Ignore = true
+}
+
+@PART[*]:HAS[@MODULE[ModuleKerbetrotterTextureShift]]:BEFORE[zzz_SimpleRepaint]
+{
+	%SR_Ignore = true
+}
diff --git a/Sources/Plugin/KerbetrotterTools/Hitch/ModuleKerbetrotterHitch.cs b/Sources/Plugin/KerbetrotterTools/Hitch/ModuleKerbetrotterHitch.cs
@@ -485,7 +485,6 @@ public void FixedUpdate()
 
                 if ((joint == null) && (hasParent) && (isValidAttachment) && !isInitializing)
                 {
-                    Debug.Log("[KERBETROTTER] FixedUpdate: Creating Joint");
                     InitJoint();
                     UpdateUI();
                 }

diff --git a/Sources/Plugin/KerbetrotterTools/HoverEngine/ModuleKerbetrotterEngine.cs b/Sources/Plugin/KerbetrotterTools/HoverEngine/ModuleKerbetrotterEngine.cs
@@ -683,7 +683,6 @@ public void setDefaultProfile()
         /// <param name="height">The hover height</param>
         public void setHoverHeight(float height)
         {
-            //Debug.Log("[HOVER] Height Set: " + height + " Enabled: " + hoverEnabled);
             if (hoverEnabled)
             {
                 hoverHeight = height;

diff --git a/Sources/Plugin/KerbetrotterTools/HoverEngine/ModuleKerbetrotterEngineAnimation.cs b/Sources/Plugin/KerbetrotterTools/HoverEngine/ModuleKerbetrotterEngineAnimation.cs
@@ -113,12 +113,10 @@ public override void OnStart(StartState state)
                     if ((part.Modules[i] is ModuleEngines) && (((ModuleEngines)part.Modules[i]).engineID == engineName))
                     {
                         engine = (ModuleEngines)part.Modules[i];
-                        //Debug.Log("[ENGINE ANIMATION] Found ModuleEngines");
                     }
                     if (part.Modules[i] is ModuleKerbetrotterEngine)
                     {
                         kEngine = (ModuleKerbetrotterEngine)part.Modules[i];
-                        //Debug.Log("[ENGINE ANIMATION] Found ModuleKerbetrotterEngine");
                         break;
                     }
                 }

diff --git a/Sources/Plugin/KerbetrotterTools/Misc/Gameplay/ModuleKerbetrotterNuclearStorage.cs b/Sources/Plugin/KerbetrotterTools/Misc/Gameplay/ModuleKerbetrotterNuclearStorage.cs
@@ -517,7 +517,6 @@ private bool checkCrew(int level)
                 {
                     return true;
                 }
-                //Debug.Log("[KPBS] Title:" + crew[i].experienceTrait.Title + " Desc:" + crew[i].experienceTrait.Description  + " Needed: " + neededSkill);
             }
             return false;
         }
@@ -548,7 +547,6 @@ private void setTarget(Part target, bool isTarget)
         {
             if (isTarget)
             {
-                //Debug.Log("LYNX_NUCLEAR: Setting Target: " + target.name);
                 target.highlightColor.r = transferColor.r;
                 target.highlightColor.g = transferColor.g;
                 target.highlightColor.b = transferColor.b;
@@ -557,7 +555,6 @@ private void setTarget(Part target, bool isTarget)
             //set the default highlight color
             else
             {
-                //Debug.Log("LYNX_NUCLEAR: Resetting Target: " + target.name);
                 target.highlightColor.r = defaultColor.r;
                 target.highlightColor.g = defaultColor.g;
                 target.highlightColor.b = defaultColor.b;

diff --git a/Sources/Plugin/KerbetrotterTools/Misc/Visual/ModuleKerbetrotterConstrainedLookAt.cs b/Sources/Plugin/KerbetrotterTools/Misc/Visual/ModuleKerbetrotterConstrainedLookAt.cs
@@ -18,7 +18,7 @@
 namespace KerbetrotterTools
 {
     /// <summary>
-    /// This class allows to switch some of the models from parts
+    /// This module rotates a transform towards another. On of the axes will not rotate
     /// </summary>
     public class ModuleKerbetrotterConstrainedLookAt : PartModule
     {

diff --git a/Sources/Plugin/KerbetrotterTools/Misc/Visual/ModuleKerbetrotterInternalSwitch.cs b/Sources/Plugin/KerbetrotterTools/Misc/Visual/ModuleKerbetrotterInternalSwitch.cs
@@ -19,7 +19,7 @@
 namespace KerbetrotterTools
 {
     /// <summary>
-    /// Module switching between to internal models (required for JSIATP)
+    /// Module switching between two internal models (required for JSIATP)
     /// </summary>
     class ModuleKerbetrotterInternalSwitch : PartModule, ModuleKerbetrotterMeshToggle.MeshToggleListener
     {
@@ -166,7 +166,6 @@ private void refresh()
             List<ModuleKerbetrotterMeshToggle> switcher = part.FindModulesImplementing<ModuleKerbetrotterMeshToggle>();
             if ((switcher.Count > 0) && (MeshToggleIndex < switcher.Count))
             {
-                Debug.Log("[Kerbetrotter] Found switcher");
                 switcher[MeshToggleIndex].addListener(this);
                 stateEnabled = switcher[MeshToggleIndex].transformsVisible;
             }

diff --git a/Sources/Plugin/KerbetrotterTools/Misc/Visual/ModuleKerbetrotterTextureShift.cs b/Sources/Plugin/KerbetrotterTools/Misc/Visual/ModuleKerbetrotterTextureShift.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Nils277 (https://github.com/Nils277)
+ * Copyright (C) 2022 Nils277 (https://github.com/Nils277)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ class ModuleKerbetrotterTextureShift : PartModule, ISwitchListener
         #region-------------------------Private Members----------------------
 
         //The material containing the texture
-        private List<Material> materials = new List<Material>();
+        //private List<Material> materials = new List<Material>();
 
         //The list of resources that can be switched in the tank
         private Dictionary<string, Vector2> setups = new Dictionary<string, Vector2>();
@@ -71,7 +71,7 @@ public override void OnStart(StartState state)
 
             loadSetups(part.partInfo.partConfig);
 
-            materials.Clear();
+            /*materials.Clear();
             string[] transforms = transformNames.Split(',');
             for (int i = 0; i < transforms.Length; i++)
             {
@@ -80,7 +80,7 @@ public override void OnStart(StartState state)
                 {
                     materials.Add(textureTransform.GetComponent<Renderer>().material);
                 }
-            }
+            }*/
 
             //set the used setup if already set
             if (currentSetup != string.Empty)
@@ -111,6 +111,8 @@ public void onSwitch(string setup)
         {
             currentSetup = setup;
 
+            List<Material> materials = getMaterials();
+
             if (materials.Count > 0)
             {
                 if (setups.ContainsKey(setup))
@@ -128,6 +130,7 @@ public void onSwitch(string setup)
                         materials[i].SetTextureOffset(textureName, new Vector2(0, 0));
                     }
                 }
+
             }
         }
 
@@ -156,7 +159,7 @@ private void loadSetups(ConfigNode node)
                         //load the name of the resource to load
                         if (propConfig[i].HasValue("Offset"))
                         {
-                            
+
                             string[] offests = propConfig[i].GetValue("Offset").Split(',');
                             try
                             {
@@ -178,6 +181,30 @@ private void loadSetups(ConfigNode node)
             }
         }
 
+        /// <summary>
+        /// Get the list of materials that are available
+        /// </summary>
+        /// <returns></returns>
+        private List<Material> getMaterials()
+        {
+            List<Material> materials = new List<Material>();
+            string[] transforms = transformNames.Split(',');
+            for (int i = 0; i < transforms.Length; i++)
+            {
+                Transform[] textureTransforms = part.FindModelTransforms(transforms[i].Trim());
+                foreach (Transform textureTransform in textureTransforms)
+                {
+                    Renderer[] renderers = textureTransform.GetComponents<Renderer>();
+                    foreach (Renderer renderer in renderers)
+                    {
+                        materials.Add(renderer.material);
+                    }
+                }
+            }
+
+            return materials;
+        }
+
         #endregion
     }
-}
+}
diff --git a/Sources/Plugin/KerbetrotterTools/Properties/AssemblyInfo.cs b/Sources/Plugin/KerbetrotterTools/Properties/AssemblyInfo.cs
@@ -46,6 +46,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.4")]
-[assembly: AssemblyFileVersion("1.3.4")]
-[assembly: KSPAssembly("KerbetrotterTools", 1, 0x1340)]
+[assembly: AssemblyVersion("1.3.6")]
+[assembly: AssemblyFileVersion("1.3.6")]
+[assembly: KSPAssembly("KerbetrotterTools", 1, 0x1360)]
diff --git a/Sources/Plugin/KerbetrotterTools/Switching/Dialog/SwitcherDialog.cs b/Sources/Plugin/KerbetrotterTools/Switching/Dialog/SwitcherDialog.cs
@@ -253,7 +253,6 @@ private void apply()
         {
             if (mSwitch.needsPreparation())
             {
-                Debug.Log("Switching Needs preparation");
                 SwitchingProgressDialog<T> dialog = new SwitchingProgressDialog<T>(mSwitch, mSelection);
                 dialog.show(mSetups[mSwitch.SelectedSetup].guiName, mSetups[mSelection].guiName);
             }

diff --git a/Sources/Plugin/KerbetrotterTools/Switching/Setups/KerbetrotterResourceSetup.cs b/Sources/Plugin/KerbetrotterTools/Switching/Setups/KerbetrotterResourceSetup.cs
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (C) 2021 Nils277 (https://github.com/Nils277)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,7 +41,7 @@ class KerbetrotterResourceSetup : BaseSetup
         /// Constructor of the resource setup
         /// </summary>
         /// <param name="node">The config not to contruct the setup from</param>
-        public KerbetrotterResourceSetup(ConfigNode node) : base(node)
+        public KerbetrotterResourceSetup(ConfigNode node, float multiplier) : base(node)
         {
             if (node.HasValue("animateVenting"))
             {
@@ -53,7 +53,7 @@ public KerbetrotterResourceSetup(ConfigNode node) : base(node)
             resources = new KerbetrotterResourceDefinition[resourceSubNodes.Length];
             for (int i = 0; i < resources.Length; i++)
             {
-                KerbetrotterResourceDefinition resourceDefinition = new KerbetrotterResourceDefinition(resourceSubNodes[i]);
+                KerbetrotterResourceDefinition resourceDefinition = new KerbetrotterResourceDefinition(resourceSubNodes[i], multiplier);
                 resources[i] = resourceDefinition;
                 costModifier += resourceDefinition.cost;
             }
@@ -91,7 +91,7 @@ public override string getInfo(bool name = true)
                 {
                     info.AppendLine(guiName);
                 }
-                
+
                 foreach (KerbetrotterResourceDefinition resource in resources)
                 {
                     if (resource.maxAmount > 0)
@@ -153,7 +153,7 @@ public class KerbetrotterResourceDefinition
 
             #region-------------------------Public Methods-----------------------
 
-            public KerbetrotterResourceDefinition(ConfigNode node)
+            public KerbetrotterResourceDefinition(ConfigNode node, double multiplier)
             {
                 if (node.HasValue("name"))
                 {
@@ -165,23 +165,23 @@ public KerbetrotterResourceDefinition(ConfigNode node)
                 {
                     if (node.HasValue("amount"))
                     {
-                        amount = float.Parse(node.GetValue("amount"), CultureInfo.InvariantCulture.NumberFormat);
+                        amount = float.Parse(node.GetValue("amount"), CultureInfo.InvariantCulture.NumberFormat) * multiplier;
                     }
                     if (node.HasValue("maxAmount"))
                     {
-                        maxAmount = float.Parse(node.GetValue("maxAmount"), CultureInfo.InvariantCulture.NumberFormat);
+                        maxAmount = float.Parse(node.GetValue("maxAmount"), CultureInfo.InvariantCulture.NumberFormat) * multiplier;
                     }
 
                     if (node.HasValue("isTweakable"))
                     {
                         isTweakable = bool.Parse(node.GetValue("isTweakable"));
                     }
-                    cost = (float)(maxAmount * PartResourceLibrary.Instance.resourceDefinitions[name].unitCost);
+                    cost = (float)(maxAmount * PartResourceLibrary.Instance.resourceDefinitions[name].unitCost) * (float)multiplier;
                 }
             }
 
             #endregion
         }
         #endregion
     }
-}
+}
diff --git a/Sources/Plugin/KerbetrotterTools/Switching/Switcher/ModuleKerbetrotterConverterSwitch.cs b/Sources/Plugin/KerbetrotterTools/Switching/Switcher/ModuleKerbetrotterConverterSwitch.cs
@@ -51,7 +51,6 @@ public override void OnStart(StartState state)
             if (selectedSetup == -1)
             {
                 selectedSetup = 0;
-                //Debug.Log("[KerbetrotterTools:ConverterSwitch] Found default type: " + selectedConverter);
                 activeSetup = setups[selectedSetup].ID;
             }