Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into triplanar-heightmap

Browse Source
This commit is contained in:
Nick 2023-04-22 14:10:20 -04:00
commit 27a97d824b
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NewHorizons/External/Modules/WarpPad/NomaiWarpPadInfo.cs vendored
View File

@ -5,6 +5,11 @@ namespace NewHorizons.External.Modules.WarpPad
[JsonObject] [JsonObject]
public abstract class NomaiWarpPadInfo : GeneralPropInfo public abstract class NomaiWarpPadInfo : GeneralPropInfo
{ {
/// <summary>
/// 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.
/// </summary>
public string frequency; public string frequency;
} }
} }

3
NewHorizons/Handlers/VesselWarpHandler.cs
View File

@ -145,6 +145,7 @@ namespace NewHorizons.Handlers
var hasParentBody = !string.IsNullOrEmpty(system.Config.Vessel?.vesselSpawn?.parentBody); var hasParentBody = !string.IsNullOrEmpty(system.Config.Vessel?.vesselSpawn?.parentBody);
var hasPhysics = system.Config.Vessel?.hasPhysics ?? !hasParentBody; var hasPhysics = system.Config.Vessel?.hasPhysics ?? !hasParentBody;
var planetGO = hasParentBody ? vesselObject.transform.parent.gameObject : null;
if (hasPhysics) if (hasPhysics)
{ {
@ -167,8 +168,6 @@ namespace NewHorizons.Handlers
var attachWarpExitToVessel = system.Config.Vessel?.warpExit?.attachToVessel ?? false; var attachWarpExitToVessel = system.Config.Vessel?.warpExit?.attachToVessel ?? false;
var warpExitParent = vesselWarpController._targetWarpPlatform.transform.parent; 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); var warpExit = GeneralPropBuilder.MakeFromExisting(vesselWarpController._targetWarpPlatform.gameObject, planetGO, null, system.Config.Vessel?.warpExit, parentOverride: attachWarpExitToVessel ? warpExitParent : null);
if (attachWarpExitToVessel) if (attachWarpExitToVessel)
{ {

4
NewHorizons/NewHorizonsApi.cs
View File

@ -206,11 +206,11 @@ namespace NewHorizons
radius = radius, radius = radius,
range = range, range = range,
xmlFile = xmlFile, xmlFile = xmlFile,
remoteTrigger = new RemoteTriggerInfo() remoteTrigger = remoteTriggerRadius > 0f ? new RemoteTriggerInfo()
{ {
position = null, position = null,
radius = remoteTriggerRadius, radius = remoteTriggerRadius,
}, } : null,
}; };
return DialogueBuilder.Make(root, null, info, mod); return DialogueBuilder.Make(root, null, info, mod);

6
NewHorizons/Schemas/body_schema.json
View File

@ -2525,7 +2525,8 @@
"additionalProperties": false, "additionalProperties": false,
"properties": { "properties": {
"frequency": { "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": { "rotation": {
"description": "Rotation of the object", "description": "Rotation of the object",
@ -2606,7 +2607,8 @@
"additionalProperties": false, "additionalProperties": false,
"properties": { "properties": {
"frequency": { "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": { "rotation": {
"description": "Rotation of the object", "description": "Rotation of the object",