diff --git a/NewHorizons/External/Modules/WarpPad/NomaiWarpPadInfo.cs b/NewHorizons/External/Modules/WarpPad/NomaiWarpPadInfo.cs index f4cd7515..94a9218d 100644 --- a/NewHorizons/External/Modules/WarpPad/NomaiWarpPadInfo.cs +++ b/NewHorizons/External/Modules/WarpPad/NomaiWarpPadInfo.cs @@ -5,6 +5,11 @@ namespace NewHorizons.External.Modules.WarpPad [JsonObject] public abstract class NomaiWarpPadInfo : GeneralPropInfo { + /// + /// This can be anything. To have a warp pad transmitter send you to a receiver you must give them the same frequency. + /// Try to make it something unique so it does not overlap with other warp pad pairs. + /// Futhermore, multiple transmitters can send you to the same receiver if they all have the same frequency. + /// public string frequency; } } diff --git a/NewHorizons/Handlers/VesselWarpHandler.cs b/NewHorizons/Handlers/VesselWarpHandler.cs index 935c4399..91e52323 100644 --- a/NewHorizons/Handlers/VesselWarpHandler.cs +++ b/NewHorizons/Handlers/VesselWarpHandler.cs @@ -145,6 +145,7 @@ namespace NewHorizons.Handlers var hasParentBody = !string.IsNullOrEmpty(system.Config.Vessel?.vesselSpawn?.parentBody); var hasPhysics = system.Config.Vessel?.hasPhysics ?? !hasParentBody; + var planetGO = hasParentBody ? vesselObject.transform.parent.gameObject : null; if (hasPhysics) { @@ -167,8 +168,6 @@ namespace NewHorizons.Handlers var attachWarpExitToVessel = system.Config.Vessel?.warpExit?.attachToVessel ?? false; var warpExitParent = vesselWarpController._targetWarpPlatform.transform.parent; - var planetGO = hasPhysics ? vesselObject.transform.parent.gameObject : null; - var warpExit = GeneralPropBuilder.MakeFromExisting(vesselWarpController._targetWarpPlatform.gameObject, planetGO, null, system.Config.Vessel?.warpExit, parentOverride: attachWarpExitToVessel ? warpExitParent : null); if (attachWarpExitToVessel) { diff --git a/NewHorizons/NewHorizonsApi.cs b/NewHorizons/NewHorizonsApi.cs index b34a741b..ee3ea62f 100644 --- a/NewHorizons/NewHorizonsApi.cs +++ b/NewHorizons/NewHorizonsApi.cs @@ -206,11 +206,11 @@ namespace NewHorizons radius = radius, range = range, xmlFile = xmlFile, - remoteTrigger = new RemoteTriggerInfo() + remoteTrigger = remoteTriggerRadius > 0f ? new RemoteTriggerInfo() { position = null, radius = remoteTriggerRadius, - }, + } : null, }; return DialogueBuilder.Make(root, null, info, mod); diff --git a/NewHorizons/Schemas/body_schema.json b/NewHorizons/Schemas/body_schema.json index 0b3afb27..ce160983 100644 --- a/NewHorizons/Schemas/body_schema.json +++ b/NewHorizons/Schemas/body_schema.json @@ -2525,7 +2525,8 @@ "additionalProperties": false, "properties": { "frequency": { - "type": "string" + "type": "string", + "description": "This can be anything. To have a warp pad transmitter send you to a receiver you must give them the same frequency. \nTry to make it something unique so it does not overlap with other warp pad pairs.\nFuthermore, multiple transmitters can send you to the same receiver if they all have the same frequency." }, "rotation": { "description": "Rotation of the object", @@ -2606,7 +2607,8 @@ "additionalProperties": false, "properties": { "frequency": { - "type": "string" + "type": "string", + "description": "This can be anything. To have a warp pad transmitter send you to a receiver you must give them the same frequency. \nTry to make it something unique so it does not overlap with other warp pad pairs.\nFuthermore, multiple transmitters can send you to the same receiver if they all have the same frequency." }, "rotation": { "description": "Rotation of the object",