ModuleLimitedDataTransmitter: Improved GUI presentation of relays when not connected.
--- a/ARFlightController.cs
+++ b/ARFlightController.cs
@@ -93,17 +93,13 @@
protected void FixedUpdate()
{
- // Do nothing if the vessel reference is invalid.
- if (this.vessel == null)
- {
- return;
- }
-
// 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 &&
requireConnectionForControl &&
+ this.vessel != null &&
+ this.vessel.vesselType != VesselType.EVA &&
!this.vessel.hasCrewCommand() &&
!this.vessel.HasConnectedRelay())
{
--- a/AntennaRelay.cs
+++ b/AntennaRelay.cs
@@ -40,6 +40,8 @@
// We don't have a Bard, so we'll hide Kerbin here.
protected CelestialBody Kerbin;
+ protected CelestialBody _firstOccludingBody;
+
protected IAntennaRelay _nearestRelayCache;
protected IAntennaRelay moduleRef;
@@ -82,6 +84,18 @@
}
/// <summary>
+ /// Gets the first occluding body.
+ /// </summary>
+ /// <value>The first occluding body.</value>
+ public CelestialBody firstOccludingBody
+ {
+ get
+ {
+ return this._firstOccludingBody;
+ }
+ }
+
+ /// <summary>
/// Gets the transmit distance.
/// </summary>
/// <value>The transmit distance.</value>
@@ -134,7 +148,11 @@
{
if (
this.transmitDistance > this.maxTransmitDistance ||
- (requireLineOfSight && this.nearestRelay == null && !this.vessel.hasLineOfSightTo(this.Kerbin))
+ (
+ requireLineOfSight &&
+ this.nearestRelay == null &&
+ !this.vessel.hasLineOfSightTo(this.Kerbin, out this._firstOccludingBody)
+ )
)
{
return false;
@@ -170,6 +188,8 @@
this,
this.vessel.id
));
+
+ this._firstOccludingBody = null;
// Set this vessel as checked, so that we don't check it again.
RelayDatabase.Instance.CheckedVesselsTable[vessel.id] = true;
@@ -211,7 +231,7 @@
}
// Skip vessels to which we do not have line of sight.
- if (requireLineOfSight && !this.vessel.hasLineOfSightTo(potentialVessel))
+ if (requireLineOfSight && !this.vessel.hasLineOfSightTo(potentialVessel, out this._firstOccludingBody))
{
Tools.PostDebugMessage(
this,
--- a/ModuleLimitedDataTransmitter.cs
+++ b/ModuleLimitedDataTransmitter.cs
@@ -73,6 +73,9 @@
// and packetSize.
[KSPField(isPersistant = false)]
public float nominalRange;
+
+ [KSPField(isPersistant = false, guiActive = true, guiName = "Relay")]
+ public string UIrelayStatus;
[KSPField(isPersistant = false, guiActive = true, guiName = "Transmission Distance")]
public string UItransmitDistance;
@@ -300,6 +303,8 @@
base.packetResourceCost = this._basepacketResourceCost
* (float)Math.Pow (this.transmitDistance / this.nominalRange, 2);
}
+
+ base.packetResourceCost *= this.packetThrottle / 100f;
}
// Before transmission, set packetSize. Per above, packet size increases with the inverse square of
@@ -437,9 +442,27 @@
{
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 = string.Intern("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 = string.Intern("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";
+ }
}
}