Merge branch 'hotfix-0.7.7'

Majiir · Aug 13, 2013 · 711fe0a · 711fe0a
2 parents 739244e + 23acbb3
commit 711fe0a
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 25 deletions.
diff --git a/Parts/kethane_1m_converter/part.cfg b/Parts/kethane_1m_converter/part.cfg
@@ -47,16 +47,28 @@ fuelCrossFeed = True
 MODULE
 {
  name = KethaneConverter
- Label = Rocket Fuel
  InputRates
  {
  Kethane = 2.25
  ElectricCharge = 6
  }
  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
@@ -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
@@ -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
@@ -58,7 +58,6 @@
  <Compile Include="KethaneDetectorAnimatorUnity.cs" />
  <Compile Include="KethaneDrillAnimator.cs" />
  <Compile Include="KethaneDrillAnimatorLegacy.cs" />
- <Compile Include="KethaneExtractorAnimatorLanded.cs" />
  <Compile Include="KethaneGenerator.cs" />
  <Compile Include="KethaneKerbalBlender.cs" />
  <Compile Include="KethaneController.cs" />

diff --git 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
@@ -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<Resource> resources;
@@ -49,7 +61,7 @@ public Resource(ConfigNode node)
  public override void OnStart(PartModule.StartState state)
  {
  this.part.force_activate();
- animator = part.Modules.OfType<IExtractorAnimator>().Single();
+ animator = part.Modules.OfType<IExtractorAnimator>().SingleOrDefault() ?? new DefaultExtractorAnimator();
 
  headTransform = this.part.FindModelTransform(HeadTransform);
  tailTransform = this.part.FindModelTransform(TailTransform);

diff --git a/Plugin/KethaneExtractorAnimatorLanded.cs b/Plugin/KethaneExtractorAnimatorLanded.cs
diff --git 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")]
+[assembly: AssemblyInformationalVersion("0.7.7")]