From 8d619329833c2fabd4b76a6b4c100da010139d93 Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Mon, 12 Aug 2013 07:02:38 -0400 Subject: [PATCH 1/6] InstallChecker matches Kethane plugins by name, not assembly --- Plugin/InstallChecker.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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))); From 624fffa4b152108ed656d9b36412ac9c5865837d Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Mon, 12 Aug 2013 09:25:42 -0400 Subject: [PATCH 2/6] Replace KethaneExtractorAnimatorLanded with automatic default IExtractorAnimator --- Plugin/Kethane.csproj | 1 - Plugin/KethaneExtractor.cs | 14 +++++++++++++- Plugin/KethaneExtractorAnimatorLanded.cs | 15 --------------- 3 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 Plugin/KethaneExtractorAnimatorLanded.cs 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/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; - } - } -} From f9aafc22fb37646ba4103d3011198112247ad382 Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Mon, 12 Aug 2013 09:36:28 -0400 Subject: [PATCH 3/6] Fix KethaneDetectorAnimatorUnity animation speeds --- Plugin/KethaneDetectorAnimatorUnity.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } } } From c41eaaffd3a9d50e43b290b056bf65dbd3161a26 Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Mon, 12 Aug 2013 21:22:25 -0400 Subject: [PATCH 4/6] Converters should convert individual resources for now Partially reverts 5a28ec5ba6e8d1a7abe75bcc597b403d48667971 --- Parts/kethane_1m_converter/part.cfg | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) 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 } } From 6cd091c83b60ad6626ba40990eec3c0aa21e7c14 Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Mon, 12 Aug 2013 21:26:01 -0400 Subject: [PATCH 5/6] IExtractorAnimator is public --- Plugin/IExtractorAnimator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); From 23acbb3c808af6f9a222b7fb36682288e0a2c729 Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Mon, 12 Aug 2013 21:30:20 -0400 Subject: [PATCH 6/6] Version 0.7.7 --- Plugin/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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