diff --git a/Parts/kethane_1m_converter/part.cfg b/Parts/kethane_1m_converter/part.cfg
index c7fe66d..a6ca2f4 100644
--- a/Parts/kethane_1m_converter/part.cfg
+++ b/Parts/kethane_1m_converter/part.cfg
@@ -47,7 +47,6 @@ fuelCrossFeed = True
MODULE
{
name = KethaneConverter
- Label = Rocket Fuel
InputRates
{
Kethane = 2.25
@@ -55,8 +54,21 @@ MODULE
}
OutputRatios
{
- LiquidFuel = 0.99
- Oxidizer = 0.99
+ LiquidFuel = 0.97
+ }
+}
+
+MODULE
+{
+ name = KethaneConverter
+ InputRates
+ {
+ Kethane = 2.25
+ ElectricCharge = 6
+ }
+ OutputRatios
+ {
+ Oxidizer = 1.01
}
}
diff --git a/Plugin/IExtractorAnimator.cs b/Plugin/IExtractorAnimator.cs
index c609680..576b4af 100644
--- a/Plugin/IExtractorAnimator.cs
+++ b/Plugin/IExtractorAnimator.cs
@@ -9,7 +9,7 @@ public enum ExtractorState
Retracting,
}
- internal interface IExtractorAnimator
+ public interface IExtractorAnimator
{
ExtractorState CurrentState { get; }
void Deploy();
diff --git a/Plugin/InstallChecker.cs b/Plugin/InstallChecker.cs
index 2686dd2..384c768 100644
--- a/Plugin/InstallChecker.cs
+++ b/Plugin/InstallChecker.cs
@@ -11,7 +11,7 @@ internal class InstallChecker : MonoBehaviour
{
protected void Start()
{
- var assemblies = AssemblyLoader.loadedAssemblies.Where(a => a.assembly == Assembly.GetExecutingAssembly()).Where(a => a.url != "Kethane/Plugins");
+ var assemblies = AssemblyLoader.loadedAssemblies.Where(a => a.assembly.GetName().Name == Assembly.GetExecutingAssembly().GetName().Name).Where(a => a.url != "Kethane/Plugins");
if (assemblies.Any())
{
var badPaths = assemblies.Select(a => a.path).Select(p => Uri.UnescapeDataString(new Uri(Path.GetFullPath(KSPUtil.ApplicationRootPath)).MakeRelativeUri(new Uri(p)).ToString().Replace('/', Path.DirectorySeparatorChar)));
diff --git a/Plugin/Kethane.csproj b/Plugin/Kethane.csproj
index 4850b43..ad67497 100644
--- a/Plugin/Kethane.csproj
+++ b/Plugin/Kethane.csproj
@@ -58,7 +58,6 @@
-
diff --git a/Plugin/KethaneDetectorAnimatorUnity.cs b/Plugin/KethaneDetectorAnimatorUnity.cs
index 2acea4f..b413a94 100644
--- a/Plugin/KethaneDetectorAnimatorUnity.cs
+++ b/Plugin/KethaneDetectorAnimatorUnity.cs
@@ -34,12 +34,12 @@ public override void OnUpdate()
foreach (var state in deployStates)
{
state.normalizedTime = Mathf.Clamp01(state.normalizedTime);
- state.speed = (IsDetecting ? 1 : -1) * PowerRatio;
+ state.speed = IsDetecting ? PowerRatio : -1;
}
foreach (var state in runningStates)
{
- state.speed = IsDetecting ? 0 : PowerRatio;
+ state.speed = IsDetecting ? PowerRatio : 0;
}
}
}
diff --git a/Plugin/KethaneExtractor.cs b/Plugin/KethaneExtractor.cs
index 18301e0..52f6a04 100644
--- a/Plugin/KethaneExtractor.cs
+++ b/Plugin/KethaneExtractor.cs
@@ -19,6 +19,18 @@ public Resource(ConfigNode node)
}
}
+ private class DefaultExtractorAnimator : IExtractorAnimator
+ {
+ public ExtractorState CurrentState { get; private set; }
+ public void Deploy() { CurrentState = ExtractorState.Deployed; }
+ public void Retract() { CurrentState = ExtractorState.Retracted; }
+
+ public DefaultExtractorAnimator()
+ {
+ CurrentState = ExtractorState.Retracted;
+ }
+ }
+
private IExtractorAnimator animator;
private List resources;
@@ -49,7 +61,7 @@ public Resource(ConfigNode node)
public override void OnStart(PartModule.StartState state)
{
this.part.force_activate();
- animator = part.Modules.OfType().Single();
+ animator = part.Modules.OfType().SingleOrDefault() ?? new DefaultExtractorAnimator();
headTransform = this.part.FindModelTransform(HeadTransform);
tailTransform = this.part.FindModelTransform(TailTransform);
diff --git a/Plugin/KethaneExtractorAnimatorLanded.cs b/Plugin/KethaneExtractorAnimatorLanded.cs
deleted file mode 100644
index 6f4c500..0000000
--- a/Plugin/KethaneExtractorAnimatorLanded.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-namespace Kethane
-{
- public class KethaneExtractorAnimatorLanded : PartModule, IExtractorAnimator
- {
- public ExtractorState CurrentState { get; private set; }
- public void Deploy() { CurrentState = ExtractorState.Deployed; }
- public void Retract() { CurrentState = ExtractorState.Retracted; }
-
- public KethaneExtractorAnimatorLanded()
- {
- CurrentState = ExtractorState.Retracted;
- }
- }
-}
diff --git a/Plugin/Properties/AssemblyInfo.cs b/Plugin/Properties/AssemblyInfo.cs
index c748168..47b67cd 100644
--- a/Plugin/Properties/AssemblyInfo.cs
+++ b/Plugin/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersion("0.7.6")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("0.7.7")]
\ No newline at end of file