Merge pull request #127 from UmbraSpaceIndustries/DEVELOP

Develop

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

@@ -1,3 +1,7 @@
+0.11.1 - 2018.03.11
+-----------------
+SwapConverter Fixes
+
 0.11.0 - 2018.03.07
 ------------------
 KSP 1.4.0 Compatibility

FOR_RELEASE/GameData/000_USITools/USITools.version

@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":11,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{

USITools/USITools/ConverterPart.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using UnityEngine;
+using System.Collections.Generic;
 
 namespace USITools
 {

USITools/USITools/IEfficiencyBonusConsumer.cs

@@ -10,7 +10,7 @@ bool useEfficiencyBonus
             get;
         }
 
-        void EnableModule();
-        void DisableModule();
+        void EnableConsumer();
+        void DisableConsumer();
     }
 }

USITools/USITools/LoadoutInfo.cs

@@ -4,6 +4,7 @@ public class LoadoutInfo
     {
         public int ModuleId { get; set; }
         public string LoadoutName { get; set; }
+        public float BaseEfficiency { get; set; }
         public string DecalTexture { get; set; }
     }
 }

USITools/USITools/ModuleResourceConverter_USI.cs

@@ -91,5 +91,20 @@ public override string GetModuleDisplayName()
             return GetType().Name;
         }
 
+        public void EnableConsumer()
+        {
+            base.EnableModule();
+            isEnabled = true;
+            MonoUtilities.RefreshContextWindows(part);
+        }
+
+        public void DisableConsumer()
+        {
+            DisableModule();
+            isEnabled = false;
+            MonoUtilities.RefreshContextWindows(part);
+        }
+
+
     }
 }

USITools/USITools/ModuleResourceHarvester_USI.cs

@@ -62,5 +62,18 @@ public void SetEfficiencyBonus(string bonName, float bonVal)
         }
 
         public bool useEfficiencyBonus => UseBonus;
+        public void EnableConsumer()
+        {
+            base.EnableModule();
+            isEnabled = true;
+            MonoUtilities.RefreshContextWindows(part);
+        }
+
+        public void DisableConsumer()
+        {
+            DisableModule();
+            isEnabled = false;
+            MonoUtilities.RefreshContextWindows(part);
+        }
     }
 }

USITools/USITools/ModuleSwapControllerNew.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine;
+
+namespace USITools
+{
+    public class ModuleSwapControllerNew : PartModule
+    {
+        [KSPField]
+        public string ResourceCosts = "";
+
+        [KSPField]
+        public string typeName = "Loadout";
+
+        public List<ResourceRatio> ResCosts;
+        public List<ModuleSwapOption> Loadouts;
+        private List<ModuleResourceHarvester_USI> _harvesters;
+        private List<ModuleResourceConverter_USI> _converters;
+
+        private double lastCheck;
+        private double checkInterval = 5d;
+
+        public override void OnStart(StartState state)
+        {
+            Loadouts = part.FindModulesImplementing<ModuleSwapOption>();
+            _converters = part.FindModulesImplementing<ModuleResourceConverter_USI>();
+            _harvesters = part.FindModulesImplementing<ModuleResourceHarvester_USI>();
+            SetupResourceCosts();
+        }
+
+        private void SetupResourceCosts()
+        {
+            ResCosts = new List<ResourceRatio>();
+            if (String.IsNullOrEmpty(ResourceCosts))
+                return;
+
+            var resources = ResourceCosts.Split(',');
+            for (int i = 0; i < resources.Length; i += 2)
+            {
+                ResCosts.Add(new ResourceRatio
+                {
+                    ResourceName = resources[i],
+                    Ratio = double.Parse(resources[i + 1])
+                });
+            }
+        }
+
+        public override string GetInfo()
+        {
+            if (String.IsNullOrEmpty(ResourceCosts))
+                return "";
+
+            var output = new StringBuilder("Resource Cost:\n\n");
+            var resources = ResourceCosts.Split(',');
+            for (int i = 0; i < resources.Length; i += 2)
+            {
+                output.Append(string.Format("{0} {1}\n", double.Parse(resources[i + 1]), resources[i]));
+            }
+            return output.ToString();
+        }
+
+        public void ApplyLoadout(int loadIdx, int moduleIdx, bool isConverter)
+        {
+            var loadout = Loadouts[loadIdx];
+            if (isConverter)
+            {
+                ApplyConverterChanges(_converters[moduleIdx], loadout);
+            }
+            else
+            {
+                ApplyHarvesterChanges(_harvesters[moduleIdx], loadout);
+            }
+        }
+
+        private void ApplyConverterChanges(ModuleResourceConverter_USI converter, ModuleSwapOption loadout)
+        {
+            converter.ConverterName = loadout.ConverterName;
+            converter.StartActionName = loadout.StartActionName;
+            converter.StopActionName = loadout.StopActionName;
+            converter.UseSpecialistBonus = loadout.UseSpecialistBonus;
+            if (converter.UseSpecialistBonus)
+                converter.ExperienceEffect = loadout.ExperienceEffect;
+
+            converter.inputList.Clear();
+            converter.outputList.Clear();
+            converter.reqList.Clear();
+
+            converter.Recipe.Inputs.Clear();
+            converter.Recipe.Outputs.Clear();
+            converter.Recipe.Requirements.Clear();
+
+            converter.inputList.AddRange(loadout.inputList);
+            converter.outputList.AddRange(loadout.outputList);
+            converter.reqList.AddRange(loadout.reqList);
+
+            converter.Recipe.Inputs.AddRange(loadout.inputList);
+            converter.Recipe.Outputs.AddRange(loadout.outputList);
+            converter.Recipe.Requirements.AddRange(loadout.reqList);
+        }
+
+        private void ApplyHarvesterChanges(ModuleResourceHarvester_USI harvester, ModuleSwapOption loadout)
+        {
+            harvester.Efficiency = loadout.Efficiency;
+            harvester.ResourceName = loadout.ResourceName;
+            harvester.ConverterName = loadout.ConverterName;
+            harvester.StartActionName = loadout.StartActionName;
+            harvester.StopActionName = loadout.StopActionName;
+            MonoUtilities.RefreshContextWindows(part);
+        }
+    }
+}