Convert GetConnectedResources and SetUpAnimation to Part extension me…

…thods
Majiir · Sep 4, 2014 · d6fd4eb · d6fd4eb
1 parent a1610c2
commit d6fd4eb
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/Plugin/Misc.cs b/Plugin/Misc.cs
@@ -8,7 +8,7 @@ namespace Kethane
 {
     internal static class Misc
     {
-        public static List<PartResource> GetConnectedResources(Part part, String resourceName)
+        public static List<PartResource> GetConnectedResources(this Part part, String resourceName)
         {
             var resourceDef = PartResourceLibrary.Instance.GetDefinition(resourceName);
             var resources = new List<PartResource>();
@@ -18,7 +18,7 @@ public static List<PartResource> GetConnectedResources(Part part, String resourc
 
         public static float Dot(this Vector3 lhs, Vector3 rhs) { return Vector3.Dot(lhs, rhs); }
 
-        public static AnimationState[] SetUpAnimation(string animationName, Part part)
+        public static AnimationState[] SetUpAnimation(this Part part, string animationName)
         {
             var states = new List<AnimationState>();
             foreach (var animation in part.FindModelAnimators(animationName))

diff --git a/Plugin/PartModules/HeatSinkAnimator.cs b/Plugin/PartModules/HeatSinkAnimator.cs
@@ -45,8 +45,8 @@ public class HeatSinkAnimator : PartModule
 
         public override void OnStart(PartModule.StartState state)
         {
-            openAnimationStates = Misc.SetUpAnimation(OpenAnimation, this.part);
-            heatAnimationStates = Misc.SetUpAnimation(HeatAnimation, this.part);
+            openAnimationStates = this.part.SetUpAnimation(OpenAnimation);
+            heatAnimationStates = this.part.SetUpAnimation(HeatAnimation);
         }
 
         public override void OnUpdate()

diff --git a/Plugin/PartModules/KethaneConverter.cs b/Plugin/PartModules/KethaneConverter.cs
@@ -187,7 +187,7 @@ public override void OnFixedUpdate()
             if (!IsEnabled && !AlwaysActive) { return; }
 
             var rates = outputRates.Select(r => r * -1).Concat(inputRates).Select(r => r * TimeWarp.fixedDeltaTime).ToArray();
-            var ratio = rates.Where(r => !r.Optional).Select(r => Misc.GetConnectedResources(this.part, r.Resource).Select(c => r.Rate > 0 ? c.amount : c.maxAmount - c.amount).DefaultIfEmpty().Max() / Math.Abs(r.Rate)).Where(r => r < 1).DefaultIfEmpty(1).Min();
+            var ratio = rates.Where(r => !r.Optional).Select(r => this.part.GetConnectedResources(r.Resource).Select(c => r.Rate > 0 ? c.amount : c.maxAmount - c.amount).DefaultIfEmpty().Max() / Math.Abs(r.Rate)).Where(r => r < 1).DefaultIfEmpty(1).Min();
 
             var heatsink = this.part.Modules.OfType<HeatSinkAnimator>().SingleOrDefault();
             if (heatsink != null)

diff --git a/Plugin/PartModules/KethaneDetectorAnimatorUnity.cs b/Plugin/PartModules/KethaneDetectorAnimatorUnity.cs
@@ -18,8 +18,8 @@ public class KethaneDetectorAnimatorUnity : PartModule, IDetectorAnimator
 
         public override void OnStart(PartModule.StartState state)
         {
-            deployStates = Misc.SetUpAnimation(DeployAnimation, this.part);
-            runningStates = Misc.SetUpAnimation(RunningAnimation, this.part);
+            deployStates = this.part.SetUpAnimation(DeployAnimation);
+            runningStates = this.part.SetUpAnimation(RunningAnimation);
 
             foreach (var runningState in runningStates)
             {

diff --git a/Plugin/PartModules/KethaneDrillAnimator.cs b/Plugin/PartModules/KethaneDrillAnimator.cs
@@ -20,8 +20,8 @@ public class KethaneDrillAnimator : PartModule, IExtractorAnimator
 
         public override void OnStart(PartModule.StartState state)
         {
-            deployStates = Misc.SetUpAnimation(DeployAnimation, this.part);
-            drillStates = Misc.SetUpAnimation(DrillAnimation, this.part);
+            deployStates = this.part.SetUpAnimation(DeployAnimation);
+            drillStates = this.part.SetUpAnimation(DrillAnimation);
 
             if (CurrentState == ExtractorState.Deploying) { CurrentState = ExtractorState.Retracted; }
             else if (CurrentState == ExtractorState.Retracting) { CurrentState = ExtractorState.Deployed; }

diff --git a/Plugin/PartModules/KethaneGenerator.cs b/Plugin/PartModules/KethaneGenerator.cs
@@ -67,8 +67,8 @@ public override void OnStart(PartModule.StartState state)
             if (state == StartState.Editor) { return; }
             this.part.force_activate();
 
-            fanStates = Misc.SetUpAnimation("generatorFan_anim", part);
-            slatStates = Misc.SetUpAnimation("generatorSlats_anim", part);
+            fanStates = this.part.SetUpAnimation("generatorFan_anim");
+            slatStates = this.part.SetUpAnimation("generatorSlats_anim");
 
             foreach (var fanState in fanStates)
             {
@@ -102,7 +102,7 @@ public override void OnUpdate()
 
         public override void OnFixedUpdate()
         {
-            var resources = Misc.GetConnectedResources(part, "ElectricCharge");
+            var resources = part.GetConnectedResources("ElectricCharge");
             var demand = Enabled ? logistic((float)(resources.Sum(r => r.amount) / resources.Sum(r => r.maxAmount))) : 0;
 
             if (demand < 0.1f) { demand = 0; }