mirror of
https://github.com/Outer-Wilds-New-Horizons/new-horizons.git
synced 2025-12-11 20:15:44 +01:00
remove keepAutoPlacement (#544)
<!-- A new module or something else important --> ## Major features - <!-- A new parameter added to a module, or API feature --> ## Minor features - use nullable values instead of separate keepAutoPlacement bool <!-- Some improvement that requires no action on the part of add-on creators i.e., improved star graphics --> ## Improvements - <!-- Be sure to reference the existing issue if it exists --> ## Bug fixes -
This commit is contained in:
commit
43871a9206
@ -9,7 +9,7 @@ namespace NewHorizons.Builder.Atmosphere
|
||||
{
|
||||
var airGO = new GameObject("Air");
|
||||
airGO.SetActive(false);
|
||||
airGO.layer = LayerUtilities.BasicEffectVolume;
|
||||
airGO.layer = Layer.BasicEffectVolume;
|
||||
airGO.transform.parent = sector?.transform ?? planetGO.transform;
|
||||
|
||||
var sc = airGO.AddComponent<SphereCollider>();
|
||||
|
||||
@ -119,7 +119,7 @@ namespace NewHorizons.Builder.Atmosphere
|
||||
|
||||
GameObject cloudsFluidGO = new GameObject("CloudsFluid");
|
||||
cloudsFluidGO.SetActive(false);
|
||||
cloudsFluidGO.layer = LayerUtilities.BasicEffectVolume;
|
||||
cloudsFluidGO.layer = Layer.BasicEffectVolume;
|
||||
cloudsFluidGO.transform.parent = cloudsMainGO.transform;
|
||||
|
||||
SphereCollider fluidSC = cloudsFluidGO.AddComponent<SphereCollider>();
|
||||
@ -252,7 +252,7 @@ namespace NewHorizons.Builder.Atmosphere
|
||||
|
||||
if (atmo.clouds.unlit)
|
||||
{
|
||||
cloudsTopGO.layer = LayerUtilities.IgnoreSun;
|
||||
cloudsTopGO.layer = Layer.IgnoreSun;
|
||||
}
|
||||
|
||||
if (atmo.clouds.rotationSpeed != 0f)
|
||||
@ -304,7 +304,7 @@ namespace NewHorizons.Builder.Atmosphere
|
||||
{
|
||||
GameObject tcrqcGO = new GameObject("TransparentCloudRenderQueueController");
|
||||
tcrqcGO.transform.SetParent(cloudsTransparentGO.transform, false);
|
||||
tcrqcGO.layer = LayerUtilities.BasicEffectVolume;
|
||||
tcrqcGO.layer = Layer.BasicEffectVolume;
|
||||
|
||||
var shape = tcrqcGO.AddComponent<SphereShape>();
|
||||
shape.radius = 1;
|
||||
|
||||
@ -31,7 +31,7 @@ namespace NewHorizons.Builder.Body
|
||||
ringVolume.transform.localPosition = Vector3.zero;
|
||||
ringVolume.transform.localScale = Vector3.one;
|
||||
ringVolume.transform.localRotation = Quaternion.identity;
|
||||
ringVolume.layer = LayerUtilities.BasicEffectVolume;
|
||||
ringVolume.layer = Layer.BasicEffectVolume;
|
||||
|
||||
var ringShape = ringVolume.AddComponent<RingShape>();
|
||||
ringShape.innerRadius = ring.innerRadius;
|
||||
|
||||
@ -183,7 +183,7 @@ namespace NewHorizons.Builder.Body
|
||||
if (hasDestructionVolume || targetStarSystem != null)
|
||||
{
|
||||
var destructionVolumeGO = new GameObject("DestructionVolume");
|
||||
destructionVolumeGO.layer = LayerUtilities.BasicEffectVolume;
|
||||
destructionVolumeGO.layer = Layer.BasicEffectVolume;
|
||||
destructionVolumeGO.transform.parent = singularity.transform;
|
||||
destructionVolumeGO.transform.localScale = Vector3.one;
|
||||
destructionVolumeGO.transform.localPosition = Vector3.zero;
|
||||
|
||||
@ -123,7 +123,7 @@ namespace NewHorizons.Builder.Body
|
||||
heatVolume.transform.SetParent(starGO.transform, false);
|
||||
heatVolume.transform.localPosition = Vector3.zero;
|
||||
heatVolume.transform.localScale = Vector3.one;
|
||||
heatVolume.layer = LayerUtilities.BasicEffectVolume;
|
||||
heatVolume.layer = Layer.BasicEffectVolume;
|
||||
heatVolume.AddComponent<SphereShape>().radius = 1.1f;
|
||||
heatVolume.AddComponent<OWTriggerVolume>();
|
||||
heatVolume.AddComponent<HeatHazardVolume>()._damagePerSecond = 20f;
|
||||
@ -133,7 +133,7 @@ namespace NewHorizons.Builder.Body
|
||||
deathVolume.transform.SetParent(starGO.transform, false);
|
||||
deathVolume.transform.localPosition = Vector3.zero;
|
||||
deathVolume.transform.localScale = Vector3.one;
|
||||
deathVolume.layer = LayerUtilities.BasicEffectVolume;
|
||||
deathVolume.layer = Layer.BasicEffectVolume;
|
||||
var sphereCollider = deathVolume.AddComponent<SphereCollider>();
|
||||
sphereCollider.radius = 1f;
|
||||
sphereCollider.isTrigger = true;
|
||||
@ -149,7 +149,7 @@ namespace NewHorizons.Builder.Body
|
||||
planetDestructionVolume.transform.SetParent(starGO.transform, false);
|
||||
planetDestructionVolume.transform.localPosition = Vector3.zero;
|
||||
planetDestructionVolume.transform.localScale = Vector3.one;
|
||||
planetDestructionVolume.layer = LayerUtilities.BasicEffectVolume;
|
||||
planetDestructionVolume.layer = Layer.BasicEffectVolume;
|
||||
var planetSphereCollider = planetDestructionVolume.AddComponent<SphereCollider>();
|
||||
planetSphereCollider.radius = 0.8f;
|
||||
planetSphereCollider.isTrigger = true;
|
||||
@ -446,7 +446,7 @@ namespace NewHorizons.Builder.Body
|
||||
supernovaWallAudio.transform.SetParent(supernovaGO.transform, false);
|
||||
supernovaWallAudio.transform.localPosition = Vector3.zero;
|
||||
supernovaWallAudio.transform.localScale = Vector3.one;
|
||||
supernovaWallAudio.layer = LayerUtilities.BasicEffectVolume;
|
||||
supernovaWallAudio.layer = Layer.BasicEffectVolume;
|
||||
var audioSource = supernovaWallAudio.AddComponent<AudioSource>();
|
||||
audioSource.loop = true;
|
||||
audioSource.maxDistance = 2000;
|
||||
|
||||
@ -54,7 +54,7 @@ namespace NewHorizons.Builder.Body
|
||||
|
||||
// Don't ignore sun when not under clouds
|
||||
waterGO.layer = 0;
|
||||
Delay.FireOnNextUpdate(() => { if (planetGO.FindChild("Sector/SunOverride") != null) waterGO.layer = LayerUtilities.IgnoreSun; });
|
||||
Delay.FireOnNextUpdate(() => { if (planetGO.FindChild("Sector/SunOverride") != null) waterGO.layer = Layer.IgnoreSun; });
|
||||
|
||||
TessellatedSphereRenderer TSR = waterGO.AddComponent<TessellatedSphereRenderer>();
|
||||
TSR.tessellationMeshGroup = ScriptableObject.CreateInstance<MeshGroup>();
|
||||
@ -101,7 +101,7 @@ namespace NewHorizons.Builder.Body
|
||||
var buoyancyObject = new GameObject("WaterVolume");
|
||||
buoyancyObject.transform.parent = waterGO.transform;
|
||||
buoyancyObject.transform.localScale = Vector3.one;
|
||||
buoyancyObject.layer = LayerUtilities.BasicEffectVolume;
|
||||
buoyancyObject.layer = Layer.BasicEffectVolume;
|
||||
|
||||
var sphereCollider = buoyancyObject.AddComponent<SphereCollider>();
|
||||
sphereCollider.radius = 1;
|
||||
|
||||
@ -82,7 +82,7 @@ namespace NewHorizons.Builder.General
|
||||
detectorGO.SetActive(false);
|
||||
detectorGO.transform.parent = planetGO.transform;
|
||||
detectorGO.transform.localPosition = Vector3.zero;
|
||||
detectorGO.layer = LayerUtilities.BasicDetector;
|
||||
detectorGO.layer = Layer.BasicDetector;
|
||||
|
||||
ConstantForceDetector forceDetector = detectorGO.AddComponent<ConstantForceDetector>();
|
||||
forceDetector._inheritElement0 = true;
|
||||
@ -91,7 +91,7 @@ namespace NewHorizons.Builder.General
|
||||
// For falling into sun
|
||||
if (!config.Base.invulnerableToSun && config.Star == null && config.FocalPoint == null)
|
||||
{
|
||||
detectorGO.layer = LayerUtilities.AdvancedDetector;
|
||||
detectorGO.layer = Layer.AdvancedDetector;
|
||||
|
||||
var fluidDetector = detectorGO.AddComponent<DynamicFluidDetector>();
|
||||
var sphereCollider = detectorGO.AddComponent<SphereCollider>();
|
||||
|
||||
@ -24,7 +24,7 @@ namespace NewHorizons.Builder.General
|
||||
var gravityGO = new GameObject("GravityWell");
|
||||
gravityGO.transform.parent = planetGO.transform;
|
||||
gravityGO.transform.localPosition = Vector3.zero;
|
||||
gravityGO.layer = LayerUtilities.BasicEffectVolume;
|
||||
gravityGO.layer = Layer.BasicEffectVolume;
|
||||
gravityGO.SetActive(false);
|
||||
|
||||
var SC = gravityGO.AddComponent<SphereCollider>();
|
||||
|
||||
@ -13,7 +13,7 @@ namespace NewHorizons.Builder.General
|
||||
var rfGO = new GameObject("RFVolume");
|
||||
rfGO.transform.parent = planetGO.transform;
|
||||
rfGO.transform.localPosition = Vector3.zero;
|
||||
rfGO.layer = LayerUtilities.ReferenceFrameVolume;
|
||||
rfGO.layer = Layer.ReferenceFrameVolume;
|
||||
rfGO.SetActive(false);
|
||||
|
||||
var SC = rfGO.AddComponent<SphereCollider>();
|
||||
|
||||
@ -20,7 +20,7 @@ namespace NewHorizons.Builder.General
|
||||
if (!Main.Instance.IsWarpingFromVessel && !Main.Instance.IsWarpingFromShip && module.playerSpawn != null)
|
||||
{
|
||||
GameObject spawnGO = GeneralPropBuilder.MakeNew("PlayerSpawnPoint", planetGO, null, module.playerSpawn);
|
||||
spawnGO.layer = LayerUtilities.PlayerSafetyCollider;
|
||||
spawnGO.layer = Layer.PlayerSafetyCollider;
|
||||
|
||||
playerSpawn = spawnGO.AddComponent<SpawnPoint>();
|
||||
playerSpawn._triggerVolumes = new OWTriggerVolume[0];
|
||||
@ -30,7 +30,7 @@ namespace NewHorizons.Builder.General
|
||||
if (module.shipSpawn != null)
|
||||
{
|
||||
GameObject spawnGO = GeneralPropBuilder.MakeNew("ShipSpawnPoint", planetGO, null, module.shipSpawn);
|
||||
spawnGO.layer = LayerUtilities.PlayerSafetyCollider;
|
||||
spawnGO.layer = Layer.PlayerSafetyCollider;
|
||||
|
||||
var spawnPoint = spawnGO.AddComponent<SpawnPoint>();
|
||||
spawnPoint._isShipSpawn = true;
|
||||
@ -55,7 +55,7 @@ namespace NewHorizons.Builder.General
|
||||
Logger.LogVerbose("Overriding player spawn to be inside ship");
|
||||
GameObject playerSpawnGO = new GameObject("PlayerSpawnPoint");
|
||||
playerSpawnGO.transform.parent = ship.transform;
|
||||
playerSpawnGO.layer = LayerUtilities.PlayerSafetyCollider;
|
||||
playerSpawnGO.layer = Layer.PlayerSafetyCollider;
|
||||
|
||||
playerSpawnGO.transform.localPosition = new Vector3(0, 0, 0);
|
||||
|
||||
|
||||
@ -74,7 +74,7 @@ namespace NewHorizons.Builder.Props
|
||||
{
|
||||
var conversationZone = GeneralPropBuilder.MakeNew("ConversationZone", planetGO, sector, info, defaultParentPath: info.pathToAnimController);
|
||||
|
||||
conversationZone.layer = LayerUtilities.Interactible;
|
||||
conversationZone.layer = Layer.Interactible;
|
||||
|
||||
var sphere = conversationZone.AddComponent<SphereCollider>();
|
||||
sphere.radius = info.radius;
|
||||
@ -215,7 +215,7 @@ namespace NewHorizons.Builder.Props
|
||||
var playerTrackingZone = new GameObject("PlayerTrackingZone");
|
||||
playerTrackingZone.SetActive(false);
|
||||
|
||||
playerTrackingZone.layer = LayerUtilities.BasicEffectVolume;
|
||||
playerTrackingZone.layer = Layer.BasicEffectVolume;
|
||||
playerTrackingZone.SetActive(false);
|
||||
|
||||
var sphereCollider = playerTrackingZone.AddComponent<SphereCollider>();
|
||||
|
||||
@ -704,9 +704,9 @@ namespace NewHorizons.Builder.Props
|
||||
if (arcInfo.position == null) arc.transform.localPosition = Vector3.zero;
|
||||
else arc.transform.localPosition = new Vector3(arcInfo.position.x, arcInfo.position.y, 0);
|
||||
|
||||
arc.transform.localRotation = Quaternion.Euler(0, 0, arcInfo.zRotation);
|
||||
arc.transform.localRotation = Quaternion.Euler(0, 0, arcInfo.zRotation.GetValueOrDefault());
|
||||
|
||||
if (arcInfo.mirror) arc.transform.localScale = new Vector3(-1, 1, 1);
|
||||
if (arcInfo.mirror.GetValueOrDefault()) arc.transform.localScale = new Vector3(-1, 1, 1);
|
||||
}
|
||||
// Try auto I guess
|
||||
else
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
using NewHorizons.Builder.Body;
|
||||
using NewHorizons.Builder.Props.TranslatorText;
|
||||
using NewHorizons.Builder.ShipLog;
|
||||
using NewHorizons.External.Configs;
|
||||
using NewHorizons.Utility;
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
using NewHorizons.Builder.Props.TranslatorText;
|
||||
using NewHorizons.External.Modules;
|
||||
using NewHorizons.Handlers;
|
||||
using NewHorizons.Utility;
|
||||
@ -87,7 +88,7 @@ namespace NewHorizons.Builder.Props
|
||||
if (_shareStonePrefab == null)
|
||||
{
|
||||
GameObject stone = new GameObject("ShareStoneFallback");
|
||||
stone.layer = LayerUtilities.Interactible;
|
||||
stone.layer = Layer.Interactible;
|
||||
stone.SetActive(false);
|
||||
SphereCollider sc = stone.AddComponent<SphereCollider>();
|
||||
sc.center = Vector3.zero;
|
||||
|
||||
@ -112,7 +112,7 @@ namespace NewHorizons.Builder.Props
|
||||
public static GameObject Make(GameObject planetGO, Sector sector, SignalModule.SignalInfo info, IModBehaviour mod)
|
||||
{
|
||||
var signalGO = GeneralPropBuilder.MakeNew($"Signal_{info.name}", planetGO, sector, info);
|
||||
signalGO.layer = LayerUtilities.AdvancedEffectVolume;
|
||||
signalGO.layer = Layer.AdvancedEffectVolume;
|
||||
|
||||
var source = signalGO.AddComponent<AudioSource>();
|
||||
var owAudioSource = signalGO.AddComponent<OWAudioSource>();
|
||||
|
||||
@ -4,7 +4,7 @@ using System.Linq;
|
||||
using UnityEngine;
|
||||
using Logger = NewHorizons.Utility.Logger;
|
||||
|
||||
namespace NewHorizons.Builder.Props
|
||||
namespace NewHorizons.Builder.Props.TranslatorText
|
||||
{
|
||||
public class NomaiTextArcArranger : MonoBehaviour
|
||||
{
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
|
||||
namespace NewHorizons.Builder.Props
|
||||
namespace NewHorizons.Builder.Props.TranslatorText
|
||||
{
|
||||
public static class NomaiTextArcBuilder {
|
||||
// TODO: stranger arcs
|
||||
|
||||
@ -14,7 +14,7 @@ using UnityEngine;
|
||||
using Logger = NewHorizons.Utility.Logger;
|
||||
using Random = UnityEngine.Random;
|
||||
|
||||
namespace NewHorizons.Builder.Props
|
||||
namespace NewHorizons.Builder.Props.TranslatorText
|
||||
{
|
||||
public static class TranslatorTextBuilder
|
||||
{
|
||||
@ -539,15 +539,15 @@ namespace NewHorizons.Builder.Props
|
||||
var arcInfo = info.arcInfo[j];
|
||||
var arc = arranger.spirals[j];
|
||||
|
||||
if (arcInfo.keepAutoPlacement) continue;
|
||||
if (arcInfo.position != null) arc.transform.localPosition = new Vector3(arcInfo.position.x, arcInfo.position.y, 0);
|
||||
|
||||
if (arcInfo.position == null) arc.transform.localPosition = Vector3.zero;
|
||||
else arc.transform.localPosition = new Vector3(arcInfo.position.x, arcInfo.position.y, 0);
|
||||
if (arcInfo.zRotation != null) arc.transform.localRotation = Quaternion.Euler(0, 0, arcInfo.zRotation.Value);
|
||||
|
||||
arc.transform.localRotation = Quaternion.Euler(0, 0, arcInfo.zRotation);
|
||||
|
||||
if (arcInfo.mirror) arc.transform.localScale = new Vector3(-1, 1, 1);
|
||||
else arc.transform.localScale = new Vector3( 1, 1, 1);
|
||||
if (arcInfo.mirror != null)
|
||||
{
|
||||
if (arcInfo.mirror.Value) arc.transform.localScale = new Vector3(-1, 1, 1);
|
||||
else arc.transform.localScale = new Vector3(1, 1, 1);
|
||||
}
|
||||
}
|
||||
|
||||
// make an entry in the cache for all these spirals
|
||||
|
||||
@ -93,7 +93,7 @@ namespace NewHorizons.Builder.ShipLog
|
||||
|
||||
private static void MakeObservable(GameObject go, Sector sector, VolumesModule.RevealVolumeInfo info, IModBehaviour mod)
|
||||
{
|
||||
go.layer = LayerUtilities.Interactible;
|
||||
go.layer = Layer.Interactible;
|
||||
|
||||
var sphere = go.AddComponent<SphereCollider>();
|
||||
sphere.radius = info.radius;
|
||||
|
||||
@ -33,7 +33,7 @@ namespace NewHorizons.Builder.StarSystem
|
||||
|
||||
var skySphere = new GameObject("Sky Sphere");
|
||||
skySphere.transform.SetParent(skybox.transform, false);
|
||||
skySphere.layer = LayerUtilities.Skybox;
|
||||
skySphere.layer = Layer.Skybox;
|
||||
skySphere.transform.localScale = Vector3.one * 5f;
|
||||
|
||||
BuildSkySphereFace(skySphere, "Right", Quaternion.Euler(0f, 90f, 0f), mesh, rightTex);
|
||||
@ -56,7 +56,7 @@ namespace NewHorizons.Builder.StarSystem
|
||||
|
||||
var go = new GameObject(name)
|
||||
{
|
||||
layer = LayerUtilities.Skybox
|
||||
layer = Layer.Skybox
|
||||
};
|
||||
|
||||
var mf = go.AddComponent<MeshFilter>();
|
||||
|
||||
@ -19,7 +19,7 @@ namespace NewHorizons.Builder.Volumes
|
||||
public static AudioVolume Make(GameObject planetGO, Sector sector, VolumesModule.AudioVolumeInfo info, IModBehaviour mod)
|
||||
{
|
||||
var go = GeneralPropBuilder.MakeNew("AudioVolume", planetGO, sector, info);
|
||||
go.layer = LayerUtilities.AdvancedEffectVolume;
|
||||
go.layer = Layer.AdvancedEffectVolume;
|
||||
|
||||
var audioSource = go.AddComponent<AudioSource>();
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ namespace NewHorizons.Builder.Volumes
|
||||
public static HazardVolume Make(GameObject planetGO, Sector sector, OWRigidbody owrb, VolumesModule.HazardVolumeInfo info, IModBehaviour mod)
|
||||
{
|
||||
var go = GeneralPropBuilder.MakeNew("HazardVolume", planetGO, sector, info);
|
||||
go.layer = LayerUtilities.BasicEffectVolume;
|
||||
go.layer = Layer.BasicEffectVolume;
|
||||
|
||||
var shape = go.AddComponent<SphereShape>();
|
||||
shape.radius = info.radius;
|
||||
@ -51,7 +51,7 @@ namespace NewHorizons.Builder.Volumes
|
||||
var detectorGO = new GameObject("ConstantFluidDetector");
|
||||
detectorGO.transform.parent = go.transform;
|
||||
detectorGO.transform.localPosition = Vector3.zero;
|
||||
detectorGO.layer = LayerUtilities.BasicDetector;
|
||||
detectorGO.layer = Layer.BasicDetector;
|
||||
var detector = detectorGO.AddComponent<ConstantFluidDetector>();
|
||||
detector._onlyDetectableFluid = water;
|
||||
detector._buoyancy.boundingRadius = 1;
|
||||
|
||||
@ -19,7 +19,7 @@ namespace NewHorizons.Builder.Volumes
|
||||
public static NHNotificationVolume Make(GameObject planetGO, Sector sector, VolumesModule.NotificationVolumeInfo info, IModBehaviour mod)
|
||||
{
|
||||
var go = GeneralPropBuilder.MakeNew("NotificationVolume", planetGO, sector, info);
|
||||
go.layer = LayerUtilities.BasicEffectVolume;
|
||||
go.layer = Layer.BasicEffectVolume;
|
||||
|
||||
var shape = go.AddComponent<SphereShape>();
|
||||
shape.radius = info.radius;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
using NewHorizons.External.Modules;
|
||||
using UnityEngine;
|
||||
|
||||
namespace NewHorizons.Builder.Volumes
|
||||
namespace NewHorizons.Builder.Volumes.Rulesets
|
||||
{
|
||||
public static class PlayerImpactRulesetBuilder
|
||||
{
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
using NewHorizons.External.Modules;
|
||||
using UnityEngine;
|
||||
|
||||
namespace NewHorizons.Builder.Volumes
|
||||
namespace NewHorizons.Builder.Volumes.Rulesets
|
||||
{
|
||||
public static class ProbeRulesetBuilder
|
||||
{
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
using NewHorizons.External.Modules;
|
||||
using UnityEngine;
|
||||
|
||||
namespace NewHorizons.Builder.Volumes
|
||||
namespace NewHorizons.Builder.Volumes.Rulesets
|
||||
{
|
||||
public static class ThrustRulesetBuilder
|
||||
{
|
||||
|
||||
@ -12,7 +12,7 @@ namespace NewHorizons.Builder.Volumes
|
||||
public static TVolume Make<TVolume>(GameObject planetGO, Sector sector, VolumesModule.VanishVolumeInfo info) where TVolume : VanishVolume
|
||||
{
|
||||
var go = GeneralPropBuilder.MakeNew(typeof(TVolume).Name, planetGO, sector, info);
|
||||
go.layer = LayerUtilities.BasicEffectVolume;
|
||||
go.layer = Layer.BasicEffectVolume;
|
||||
|
||||
var collider = go.AddComponent<SphereCollider>();
|
||||
collider.isTrigger = true;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
using NewHorizons.External.Modules;
|
||||
using UnityEngine;
|
||||
|
||||
namespace NewHorizons.Builder.Volumes
|
||||
namespace NewHorizons.Builder.Volumes.VisorEffects
|
||||
{
|
||||
public static class VisorFrostEffectVolumeBuilder
|
||||
{
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
using NewHorizons.External.Modules;
|
||||
using UnityEngine;
|
||||
|
||||
namespace NewHorizons.Builder.Volumes
|
||||
namespace NewHorizons.Builder.Volumes.VisorEffects
|
||||
{
|
||||
public static class VisorRainEffectVolumeBuilder
|
||||
{
|
||||
|
||||
@ -12,7 +12,7 @@ namespace NewHorizons.Builder.Volumes
|
||||
public static TVolume Make<TVolume>(GameObject planetGO, Sector sector, VolumesModule.VolumeInfo info) where TVolume : MonoBehaviour //Could be BaseVolume but I need to create vanilla volumes too.
|
||||
{
|
||||
var go = GeneralPropBuilder.MakeNew(typeof(TVolume).Name, planetGO, sector, info);
|
||||
go.layer = LayerUtilities.BasicEffectVolume;
|
||||
go.layer = Layer.BasicEffectVolume;
|
||||
|
||||
var shape = go.AddComponent<SphereShape>();
|
||||
shape.radius = info.radius;
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
using NewHorizons.Builder.Body;
|
||||
using NewHorizons.Builder.ShipLog;
|
||||
using NewHorizons.Builder.Volumes;
|
||||
using NewHorizons.Builder.Volumes.Rulesets;
|
||||
using NewHorizons.Builder.Volumes.VisorEffects;
|
||||
using NewHorizons.Components.Volumes;
|
||||
using NewHorizons.External.Configs;
|
||||
using OWML.Common;
|
||||
|
||||
@ -21,7 +21,7 @@ namespace NewHorizons.Components.Achievement
|
||||
|
||||
private void Reset()
|
||||
{
|
||||
gameObject.layer = LayerUtilities.Interactible;
|
||||
gameObject.layer = Layer.Interactible;
|
||||
}
|
||||
|
||||
private void Awake()
|
||||
|
||||
@ -39,7 +39,7 @@ public class AddPhysics : MonoBehaviour
|
||||
var owRigidbody = bodyGo.AddComponent<OWRigidbody>();
|
||||
owRigidbody._simulateInSector = Sector;
|
||||
|
||||
bodyGo.layer = LayerUtilities.PhysicalDetector;
|
||||
bodyGo.layer = Layer.PhysicalDetector;
|
||||
bodyGo.tag = "DynamicPropDetector";
|
||||
// this collider is not included in groups. oh well
|
||||
bodyGo.AddComponent<SphereCollider>().radius = Radius;
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
using NewHorizons.Utility;
|
||||
|
||||
namespace NewHorizons.Components.Orbital
|
||||
namespace NewHorizons.Components
|
||||
{
|
||||
public class EyeAstroObject : AstroObject
|
||||
{
|
||||
|
||||
16
NewHorizons/External/Modules/PropModule.cs
vendored
16
NewHorizons/External/Modules/PropModule.cs
vendored
@ -592,17 +592,12 @@ namespace NewHorizons.External.Modules
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Whether to skip modifying this spiral's placement, and instead keep the automatically determined placement.
|
||||
/// Whether to flip the spiral from left-curling to right-curling or vice versa. If not specified, will use auto spiral generated value.
|
||||
/// </summary>
|
||||
public bool keepAutoPlacement;
|
||||
public bool? mirror;
|
||||
|
||||
/// <summary>
|
||||
/// Whether to flip the spiral from left-curling to right-curling or vice versa.
|
||||
/// </summary>
|
||||
public bool mirror;
|
||||
|
||||
/// <summary>
|
||||
/// The local position of this object on the wall.
|
||||
/// The local position of this object on the wall. If not specified, will use auto spiral generated value.
|
||||
/// </summary>
|
||||
public MVector2 position;
|
||||
|
||||
@ -614,12 +609,13 @@ namespace NewHorizons.External.Modules
|
||||
/// <summary>
|
||||
/// Which variation of the chosen type to place. If not specified, a random variation will be selected based on the seed provided in the parent module.
|
||||
/// </summary>
|
||||
[Obsolete("only used in old nomai text")]
|
||||
[DefaultValue(-1)] public int variation = -1;
|
||||
|
||||
/// <summary>
|
||||
/// The z euler angle for this arc.
|
||||
/// The z euler angle for this arc. If not specified, will use auto spiral generated value.
|
||||
/// </summary>
|
||||
[Range(0f, 360f)] public float zRotation;
|
||||
[Range(0f, 360f)] public float? zRotation;
|
||||
}
|
||||
|
||||
[JsonObject]
|
||||
|
||||
@ -3,6 +3,7 @@ using NewHorizons.Builder.Atmosphere;
|
||||
using NewHorizons.Builder.Body;
|
||||
using NewHorizons.Builder.General;
|
||||
using NewHorizons.Builder.Props;
|
||||
using NewHorizons.Builder.Props.TranslatorText;
|
||||
using NewHorizons.Components;
|
||||
using NewHorizons.Components.Fixers;
|
||||
using NewHorizons.Components.SizeControllers;
|
||||
|
||||
@ -1457,16 +1457,15 @@
|
||||
"type": "object",
|
||||
"additionalProperties": false,
|
||||
"properties": {
|
||||
"keepAutoPlacement": {
|
||||
"type": "boolean",
|
||||
"description": "Whether to skip modifying this spiral's placement, and instead keep the automatically determined placement."
|
||||
},
|
||||
"mirror": {
|
||||
"type": "boolean",
|
||||
"description": "Whether to flip the spiral from left-curling to right-curling or vice versa."
|
||||
"type": [
|
||||
"boolean",
|
||||
"null"
|
||||
],
|
||||
"description": "Whether to flip the spiral from left-curling to right-curling or vice versa. If not specified, will use auto spiral generated value."
|
||||
},
|
||||
"position": {
|
||||
"description": "The local position of this object on the wall.",
|
||||
"description": "The local position of this object on the wall. If not specified, will use auto spiral generated value.",
|
||||
"$ref": "#/definitions/MVector2"
|
||||
},
|
||||
"type": {
|
||||
@ -1474,15 +1473,12 @@
|
||||
"default": "adult",
|
||||
"$ref": "#/definitions/NomaiTextArcType"
|
||||
},
|
||||
"variation": {
|
||||
"type": "integer",
|
||||
"description": "Which variation of the chosen type to place. If not specified, a random variation will be selected based on the seed provided in the parent module.",
|
||||
"format": "int32",
|
||||
"default": -1
|
||||
},
|
||||
"zRotation": {
|
||||
"type": "number",
|
||||
"description": "The z euler angle for this arc.",
|
||||
"type": [
|
||||
"null",
|
||||
"number"
|
||||
],
|
||||
"description": "The z euler angle for this arc. If not specified, will use auto spiral generated value.",
|
||||
"format": "float",
|
||||
"maximum": 360.0,
|
||||
"minimum": 0.0
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
using System;
|
||||
|
||||
namespace NewHorizons;
|
||||
|
||||
/// <summary>
|
||||
/// denotes that the given type is used in the unity project
|
||||
/// and therefore caution should be used when moving/renaming/deleting
|
||||
|
||||
@ -2,11 +2,11 @@ using UnityEngine;
|
||||
|
||||
namespace NewHorizons.Utility.OWUtilities
|
||||
{
|
||||
public static class LayerUtilities
|
||||
public static class Layer
|
||||
{
|
||||
public static int Default = LayerMask.NameToLayer(nameof(Default));
|
||||
public static int TransparentFX = LayerMask.NameToLayer(nameof(TransparentFX));
|
||||
public static int IgnoreRaycast = LayerMask.NameToLayer(nameof(IgnoreRaycast));
|
||||
public static int IgnoreRaycast = LayerMask.NameToLayer("Ignore Raycast");
|
||||
public static int Water = LayerMask.NameToLayer(nameof(Water));
|
||||
public static int UI = LayerMask.NameToLayer(nameof(UI));
|
||||
public static int PlayerSafetyCollider = LayerMask.NameToLayer(nameof(PlayerSafetyCollider));
|
||||
Loading…
x
Reference in New Issue
Block a user