First pass at storing bestOccludedRelay.
--- /dev/null
+++ b/.gitattributes
@@ -1,1 +1,13 @@
+* text=auto
+* eol=lf
+# These files are text and should be normalized (convert crlf => lf)
+*.cs text diff=csharp
+*.cfg text
+*.csproj text
+*.sln text
+
+# Images should be treated as binary
+# (binary is a macro for -text -diff)
+*.png binary
+
--- a/ARConfiguration.cs
+++ b/ARConfiguration.cs
@@ -7,53 +7,120 @@
using System;
using ToadicusTools;
using UnityEngine;
-
-[assembly: KSPAssemblyDependency("ToadicusTools", 0, 0)]
namespace AntennaRange
{
[KSPAddon(KSPAddon.Startup.SpaceCentre, false)]
public class ARConfiguration : MonoBehaviour
{
+ public static bool RequireLineOfSight
+ {
+ get;
+ private set;
+ }
+
+ public static double RadiusRatio
+ {
+ get;
+ private set;
+ }
+
+ public static bool RequireConnectionForControl
+ {
+ get;
+ private set;
+ }
+
+ public static bool FixedPowerCost
+ {
+ get;
+ private set;
+ }
+
private bool showConfigWindow;
private Rect configWindowPos;
private IButton toolbarButton;
+ private ApplicationLauncherButton appLauncherButton;
+
+ private System.Version runningVersion;
+
+ private KSP.IO.PluginConfiguration _config;
+ private KSP.IO.PluginConfiguration config
+ {
+ get
+ {
+ if (this._config == null)
+ {
+ this._config = KSP.IO.PluginConfiguration.CreateForType<AntennaRelay>();
+ }
+
+ return this._config;
+ }
+ }
public void Awake()
{
Tools.PostDebugMessage(this, "Waking up.");
+
+ this.runningVersion = this.GetType().Assembly.GetName().Version;
this.showConfigWindow = false;
this.configWindowPos = new Rect(Screen.width / 4, Screen.height / 2, 180, 15);
+
+ this.configWindowPos = this.LoadConfigValue("configWindowPos", this.configWindowPos);
+
+ ARConfiguration.RequireLineOfSight = this.LoadConfigValue("requireLineOfSight", false);
+
+ ARConfiguration.RadiusRatio = (1 - this.LoadConfigValue("graceRatio", .05d));
+ ARConfiguration.RadiusRatio *= ARConfiguration.RadiusRatio;
+
+ ARConfiguration.RequireConnectionForControl =
+ this.LoadConfigValue("requireConnectionForControl", false);
+
+ ARConfiguration.FixedPowerCost = this.LoadConfigValue("fixedPowerCost", false);
+
+ GameEvents.onGameSceneLoadRequested.Add(this.onSceneChangeRequested);
+
+ Debug.Log(string.Format("{0} v{1} - ARConfiguration loaded!", this.GetType().Name, this.runningVersion));
+
Tools.PostDebugMessage(this, "Awake.");
}
public void OnGUI()
{
- if (this.toolbarButton == null && ToolbarManager.ToolbarAvailable)
- {
- Tools.PostDebugMessage(this, "Toolbar available; initializing button.");
-
- this.toolbarButton = ToolbarManager.Instance.add("AntennaRange", "ARConfiguration");
- this.toolbarButton.Visibility = new GameScenesVisibility(GameScenes.SPACECENTER);
- this.toolbarButton.Text = "AR";
- this.toolbarButton.TexturePath = "AntennaRange/Textures/toolbarIcon";
- this.toolbarButton.TextColor = (Color)XKCDColors.Amethyst;
- this.toolbarButton.OnClick += delegate(ClickEvent e)
- {
- this.showConfigWindow = !this.showConfigWindow;
- };
-
- var config = KSP.IO.PluginConfiguration.CreateForType<AntennaRelay>();
-
- config.load();
-
- this.configWindowPos = config.GetValue<Rect>("configWindowPos", this.configWindowPos);
- AntennaRelay.requireLineOfSight = config.GetValue<bool>("requireLineOfSight", false);
-
- config.save();
+ // Only runs once, if the Toolbar is available.
+ if (ToolbarManager.ToolbarAvailable)
+ {
+ if (this.toolbarButton == null)
+ {
+ Tools.PostDebugMessage(this, "Toolbar available; initializing toolbar button.");
+
+ this.toolbarButton = ToolbarManager.Instance.add("AntennaRange", "ARConfiguration");
+ this.toolbarButton.Visibility = new GameScenesVisibility(GameScenes.SPACECENTER);
+ this.toolbarButton.Text = "AR";
+ this.toolbarButton.TexturePath = "AntennaRange/Textures/toolbarIcon";
+ this.toolbarButton.TextColor = (Color)XKCDColors.Amethyst;
+ this.toolbarButton.OnClick += delegate(ClickEvent e)
+ {
+ this.toggleConfigWindow();
+ };
+ }
+ }
+ else if (this.appLauncherButton == null && ApplicationLauncher.Ready)
+ {
+ Tools.PostDebugMessage(this, "Toolbar available; initializing AppLauncher button.");
+
+ this.appLauncherButton = ApplicationLauncher.Instance.AddModApplication(
+ this.toggleConfigWindow,
+ this.toggleConfigWindow,
+ ApplicationLauncher.AppScenes.SPACECENTER,
+ GameDatabase.Instance.GetTexture(
+ "AntennaRange/Textures/appLauncherIcon",
+ false
+ )
+ );
}
if (this.showConfigWindow)
@@ -61,7 +128,7 @@
Rect configPos = GUILayout.Window(354163056,
this.configWindowPos,
this.ConfigWindow,
- "AntennaRange Configuration",
+ string.Format("AntennaRange {0}.{1}", this.runningVersion.Major, this.runningVersion.Minor),
GUILayout.ExpandHeight(true),
GUILayout.ExpandWidth(true)
);
@@ -81,46 +148,115 @@
GUILayout.BeginVertical(GUILayout.ExpandHeight(true));
GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
- bool requireLineOfSight = GUILayout.Toggle(AntennaRelay.requireLineOfSight, "Require Line of Sight");
- if (requireLineOfSight != AntennaRelay.requireLineOfSight)
- {
- AntennaRelay.requireLineOfSight = requireLineOfSight;
+
+ bool requireLineOfSight = GUITools.Toggle(ARConfiguration.RequireLineOfSight, "Require Line of Sight");
+ if (requireLineOfSight != ARConfiguration.RequireLineOfSight)
+ {
+ ARConfiguration.RequireLineOfSight = requireLineOfSight;
this.SaveConfigValue("requireLineOfSight", requireLineOfSight);
}
GUILayout.EndHorizontal();
+ GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+ bool requireConnectionForControl =
+ GUITools.Toggle(
+ ARConfiguration.RequireConnectionForControl,
+ "Require Connection for Probe Control"
+ );
+ if (requireConnectionForControl != ARConfiguration.RequireConnectionForControl)
+ {
+ ARConfiguration.RequireConnectionForControl = requireConnectionForControl;
+ this.SaveConfigValue("requireConnectionForControl", requireConnectionForControl);
+ }
+
+ GUILayout.EndHorizontal();
+
+ GUILayout.BeginHorizontal();
+
+ bool fixedPowerCost = GUITools.Toggle(ARConfiguration.FixedPowerCost, "Use Fixed Power Cost");
+ if (fixedPowerCost != ARConfiguration.FixedPowerCost)
+ {
+ ARConfiguration.FixedPowerCost = fixedPowerCost;
+ this.SaveConfigValue("fixedPowerCost", fixedPowerCost);
+ }
+
+ GUILayout.EndHorizontal();
+
+ if (requireLineOfSight)
+ {
+ GUILayout.BeginHorizontal();
+
+ double graceRatio = 1d - Math.Sqrt(ARConfiguration.RadiusRatio);
+ double newRatio;
+
+ GUILayout.Label(string.Format("Line of Sight 'Fudge Factor': {0:P0}", graceRatio));
+
+ GUILayout.EndHorizontal();
+
+ GUILayout.BeginHorizontal();
+
+ newRatio = GUILayout.HorizontalSlider((float)graceRatio, 0f, 1f, GUILayout.ExpandWidth(true));
+ newRatio = Math.Round(newRatio, 2);
+
+ if (newRatio != graceRatio)
+ {
+ ARConfiguration.RadiusRatio = (1d - newRatio) * (1d - newRatio);
+ this.SaveConfigValue("graceRatio", newRatio);
+ }
+
+ GUILayout.EndHorizontal();
+ }
+
GUILayout.EndVertical();
GUI.DragWindow();
}
- public void Destroy()
- {
+ public void OnDestroy()
+ {
+ GameEvents.onGameSceneLoadRequested.Remove(this.onSceneChangeRequested);
+
if (this.toolbarButton != null)
{
this.toolbarButton.Destroy();
}
+
+ if (this.appLauncherButton != null)
+ {
+ ApplicationLauncher.Instance.RemoveModApplication(this.appLauncherButton);
+ }
+ }
+
+ protected void onSceneChangeRequested(GameScenes scene)
+ {
+ if (scene != GameScenes.SPACECENTER)
+ {
+ print("ARConfiguration: Requesting Destruction.");
+ MonoBehaviour.Destroy(this);
+ }
+ }
+
+ private void toggleConfigWindow()
+ {
+ this.showConfigWindow = !this.showConfigWindow;
}
private T LoadConfigValue<T>(string key, T defaultValue)
{
- var config = KSP.IO.PluginConfiguration.CreateForType<AntennaRelay>();
-
- config.load();
+ this.config.load();
return config.GetValue(key, defaultValue);
}
private void SaveConfigValue<T>(string key, T value)
{
- var config = KSP.IO.PluginConfiguration.CreateForType<AntennaRelay>();
-
- config.load();
-
- config.SetValue(key, value);
-
- config.save();
+ this.config.load();
+
+ this.config.SetValue(key, value);
+
+ this.config.save();
}
}
}
--- a/ARFlightController.cs
+++ b/ARFlightController.cs
@@ -25,16 +25,315 @@
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using KSP;
using System;
+using System.Collections.Generic;
+using ToadicusTools;
+using UnityEngine;
namespace AntennaRange
{
- public class ARFlightController
+ [KSPAddon(KSPAddon.Startup.Flight, false)]
+ public class ARFlightController : MonoBehaviour
{
- public ARFlightController()
- {
+ #region Fields
+ protected Dictionary<ConnectionStatus, string> connectionTextures;
+ protected Dictionary<ConnectionStatus, Texture> appLauncherTextures;
+
+ protected IButton toolbarButton;
+
+ protected ApplicationLauncherButton appLauncherButton;
+ #endregion
+
+ #region Properties
+ public ConnectionStatus currentConnectionStatus
+ {
+ get;
+ protected set;
+ }
+
+ protected string currentConnectionTexture
+ {
+ get
+ {
+ return this.connectionTextures[this.currentConnectionStatus];
+ }
+ }
+
+ protected Texture currentAppLauncherTexture
+ {
+ get
+ {
+ return this.appLauncherTextures[this.currentConnectionStatus];
+ }
+ }
+
+ public ControlTypes currentControlLock
+ {
+ get
+ {
+ if (this.lockID == string.Empty)
+ {
+ return ControlTypes.None;
+ }
+
+ return InputLockManager.GetControlLock(this.lockID);
+ }
+ }
+
+ public string lockID
+ {
+ get;
+ protected set;
+ }
+
+ public ControlTypes lockSet
+ {
+ get
+ {
+ return ControlTypes.ALL_SHIP_CONTROLS;
+ }
+ }
+
+ public Vessel vessel
+ {
+ get
+ {
+ if (FlightGlobals.ready && FlightGlobals.ActiveVessel != null)
+ {
+ return FlightGlobals.ActiveVessel;
+ }
+
+ return null;
+ }
+ }
+ #endregion
+
+ #region MonoBehaviour LifeCycle
+ protected void Awake()
+ {
+ this.lockID = "ARConnectionRequired";
+
+ this.connectionTextures = new Dictionary<ConnectionStatus, string>();
+
+ this.connectionTextures[ConnectionStatus.None] = "AntennaRange/Textures/toolbarIconNoConnection";
+ this.connectionTextures[ConnectionStatus.Suboptimal] = "AntennaRange/Textures/toolbarIconSubOptimal";
+ this.connectionTextures[ConnectionStatus.Optimal] = "AntennaRange/Textures/toolbarIcon";
+
+ this.appLauncherTextures = new Dictionary<ConnectionStatus, Texture>();
+
+ this.appLauncherTextures[ConnectionStatus.None] =
+ GameDatabase.Instance.GetTexture("AntennaRange/Textures/appLauncherIconNoConnection", false);
+ this.appLauncherTextures[ConnectionStatus.Suboptimal] =
+ GameDatabase.Instance.GetTexture("AntennaRange/Textures/appLauncherIconSubOptimal", false);
+ this.appLauncherTextures[ConnectionStatus.Optimal] =
+ GameDatabase.Instance.GetTexture("AntennaRange/Textures/appLauncherIcon", false);
+
+ if (ToolbarManager.ToolbarAvailable)
+ {
+ this.toolbarButton = ToolbarManager.Instance.add("AntennaRange", "ARConnectionStatus");
+
+ this.toolbarButton.TexturePath = this.connectionTextures[ConnectionStatus.None];
+ this.toolbarButton.Text = "AntennaRange";
+ this.toolbarButton.Visibility = new GameScenesVisibility(GameScenes.FLIGHT);
+ this.toolbarButton.Enabled = false;
+ }
+
+ GameEvents.onGameSceneLoadRequested.Add(this.onSceneChangeRequested);
+ GameEvents.onVesselChange.Add(this.onVesselChange);
+ }
+
+ protected void FixedUpdate()
+ {
+ if (this.appLauncherButton == null && !ToolbarManager.ToolbarAvailable && ApplicationLauncher.Ready)
+ {
+ this.appLauncherButton = ApplicationLauncher.Instance.AddModApplication(
+ ApplicationLauncher.AppScenes.FLIGHT,
+ this.appLauncherTextures[ConnectionStatus.None]
+ );
+ }
+
+ Tools.DebugLogger log = Tools.DebugLogger.New(this);
+
+ VesselCommand availableCommand;
+
+ if (ARConfiguration.RequireConnectionForControl)
+ {
+ availableCommand = this.vessel.CurrentCommand();
+ }
+ else
+ {
+ availableCommand = VesselCommand.Crew;
+ }
+
+ log.AppendFormat("availableCommand: {0}\n\t" +
+ "(availableCommand & VesselCommand.Crew) == VesselCommand.Crew: {1}\n\t" +
+ "(availableCommand & VesselCommand.Probe) == VesselCommand.Probe: {2}\n\t" +
+ "vessel.HasConnectedRelay(): {3}",
+ (int)availableCommand,
+ (availableCommand & VesselCommand.Crew) == VesselCommand.Crew,
+ (availableCommand & VesselCommand.Probe) == VesselCommand.Probe,
+ vessel.HasConnectedRelay()
+ );
+
+ // If we are requiring a connection for control, the vessel does not have any adequately staffed pods,
+ // and the vessel does not have any connected relays...
+ if (
+ HighLogic.LoadedSceneIsFlight &&
+ ARConfiguration.RequireConnectionForControl &&
+ this.vessel != null &&
+ this.vessel.vesselType != VesselType.EVA &&
+ !(
+ (availableCommand & VesselCommand.Crew) == VesselCommand.Crew ||
+ (availableCommand & VesselCommand.Probe) == VesselCommand.Probe && vessel.HasConnectedRelay()
+ ))
+ {
+ // ...and if the controls are not currently locked...
+ if (currentControlLock == ControlTypes.None)
+ {
+ // ...lock the controls.
+ InputLockManager.SetControlLock(this.lockSet, this.lockID);
+ }
+ }
+ // ...otherwise, if the controls are locked...
+ else if (currentControlLock != ControlTypes.None)
+ {
+ // ...unlock the controls.
+ InputLockManager.RemoveControlLock(this.lockID);
+ }
+
+ if (
+ (this.toolbarButton != null || this.appLauncherButton != null) &&
+ HighLogic.LoadedSceneIsFlight &&
+ FlightGlobals.ActiveVessel != null
+ )
+ {
+ log.Append("Checking vessel relay status.\n");
+
+ List<ModuleLimitedDataTransmitter> relays =
+ FlightGlobals.ActiveVessel.getModulesOfType<ModuleLimitedDataTransmitter>();
+
+ log.AppendFormat("\t...found {0} relays\n", relays.Count);
+
+ bool vesselCanTransmit = false;
+ bool vesselHasOptimalRelay = false;
+
+ foreach (ModuleLimitedDataTransmitter relay in relays)
+ {
+ log.AppendFormat("\tvesselCanTransmit: {0}, vesselHasOptimalRelay: {1}\n",
+ vesselCanTransmit, vesselHasOptimalRelay);
+
+ log.AppendFormat("\tChecking relay {0}\n" +
+ "\t\tCanTransmit: {1}, transmitDistance: {2}, nominalRange: {3}\n",
+ relay,
+ relay.CanTransmit(),
+ relay.transmitDistance,
+ relay.nominalRange
+ );
+
+ bool relayCanTransmit = relay.CanTransmit();
+
+ if (!vesselCanTransmit && relayCanTransmit)
+ {
+ vesselCanTransmit = true;
+ }
+
+ if (!vesselHasOptimalRelay &&
+ relayCanTransmit &&
+ relay.transmitDistance <= (double)relay.nominalRange)
+ {
+ vesselHasOptimalRelay = true;
+ }
+
+ if (vesselCanTransmit && vesselHasOptimalRelay)
+ {
+ break;
+ }
+ }
+
+ log.AppendFormat("Done checking. vesselCanTransmit: {0}, vesselHasOptimalRelay: {1}\n",
+ vesselCanTransmit, vesselHasOptimalRelay);
+
+ if (vesselHasOptimalRelay)
+ {
+ this.currentConnectionStatus = ConnectionStatus.Optimal;
+ }
+ else if (vesselCanTransmit)
+ {
+ this.currentConnectionStatus = ConnectionStatus.Suboptimal;
+ }
+ else
+ {
+ this.currentConnectionStatus = ConnectionStatus.None;
+ }
+
+ log.AppendFormat("currentConnectionStatus: {0}, setting texture to {1}",
+ this.currentConnectionStatus, this.currentConnectionTexture);
+
+ if (this.toolbarButton != null)
+ {
+ this.toolbarButton.TexturePath = this.currentConnectionTexture;
+
+ if (this.currentConnectionStatus == ConnectionStatus.None)
+ {
+ this.toolbarButton.Important = true;
+ }
+ else
+ {
+ this.toolbarButton.Important = false;
+ }
+ }
+ if (this.appLauncherButton != null)
+ {
+ this.appLauncherButton.SetTexture(this.currentAppLauncherTexture);
+ }
+ }
+
+ log.Print();
+ }
+
+ protected void OnDestroy()
+ {
+ InputLockManager.RemoveControlLock(this.lockID);
+
+ if (this.toolbarButton != null)
+ {
+ this.toolbarButton.Destroy();
+ }
+
+ if (this.appLauncherButton != null)
+ {
+ ApplicationLauncher.Instance.RemoveModApplication(this.appLauncherButton);
+ this.appLauncherButton = null;
+ }
+
+ GameEvents.onGameSceneLoadRequested.Remove(this.onSceneChangeRequested);
+ GameEvents.onVesselChange.Remove(this.onVesselChange);
+
+ print("ARFlightController: Destroyed.");
+ }
+ #endregion
+
+ #region Event Handlers
+ protected void onSceneChangeRequested(GameScenes scene)
+ {
+ print("ARFlightController: Requesting Destruction.");
+ MonoBehaviour.Destroy(this);
+ }
+
+ protected void onVesselChange(Vessel vessel)
+ {
+ InputLockManager.RemoveControlLock(this.lockID);
+ }
+ #endregion
+
+ public enum ConnectionStatus
+ {
+ None,
+ Suboptimal,
+ Optimal
}
}
}
-
--- a/AntennaRange.cfg
+++ /dev/null
@@ -1,72 +1,1 @@
-// AntennaRange
-//
-// AntennaRange.cfg
-//
-// Copyright © 2014, toadicus
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation and/or other
-// materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used
-// to endorse or promote products derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// This software uses the ModuleManager library © 2013 ialdabaoth, used under a Creative Commons Attribution-ShareAlike
-// 3.0 Uported License.
-//
-// Specifications:
-// nominalRange: The distance from Kerbin at which the antenna will perform exactly as prescribed by
-// packetResourceCost and packetSize.
-// maxPowerFactor: The multiplier on packetResourceCost that defines the maximum power output of the antenna. When the
-// power cost exceeds packetResourceCost * maxPowerFactor, transmission will fail.
-// maxDataFactor: The multipler on packetSize that defines the maximum data bandwidth of the antenna.
-//
-@PART[longAntenna]:FOR[AntennaRange]:NEEDS[!RemoteTech2]
-{
- @MODULE[ModuleDataTransmitter]
- {
- @name = ModuleLimitedDataTransmitter
- nominalRange = 1500000
- maxPowerFactor = 8
- maxDataFactor = 4
- }
-}
-
-@PART[mediumDishAntenna]:FOR[AntennaRange]:NEEDS[!RemoteTech2]
-{
- @MODULE[ModuleDataTransmitter]
- {
- @name = ModuleLimitedDataTransmitter
- nominalRange = 30000000
- maxPowerFactor = 8
- maxDataFactor = 4
- }
-}
-
-@PART[commDish]:FOR[AntennaRange]:NEEDS[!RemoteTech2]
-{
- @MODULE[ModuleDataTransmitter]
- {
- @name = ModuleLimitedDataTransmitter
- nominalRange = 80000000000
- maxPowerFactor = 8
- maxDataFactor = 4
- }
-}
-
--- a/AntennaRange.csproj
+++ b/AntennaRange.csproj
@@ -9,9 +9,10 @@
<OutputType>Library</OutputType>
<RootNamespace>AntennaRange</RootNamespace>
<AssemblyName>AntennaRange</AssemblyName>
- <ReleaseVersion>1.1</ReleaseVersion>
+ <ReleaseVersion>1.3</ReleaseVersion>
<SynchReleaseVersion>false</SynchReleaseVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <UseMSBuildEngine>False</UseMSBuildEngine>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_win|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -24,8 +25,7 @@
<ConsolePause>false</ConsolePause>
<CustomCommands>
<CustomCommands>
- <Command type="AfterBuild" command="xcopy /y ${ProjectDir}\AntennaRange.cfg C:\Users\andy\Games\KSP_win\GameData\AntennaRange\" />
- <Command type="AfterBuild" command="xcopy /y ${TargetFile} C:\Users\andy\Games\KSP_win\GameData\AntennaRange\" />
+ <Command type="AfterBuild" command="xcopy /y ${TargetFile} ${ProjectDir}\GameData\AntennaRange\" />
</CustomCommands>
</CustomCommands>
</PropertyGroup>
@@ -37,8 +37,7 @@
<ConsolePause>false</ConsolePause>
<CustomCommands>
<CustomCommands>
- <Command type="AfterBuild" command="xcopy /y ${ProjectDir}\AntennaRange.cfg C:\Users\andy\Games\KSP_win\GameData\AntennaRange\" />
- <Command type="AfterBuild" command="xcopy /y ${TargetFile} C:\Users\andy\Games\KSP_win\GameData\AntennaRange\" />
+ <Command type="AfterBuild" command="xcopy /y ${TargetFile} ${ProjectDir}\GameData\AntennaRange\" />
</CustomCommands>
</CustomCommands>
</PropertyGroup>
@@ -53,7 +52,7 @@
<ConsolePause>false</ConsolePause>
<CustomCommands>
<CustomCommands>
- <Command type="AfterBuild" command="cp -afv ${TargetFile} ${ProjectDir}/${ProjectName}.cfg /opt/games/KSP_linux/GameData/${ProjectName}/" />
+ <Command type="AfterBuild" command="cp -afv ${TargetFile} ${ProjectDir}/GameData/${ProjectName}/" />
</CustomCommands>
</CustomCommands>
</PropertyGroup>
@@ -64,7 +63,7 @@
<WarningLevel>4</WarningLevel>
<CustomCommands>
<CustomCommands>
- <Command type="AfterBuild" command="cp -afv ${TargetFile} ${ProjectDir}/${ProjectName}.cfg /opt/games/KSP_linux/GameData/${ProjectName}/" />
+ <Command type="AfterBuild" command="cp -afv ${TargetFile} ${ProjectDir}/GameData/${ProjectName}/" />
</CustomCommands>
</CustomCommands>
<ConsolePause>false</ConsolePause>
@@ -82,9 +81,18 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
- <None Include="AntennaRange.cfg">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
+ <Reference Include="Assembly-CSharp">
+ <HintPath>..\_KSPAssemblies\Assembly-CSharp.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="System">
+ <HintPath>..\_KSPAssemblies\System.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="UnityEngine">
+ <HintPath>..\_KSPAssemblies\UnityEngine.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ToadicusTools\ToadicusTools.csproj">
@@ -93,14 +101,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <Reference Include="Assembly-CSharp">
- <HintPath>..\_KSPAssemblies\Assembly-CSharp.dll</HintPath>
- </Reference>
- <Reference Include="System">
- <HintPath>..\_KSPAssemblies\System.dll</HintPath>
- </Reference>
- <Reference Include="UnityEngine">
- <HintPath>..\_KSPAssemblies\UnityEngine.dll</HintPath>
- </Reference>
+ <None Include="GameData\AntennaRange\AntennaRange.cfg" />
+ <None Include="GameData\AntennaRange\ATM_AntennaRange.cfg" />
</ItemGroup>
</Project>
--- a/AntennaRelay.cs
+++ b/AntennaRelay.cs
@@ -31,16 +31,30 @@
using System.Linq;
using ToadicusTools;
+// @DONE TODO: Retool nearestRelay to always contain the nearest relay, even if out of range.
+// @DONE TODO: Retool CanTransmit to not rely on nearestRelay == null.
+// TODO: Track occluded vessels somehow.
+
namespace AntennaRange
{
public class AntennaRelay
{
- public static bool requireLineOfSight;
-
// We don't have a Bard, so we'll hide Kerbin here.
- protected CelestialBody Kerbin;
-
- protected IAntennaRelay _nearestRelayCache;
+ private static CelestialBody _Kerbin;
+ protected static CelestialBody Kerbin
+ {
+ get
+ {
+ if (_Kerbin == null && FlightGlobals.ready)
+ {
+ _Kerbin = FlightGlobals.GetHomeBody();
+ }
+
+ return _Kerbin;
+ }
+ }
+
+ private IAntennaRelay _nearestRelayCache;
protected IAntennaRelay moduleRef;
protected System.Diagnostics.Stopwatch searchTimer;
@@ -66,10 +80,11 @@
{
get
{
- if (this.searchTimer.IsRunning &&
+ if (!this.searchTimer.IsRunning ||
this.searchTimer.ElapsedMilliseconds > this.millisecondsBetweenSearches)
{
this._nearestRelayCache = this.FindNearestRelay();
+
this.searchTimer.Restart();
}
@@ -79,6 +94,21 @@
{
this._nearestRelayCache = value;
}
+ }
+
+ public IAntennaRelay bestOccludedRelay
+ {
+ get;
+ protected set;
+ }
+
+ /// <summary>
+ /// Gets the first <see cref="CelestialBody"/> found to be blocking line of sight.
+ /// </summary>
+ public virtual CelestialBody firstOccludingBody
+ {
+ get;
+ protected set;
}
/// <summary>
@@ -89,19 +119,28 @@
{
get
{
- this.nearestRelay = this.FindNearestRelay();
-
// If there is no available relay nearby...
- if (this.nearestRelay == null)
- {
- // .. return the distance to Kerbin
- return this.DistanceTo(this.Kerbin);
- }
- else
- {
- /// ...otherwise, return the distance to the nearest available relay.
- return this.DistanceTo(nearestRelay);
- }
+ // @DONE TODO: Remove nearestRelay == null
+ double kerbinDistance = this.DistanceTo(Kerbin);
+
+ if (this.nearestRelay != null)
+ {
+ double relayDistance = this.DistanceTo(this.nearestRelay);
+
+ // If our nearest relay is nearer than Kerbin, use its distance.
+ if (relayDistance < kerbinDistance)
+ {
+ this.KerbinDirect = false;
+
+ return relayDistance;
+ }
+ }
+
+ this.KerbinDirect = true;
+
+
+ // .. return the distance to Kerbin
+ return kerbinDistance;
}
}
@@ -126,21 +165,45 @@
protected set;
}
+ public virtual bool KerbinDirect
+ {
+ get;
+ protected set;
+ }
+
/// <summary>
/// Determines whether this instance can transmit.
/// </summary>
/// <returns><c>true</c> if this instance can transmit; otherwise, <c>false</c>.</returns>
public virtual bool CanTransmit()
{
- if (
- this.transmitDistance > this.maxTransmitDistance ||
- (requireLineOfSight && this.nearestRelay == null && !this.vessel.hasLineOfSightTo(this.Kerbin))
- )
- {
+ CelestialBody fob = null;
+
+ // @DONE TODO: Remove nearestRelay == null
+ // Because we're correctly falling back to Kerbin in transmitDistance the first test should always fail
+ // when we're out of range of anything, and the second will fail when LOS is blocked (and enforced).
+
+ // If our transmit distance is greater than our maximum range, we can't transmit and it doesn't matter why.
+ if (this.transmitDistance > this.maxTransmitDistance)
+ {
+ this.firstOccludingBody = null;
return false;
}
+ // ...if we're in range...
else
{
+ // ...check for LOS problems...
+ if (
+ ARConfiguration.RequireLineOfSight
+ && this.KerbinDirect &&
+ !this.vessel.hasLineOfSightTo(Kerbin, out fob, ARConfiguration.RadiusRatio)
+ )
+ {
+ this.firstOccludingBody = fob;
+ return false;
+ }
+
+ this.firstOccludingBody = null;
return true;
}
}
@@ -149,9 +212,9 @@
/// Finds the nearest relay.
/// </summary>
/// <returns>The nearest relay or null, if no relays in range.</returns>
- public IAntennaRelay FindNearestRelay()
- {
- if (this.searchTimer.IsRunning && this.searchTimer.ElapsedMilliseconds < this.millisecondsBetweenSearches)
+ private IAntennaRelay FindNearestRelay()
+ {
+ /*if (this.searchTimer.IsRunning && this.searchTimer.ElapsedMilliseconds < this.millisecondsBetweenSearches)
{
return this.nearestRelay;
}
@@ -162,7 +225,7 @@
this.searchTimer.Reset();
}
- this.searchTimer.Start();
+ this.searchTimer.Start();*/
Tools.PostDebugMessage(string.Format(
"{0}: finding nearest relay for {1} ({2})",
@@ -171,10 +234,15 @@
this.vessel.id
));
+ this.firstOccludingBody = null;
+ this.bestOccludedRelay = null;
+
// Set this vessel as checked, so that we don't check it again.
RelayDatabase.Instance.CheckedVesselsTable[vessel.id] = true;
double nearestSqrDistance = double.PositiveInfinity;
+ double bestOccludedSqrDistance = double.PositiveInfinity;
+
IAntennaRelay _nearestRelay = null;
/*
@@ -210,31 +278,47 @@
continue;
}
+ // Find the distance from here to the vessel...
+ double potentialSqrDistance = this.sqrDistanceTo(potentialVessel);
+
// Skip vessels to which we do not have line of sight.
- if (requireLineOfSight && !this.vessel.hasLineOfSightTo(potentialVessel))
+ CelestialBody fob = null;
+
+ if (
+ ARConfiguration.RequireLineOfSight &&
+ !this.vessel.hasLineOfSightTo(potentialVessel, out fob, ARConfiguration.RadiusRatio)
+ )
{
Tools.PostDebugMessage(
this,
"Vessel {0} discarded because we do not have line of sight.",
potentialVessel.vesselName
);
+
+ if (
+ potentialSqrDistance < bestOccludedSqrDistance &&
+ potentialSqrDistance < this.maxTransmitDistance
+ )
+ {
+ foreach (IAntennaRelay occludedRelay in potentialVessel.GetAntennaRelays())
+ {
+ if (occludedRelay.CanTransmit())
+ {
+ this.bestOccludedRelay = occludedRelay;
+ this.firstOccludingBody = fob;
+ bestOccludedSqrDistance = potentialSqrDistance;
+ break;
+ }
+ }
+ }
+
continue;
}
- // Find the distance from here to the vessel...
- double potentialSqrDistance = (potentialVessel.GetWorldPos3D() - vessel.GetWorldPos3D()).sqrMagnitude;
-
/*
- * ...so that we can skip the vessel if it is further away than Kerbin, our transmit distance, or a
- * vessel we've already checked.
+ * ...so that we can skip the vessel if it is further away than a vessel we've already checked.
* */
- if (
- potentialSqrDistance > Tools.Min(
- this.maxTransmitDistance * this.maxTransmitDistance,
- nearestSqrDistance,
- this.vessel.sqrDistanceTo(Kerbin)
- )
- )
+ if (potentialSqrDistance > nearestSqrDistance)
{
Tools.PostDebugMessage(
this,
@@ -279,21 +363,6 @@
this.searchTimer = new System.Diagnostics.Stopwatch();
this.millisecondsBetweenSearches = 5000;
-
- // HACK: This might not be safe in all circumstances, but since AntennaRelays are not built until Start,
- // we hope it is safe enough.
- this.Kerbin = FlightGlobals.Bodies.FirstOrDefault(b => b.name == "Kerbin");
- }
-
- static AntennaRelay()
- {
- var config = KSP.IO.PluginConfiguration.CreateForType<AntennaRelay>();
-
- config.load();
-
- AntennaRelay.requireLineOfSight = config.GetValue<bool>("requireLineOfSight", false);
-
- config.save();
}
}
}
--- /dev/null
+++ b/GameData/AntennaRange/ATM_AntennaRange.cfg
@@ -1,1 +1,15 @@
-
+ACTIVE_TEXTURE_MANAGER_CONFIG
+{
+ folder = AntennaRange
+ enabled = true
+ OVERRIDES
+ {
+ AntennaRange/.*
+ {
+ compress = true
+ mipmaps = false
+ scale = 1
+ max_size = 0
+ }
+ }
+}
--- /dev/null
+++ b/GameData/AntennaRange/AntennaRange.cfg
@@ -1,1 +1,129 @@
+// AntennaRange
+//
+// AntennaRange.cfg
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation and/or other
+// materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+// to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// This software uses the ModuleManager library © 2013 ialdabaoth, used under a Creative Commons Attribution-ShareAlike
+// 3.0 Uported License.
+//
+// Specifications:
+// nominalRange: The distance from Kerbin at which the antenna will perform exactly as prescribed by
+// packetResourceCost and packetSize.
+// maxPowerFactor: The multiplier on packetResourceCost that defines the maximum power output of the antenna. When the
+// power cost exceeds packetResourceCost * maxPowerFactor, transmission will fail.
+// maxDataFactor: The multipler on packetSize that defines the maximum data bandwidth of the antenna.
+//
+@PART[longAntenna]:FOR[AntennaRange]:NEEDS[!RemoteTech2]
+{
+ @MODULE[ModuleDataTransmitter]
+ {
+ @name = ModuleLimitedDataTransmitter
+ nominalRange = 1500000
+ maxPowerFactor = 8
+ maxDataFactor = 4
+ }
+
+ MODULE
+ {
+ name = ModuleScienceContainer
+
+ dataIsCollectable = true
+ dataIsStorable = false
+
+ storageRange = 2
+ }
+}
+
+@PART[mediumDishAntenna]:FOR[AntennaRange]:NEEDS[!RemoteTech2]
+{
+ @MODULE[ModuleDataTransmitter]
+ {
+ @name = ModuleLimitedDataTransmitter
+ nominalRange = 30000000
+ maxPowerFactor = 8
+ maxDataFactor = 4
+ }
+
+ MODULE
+ {
+ name = ModuleScienceContainer
+
+ dataIsCollectable = true
+ dataIsStorable = false
+
+ storageRange = 2
+ }
+}
+
+@PART[commDish]:FOR[AntennaRange]:NEEDS[!RemoteTech2]
+{
+ @MODULE[ModuleDataTransmitter]
+ {
+ @name = ModuleLimitedDataTransmitter
+ nominalRange = 80000000000
+ maxPowerFactor = 8
+ maxDataFactor = 4
+ }
+
+ MODULE
+ {
+ name = ModuleScienceContainer
+
+ dataIsCollectable = true
+ dataIsStorable = false
+
+ storageRange = 2
+ }
+}
+
+EVA_MODULE
+{
+ name = ModuleLimitedDataTransmitter
+
+ nominalRange = 5000
+ maxPowerFactor = 1
+ maxDataFactor = 1
+
+ packetInterval = 0.2
+ packetSize = 1
+ packetResourceCost = 6.25
+
+ requiredResource = ElectricCharge
+}
+
+EVA_RESOURCE
+{
+ name = ElectricCharge
+ amount = 100
+ maxAmount = 100
+}
+
+@EVA_RESOURCE[ElectricCharge]:AFTER[AntennaRange]:NEEDS[TacLifeSupport]
+{
+ !name = DELETE
+}
+
Binary files /dev/null and b/GameData/AntennaRange/Textures/appLauncherIcon.png differ
Binary files /dev/null and b/GameData/AntennaRange/Textures/appLauncherIconNoConnection.png differ
Binary files /dev/null and b/GameData/AntennaRange/Textures/appLauncherIconSubOptimal.png differ
Binary files /dev/null and b/GameData/AntennaRange/Textures/toolbarIcon.png differ
Binary files /dev/null and b/GameData/AntennaRange/Textures/toolbarIconNoConnection.png differ
Binary files /dev/null and b/GameData/AntennaRange/Textures/toolbarIconSubOptimal.png differ
--- a/IAntennaRelay.cs
+++ b/IAntennaRelay.cs
@@ -55,11 +55,23 @@
float maxTransmitDistance { get; }
/// <summary>
+ /// The first CelestialBody blocking line of sight to a
+ /// </summary>
+ /// <value>The first occluding body.</value>
+ CelestialBody firstOccludingBody { get; }
+
+ /// <summary>
/// Gets a value indicating whether this <see cref="AntennaRange.ProtoDataTransmitter"/> has been checked during
/// the current relay attempt.
/// </summary>
/// <value><c>true</c> if relay checked; otherwise, <c>false</c>.</value>
bool relayChecked { get; }
+
+ /// <summary>
+ /// Gets a value indicating whether this <see cref="AntennaRange.IAntennaRelay"/> Relay is communicating
+ /// directly with Kerbin.
+ /// </summary>
+ bool KerbinDirect { get; }
/// <summary>
/// Determines whether this instance can transmit.
--- a/ModuleLimitedDataTransmitter.cs
+++ b/ModuleLimitedDataTransmitter.cs
@@ -74,6 +74,12 @@
[KSPField(isPersistant = false)]
public float nominalRange;
+ [KSPField(isPersistant = false, guiActive = true, guiName = "Status")]
+ public string UIrelayStatus;
+
+ [KSPField(isPersistant = false, guiActive = true, guiName = "Relay")]
+ public string UIrelayTarget;
+
[KSPField(isPersistant = false, guiActive = true, guiName = "Transmission Distance")]
public string UItransmitDistance;
@@ -134,6 +140,14 @@
get
{
return Mathf.Sqrt (this.maxPowerFactor) * this.nominalRange;
+ }
+ }
+
+ public CelestialBody firstOccludingBody
+ {
+ get
+ {
+ return this.relay.firstOccludingBody;
}
}
@@ -206,7 +220,26 @@
{
get
{
- return this.relay.relayChecked;
+ if (this.relay != null)
+ {
+ return this.relay.relayChecked;
+ }
+
+ // If our relay is null, always return null so we're never checked.
+ return true;
+ }
+ }
+
+ public bool KerbinDirect
+ {
+ get
+ {
+ if (this.relay != null)
+ {
+ return this.relay.KerbinDirect;
+ }
+
+ return false;
}
}
@@ -220,32 +253,9 @@
this.packetThrottle = 100f;
}
- // At least once, when the module starts with a state on the launch pad or later, go find Kerbin.
- public override void OnStart (StartState state)
- {
- base.OnStart (state);
-
- if (state >= StartState.PreLaunch)
- {
- this.relay = new AntennaRelay(this);
- this.relay.maxTransmitDistance = this.maxTransmitDistance;
-
- this.UImaxTransmitDistance = Tools.MuMech_ToSI(this.maxTransmitDistance) + "m";
-
- GameEvents.onPartActionUICreate.Add(this.onPartActionUICreate);
- GameEvents.onPartActionUIDismiss.Add(this.onPartActionUIDismiss);
- }
- }
-
- // When the module loads, fetch the Squad KSPFields from the base. This is necessary in part because
- // overloading packetSize and packetResourceCostinto a property in ModuleLimitedDataTransmitter didn't
- // work.
- public override void OnLoad(ConfigNode node)
- {
- this.Fields.Load(node);
- base.Fields.Load(node);
-
- base.OnLoad (node);
+ public override void OnAwake()
+ {
+ base.OnAwake();
this._basepacketSize = base.packetSize;
this._basepacketResourceCost = base.packetResourceCost;
@@ -266,6 +276,34 @@
));
}
+ // At least once, when the module starts with a state on the launch pad or later, go find Kerbin.
+ public override void OnStart (StartState state)
+ {
+ base.OnStart (state);
+
+ if (state >= StartState.PreLaunch)
+ {
+ this.relay = new AntennaRelay(this);
+ this.relay.maxTransmitDistance = this.maxTransmitDistance;
+
+ this.UImaxTransmitDistance = Tools.MuMech_ToSI(this.maxTransmitDistance) + "m";
+
+ GameEvents.onPartActionUICreate.Add(this.onPartActionUICreate);
+ GameEvents.onPartActionUIDismiss.Add(this.onPartActionUIDismiss);
+ }
+ }
+
+ // When the module loads, fetch the Squad KSPFields from the base. This is necessary in part because
+ // overloading packetSize and packetResourceCostinto a property in ModuleLimitedDataTransmitter didn't
+ // work.
+ public override void OnLoad(ConfigNode node)
+ {
+ this.Fields.Load(node);
+ base.Fields.Load(node);
+
+ base.OnLoad (node);
+ }
+
// Post an error in the communication messages describing the reason transmission has failed. Currently there
// is only one reason for this.
protected void PostCannotTransmitError()
@@ -291,30 +329,50 @@
// transmission fails (see CanTransmit).
protected void PreTransmit_SetPacketResourceCost()
{
- if (this.transmitDistance <= this.nominalRange)
+ if (ARConfiguration.FixedPowerCost || this.transmitDistance <= this.nominalRange)
{
base.packetResourceCost = this._basepacketResourceCost;
}
else
{
+ double rangeFactor = (this.transmitDistance / this.nominalRange);
+ rangeFactor *= rangeFactor;
+
base.packetResourceCost = this._basepacketResourceCost
- * (float)Math.Pow (this.transmitDistance / this.nominalRange, 2);
- }
+ * (float)rangeFactor;
+
+ Tools.PostDebugMessage(
+ this,
+ "Pretransmit: packet cost set to {0} before throttle (rangeFactor = {1}).",
+ base.packetResourceCost,
+ rangeFactor);
+ }
+
+ base.packetResourceCost *= this.packetThrottle / 100f;
}
// Before transmission, set packetSize. Per above, packet size increases with the inverse square of
// distance. packetSize maxes out at _basepacketSize * maxDataFactor.
protected void PreTransmit_SetPacketSize()
{
- if (this.transmitDistance >= this.nominalRange)
+ if (!ARConfiguration.FixedPowerCost && this.transmitDistance >= this.nominalRange)
{
base.packetSize = this._basepacketSize;
}
else
{
+ double rangeFactor = (this.nominalRange / this.transmitDistance);
+ rangeFactor *= rangeFactor;
+
base.packetSize = Math.Min(
- this._basepacketSize * (float)Math.Pow (this.nominalRange / this.transmitDistance, 2),
+ this._basepacketSize * (float)rangeFactor,
this._basepacketSize * this.maxDataFactor);
+
+ Tools.PostDebugMessage(
+ this,
+ "Pretransmit: packet size set to {0} before throttle (rangeFactor = {1}).",
+ base.packetSize,
+ rangeFactor);
}
base.packetSize *= this.packetThrottle / 100f;
@@ -332,6 +390,11 @@
// Override ModuleDataTransmitter.CanTransmit to return false when transmission is not possible.
public new bool CanTransmit()
{
+ if (this.part == null || this.relay == null)
+ {
+ return false;
+ }
+
PartStates partState = this.part.State;
if (partState == PartStates.DEAD || partState == PartStates.DEACTIVATED)
{
@@ -364,7 +427,9 @@
message.Append("Beginning transmission ");
- if (this.relay.nearestRelay == null)
+ // @DONE TODO: Fix this to fall back to Kerbin if nearestRelay cannot be contacted.
+ // @DONE TODO: Remove nearestRelay == null
+ if (this.KerbinDirect)
{
message.Append("directly to Kerbin.");
}
@@ -380,6 +445,75 @@
}
else
{
+ Tools.PostDebugMessage(this, "{0} unable to transmit during TransmitData.", this.part.partInfo.title);
+
+ var logger = Tools.DebugLogger.New(this);
+
+ foreach (ModuleScienceContainer scienceContainer in this.vessel.getModulesOfType<ModuleScienceContainer>())
+ {
+ logger.AppendFormat("Checking ModuleScienceContainer in {0}\n",
+ scienceContainer.part.partInfo.title);
+
+ if (
+ scienceContainer.capacity != 0 &&
+ scienceContainer.GetScienceCount() >= scienceContainer.capacity
+ )
+ {
+ logger.Append("\tInsufficient capacity, skipping.\n");
+ continue;
+ }
+
+ List<ScienceData> dataStored = new List<ScienceData>();
+
+ foreach (ScienceData data in dataQueue)
+ {
+ if (!scienceContainer.allowRepeatedSubjects && scienceContainer.HasData(data))
+ {
+ logger.Append("\tAlready contains subject and repeated subjects not allowed, skipping.\n");
+ continue;
+ }
+
+ logger.AppendFormat("\tAcceptable, adding data on subject {0}... ", data.subjectID);
+ if (scienceContainer.AddData(data))
+ {
+ logger.Append("done, removing from queue.\n");
+
+ dataStored.Add(data);
+ }
+ #if DEBUG
+ else
+ {
+ logger.Append("failed.\n");
+ }
+ #endif
+ }
+
+ dataQueue.RemoveAll(i => dataStored.Contains(i));
+
+ logger.AppendFormat("\t{0} data left in queue.", dataQueue.Count);
+ }
+
+ logger.Print();
+
+ if (dataQueue.Count > 0)
+ {
+ StringBuilder msg = new StringBuilder();
+
+ msg.Append('[');
+ msg.Append(this.part.partInfo.title);
+ msg.AppendFormat("]: {0} data items could not be saved: no space available in data containers.\n");
+ msg.Append("Data to be discarded:\n");
+
+ foreach (ScienceData data in dataQueue)
+ {
+ msg.AppendFormat("\n{0}\n", data.title);
+ }
+
+ ScreenMessages.PostScreenMessage(msg.ToString(), 4f, ScreenMessageStyle.UPPER_LEFT);
+
+ Tools.PostDebugMessage(msg.ToString());
+ }
+
this.PostCannotTransmitError ();
}
@@ -413,7 +547,9 @@
message.Append("Beginning transmission ");
- if (this.relay.nearestRelay == null)
+ // @DONE TODO: Fix this to fall back to Kerbin if nearestRelay cannot be contacted.
+ // @DONE TODO: Remove nearestRelay == null
+ if (this.KerbinDirect)
{
message.Append("directly to Kerbin.");
}
@@ -437,9 +573,43 @@
{
if (this.actionUIUpdate)
{
- this.UItransmitDistance = Tools.MuMech_ToSI(this.transmitDistance) + "m";
- this.UIpacketSize = this.CanTransmit() ? Tools.MuMech_ToSI(this.DataRate) + "MiT" : "N/A";
- this.UIpacketCost = this.CanTransmit() ? Tools.MuMech_ToSI(this.DataResourceCost) + "E" : "N/A";
+ if (this.CanTransmit())
+ {
+ this.UIrelayStatus = "Connected";
+ this.UItransmitDistance = Tools.MuMech_ToSI(this.transmitDistance) + "m";
+ this.UIpacketSize = Tools.MuMech_ToSI(this.DataRate) + "MiT";
+ this.UIpacketCost = Tools.MuMech_ToSI(this.DataResourceCost) + "E";
+ }
+ else
+ {
+ if (this.relay.firstOccludingBody == null)
+ {
+ this.UIrelayStatus = "Out of range";
+ }
+ else
+ {
+ this.UIrelayStatus = string.Format("Blocked by {0}", this.relay.firstOccludingBody.bodyName);
+ }
+ this.UImaxTransmitDistance = "N/A";
+ this.UIpacketSize = "N/A";
+ this.UIpacketCost = "N/A";
+ }
+
+ if (this.KerbinDirect)
+ {
+ if (this.relay.bestOccludedRelay != null)
+ {
+ this.UIrelayTarget = this.relay.bestOccludedRelay.ToString();
+ }
+ else
+ {
+ this.UIrelayTarget = "Kerbin";
+ }
+ }
+ else
+ {
+ this.UIrelayTarget = this.relay.nearestRelay.ToString();
+ }
}
}
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -29,6 +29,8 @@
using System.Reflection;
using System.Runtime.CompilerServices;
+[assembly: KSPAssemblyDependency("ToadicusTools", 0, 0)]
+
// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
[assembly: AssemblyTitle("AntennaRange")]
@@ -37,10 +39,9 @@
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("1.1.*")]
+[assembly: AssemblyVersion("1.8.*")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
//[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("")]
-
--- a/ProtoAntennaRelay.cs
+++ b/ProtoAntennaRelay.cs
@@ -105,7 +105,7 @@
public override string ToString()
{
return string.Format(
- "{0} on {1} (proto)",
+ "{0} on {1}",
this.title,
this.protoPart.pVesselRef.vesselName
);
--- a/RelayExtensions.cs
+++ b/RelayExtensions.cs
@@ -55,7 +55,7 @@
/// <param name="body">A <see cref="CelestialBody"/></param>
public static double DistanceTo(this AntennaRelay relay, CelestialBody body)
{
- return relay.vessel.DistanceTo(body);
+ return relay.vessel.DistanceTo(body) - body.Radius;
}
/// <summary>
@@ -68,6 +68,21 @@
return relayOne.DistanceTo(relayTwo.vessel);
}
+ public static double sqrDistanceTo(this AntennaRelay relay, Vessel vessel)
+ {
+ return relay.vessel.sqrDistanceTo(vessel);
+ }
+
+ public static double sqrDistanceTo(this AntennaRelay relay, CelestialBody body)
+ {
+ return relay.vessel.sqrDistanceTo(body);
+ }
+
+ public static double sqrDistanceTo(this AntennaRelay relayOne, AntennaRelay relayTwo)
+ {
+ return relayOne.vessel.sqrDistanceTo(relayTwo.vessel);
+ }
+
/// <summary>
/// Returns all of the PartModules or ProtoPartModuleSnapshots implementing IAntennaRelay in this Vessel.
/// </summary>
@@ -76,6 +91,24 @@
{
return RelayDatabase.Instance[vessel].Values.ToList();
}
+
+ /// <summary>
+ /// Determines if the specified vessel has a connected relay.
+ /// </summary>
+ /// <returns><c>true</c> if the specified vessel has a connected relay; otherwise, <c>false</c>.</returns>
+ /// <param name="vessel"></param>
+ public static bool HasConnectedRelay(this Vessel vessel)
+ {
+ foreach (IAntennaRelay relay in RelayDatabase.Instance[vessel].Values)
+ {
+ if (relay.CanTransmit())
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
}
}
Binary files /dev/null and b/toolbarIcon.xcf differ
Binary files /dev/null and b/toolbarIcon_24x24.xcf differ
Binary files /dev/null and b/toolbarIcon_38x38.xcf differ
