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

Categorized some stuff in components and fixed Trifids star thing maybe

Browse Source
This commit is contained in:
Nick 2022-09-15 00:41:05 -04:00
parent 6d2dbf72d5
commit 5a5ea46b05
41 changed files with 233 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NewHorizons/Builder/Body/RingBuilder.cs
View File

@ -7,6 +7,7 @@ using System.Collections.Generic;
using NewHorizons.External.Modules;
using UnityEngine;
using Logger = NewHorizons.Utility.Logger;
using NewHorizons.Components.Volumes;
namespace NewHorizons.Builder.Body
{

2
NewHorizons/Builder/Body/SingularityBuilder.cs
View File

@ -1,4 +1,3 @@
using NewHorizons.Components;
using NewHorizons.External.Configs;
using NewHorizons.Utility;
using System;
@ -10,6 +9,7 @@ using System.Linq;
using NewHorizons.Components.SizeControllers;
using System.Drawing;
using Color = UnityEngine.Color;
using NewHorizons.Components.Volumes;
namespace NewHorizons.Builder.Body
{

2
NewHorizons/Builder/Body/StarBuilder.cs
View File

@ -1,4 +1,3 @@
using NewHorizons.Components;
using NewHorizons.Components.SizeControllers;
using NewHorizons.Utility;
using OWML.Utils;
@ -9,6 +8,7 @@ using OWML.ModHelper;
using OWML.Common;
using UnityEngine.InputSystem.XR;
using System.Linq;
using NewHorizons.Components.Stars;
namespace NewHorizons.Builder.Body
{

2
NewHorizons/Builder/Body/WaterBuilder.cs
View File

@ -1,9 +1,9 @@
using NewHorizons.Components;
using NewHorizons.Components.SizeControllers;
using NewHorizons.Utility;
using UnityEngine;
using NewHorizons.External.Modules.VariableSize;
using Tessellation;
using NewHorizons.Components.Volumes;
namespace NewHorizons.Builder.Body
{

2
NewHorizons/Builder/Props/QuantumBuilder.cs
View File

@ -1,5 +1,5 @@
using HarmonyLib;
using NewHorizons.Components;
using NewHorizons.Components.Quantum;
using NewHorizons.External.Configs;
using NewHorizons.External.Modules;
using NewHorizons.Utility;

2
NewHorizons/Builder/Props/RaftBuilder.cs
View File

@ -1,4 +1,4 @@
using NewHorizons.Components;
using NewHorizons.Components.Volumes;
using NewHorizons.External.Modules;
using NewHorizons.Handlers;
using NewHorizons.Utility;

3
NewHorizons/Builder/ShipLog/MapModeBuilder.cs
View File

@ -1,4 +1,3 @@
using NewHorizons.Components;
using NewHorizons.External.Modules;
using NewHorizons.Handlers;
using NewHorizons.Utility;
@ -9,6 +8,8 @@ using NewHorizons.External.Modules.VariableSize;
using UnityEngine;
using UnityEngine.UI;
using Logger = NewHorizons.Utility.Logger;
using NewHorizons.Components.ShipLog;
namespace NewHorizons.Builder.ShipLog
{
public static class MapModeBuilder

3
NewHorizons/Builder/Volumes/NotificationVolumeBuilder.cs
View File

@ -1,4 +1,3 @@
using NewHorizons.Components;
using NewHorizons.External.Modules;
using NewHorizons.Utility;
using OWML.Common;
@ -9,7 +8,7 @@ using System.Text;
using System.Threading.Tasks;
using UnityEngine;
using Logger = NewHorizons.Utility.Logger;
using NHNotificationVolume = NewHorizons.Components.NotificationVolume;
using NHNotificationVolume = NewHorizons.Components.Volumes.NotificationVolume;
namespace NewHorizons.Builder.Volumes
{

4
NewHorizons/Builder/Volumes/VolumesBuildManager.cs
View File

@ -1,7 +1,7 @@
using NewHorizons.Builder.Body;
using NewHorizons.Builder.ShipLog;
using NewHorizons.Builder.Volumes;
using NewHorizons.Components;
using NewHorizons.Components.Volumes;
using NewHorizons.External.Configs;
using OWML.Common;
using System;
@ -61,7 +61,7 @@ namespace NewHorizons.Builder.Volumes
{
foreach (var interferenceVolume in config.Volumes.interferenceVolumes)
{
VolumeBuilder.Make<Components.InterferenceVolume>(go, sector, interferenceVolume);
VolumeBuilder.Make<Components.Volumes.InterferenceVolume>(go, sector, interferenceVolume);
}
}
if (config.Volumes.reverbVolumes != null)

2
NewHorizons/Components/MapSatelliteOrbitFix.cs → NewHorizons/Components/Fixers/MapSatelliteOrbitFix.cs
View File

@ -1,7 +1,7 @@
using NewHorizons.Builder.General;
using NewHorizons.External.Configs;
using UnityEngine;
namespace NewHorizons.Components
namespace NewHorizons.Components.Fixers
{
public class MapSatelliteOrbitFix : MonoBehaviour
{

8
NewHorizons/Components/NHMultiStateQuantumObject.cs → NewHorizons/Components/Quantum/NHMultiStateQuantumObject.cs
View File

@ -7,7 +7,7 @@ using UnityEngine;
using Logger = NewHorizons.Utility.Logger;
namespace NewHorizons.Components
namespace NewHorizons.Components.Quantum
{
public class NHMultiStateQuantumObject : MultiStateQuantumObject
{
@ -28,7 +28,7 @@ namespace NewHorizons.Components
}
else if (_sequential)
{
_stateIndex = (_reverse ? (_stateIndex - 1) : (_stateIndex + 1));
_stateIndex = _reverse ? _stateIndex - 1 : _stateIndex + 1;
if (_loop)
{
if (_stateIndex < 0)
@ -105,11 +105,11 @@ namespace NewHorizons.Components
var isVisible =
isPlayerEntangled
? illumination
: (
:
illumination
? visibility
: playerInside
);
;
return !isVisible;
}

6
NewHorizons/Components/QuantumPlanet.cs → NewHorizons/Components/Quantum/QuantumPlanet.cs
View File

@ -9,7 +9,7 @@ using System.Linq;
using UnityEngine;
using Logger = NewHorizons.Utility.Logger;
using Random = UnityEngine.Random;
namespace NewHorizons.Components
namespace NewHorizons.Components.Quantum
{
public class QuantumPlanet : QuantumObject
{
@ -162,9 +162,9 @@ namespace NewHorizons.Components
private void OnPlayerBlink()
{
if (base.IsVisible())
if (IsVisible())
{
base.Collapse(true);
Collapse(true);
}
}

1
NewHorizons/Components/RingOpacityController.cs
View File

@ -1,3 +1,4 @@
using NewHorizons.Components.Volumes;
using NewHorizons.External.Modules.VariableSize;
using NewHorizons.Utility;
using UnityEngine;

6
NewHorizons/Components/ShipLogDetail.cs → NewHorizons/Components/ShipLog/ShipLogDetail.cs
View File

@ -1,8 +1,8 @@
using NewHorizons.External.Modules;
using NewHorizons.External.Modules;
using UnityEngine;
using UnityEngine.UI;
using Logger = NewHorizons.Utility.Logger;
namespace NewHorizons.Components
namespace NewHorizons.Components.ShipLog
{
public class ShipLogDetail : MonoBehaviour
{
@ -51,7 +51,7 @@ namespace NewHorizons.Components
private void SetGreyScale(bool greyScale)
{
_revealedImage.material = (greyScale ? _greyScaleMaterial : null);
_revealedImage.material = greyScale ? _greyScaleMaterial : null;
}
}
}

16
NewHorizons/Components/ShipLogStarChartMode.cs → NewHorizons/Components/ShipLog/ShipLogStarChartMode.cs
View File

@ -6,7 +6,7 @@ using System.Linq;
using UnityEngine;
using UnityEngine.UI;
using Logger = NewHorizons.Utility.Logger;
namespace NewHorizons.Components
namespace NewHorizons.Components.ShipLog
{
public class ShipLogStarChartMode : ShipLogMode
{
@ -41,7 +41,7 @@ namespace NewHorizons.Components
public override void Initialize(ScreenPromptList centerPromptList, ScreenPromptList upperRightPromptList, OWAudioSource oneShotSource)
{
root = base.transform.Find("ScaleRoot/PanRoot");
root = transform.Find("ScaleRoot/PanRoot");
_oneShotSource = oneShotSource;
_centerPromptList = centerPromptList;
@ -101,11 +101,11 @@ namespace NewHorizons.Components
if (_cardTemplate == null)
{
var panRoot = SearchUtilities.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/ShipLogPivot/ShipLogCanvas/DetectiveMode/ScaleRoot/PanRoot");
_cardTemplate = GameObject.Instantiate(panRoot.GetComponentInChildren<ShipLogEntryCard>().gameObject);
_cardTemplate = Instantiate(panRoot.GetComponentInChildren<ShipLogEntryCard>().gameObject);
_cardTemplate.SetActive(false);
}
var newCard = GameObject.Instantiate(_cardTemplate, parent);
var newCard = Instantiate(_cardTemplate, parent);
var textComponent = newCard.transform.Find("EntryCardRoot/NameBackground/Name").GetComponent<Text>();
var name = UniqueIDToName(uniqueID);
@ -164,7 +164,7 @@ namespace NewHorizons.Components
public override void EnterMode(string entryID = "", List<ShipLogFact> revealQueue = null)
{
base.gameObject.SetActive(true);
gameObject.SetActive(true);
Locator.GetPromptManager().AddScreenPrompt(_detectiveModePrompt, _upperRightPromptList, TextAnchor.MiddleRight, -1, true);
Locator.GetPromptManager().AddScreenPrompt(_targetSystemPrompt, _centerPromptList, TextAnchor.MiddleCenter, -1, true);
@ -172,7 +172,7 @@ namespace NewHorizons.Components
public override void ExitMode()
{
base.gameObject.SetActive(false);
gameObject.SetActive(false);
Locator.GetPromptManager().RemoveScreenPrompt(_detectiveModePrompt);
Locator.GetPromptManager().RemoveScreenPrompt(_targetSystemPrompt);
@ -223,7 +223,7 @@ namespace NewHorizons.Components
if (oldIndex != _cardIndex)
{
_oneShotSource.PlayOneShot(global::AudioType.ShipLogMoveBetweenPlanets, 1f);
_oneShotSource.PlayOneShot(AudioType.ShipLogMoveBetweenPlanets, 1f);
_startPanTime = Time.unscaledTime;
_startPanPos = _panRootPos;
_panDuration = 0.25f;
@ -297,7 +297,7 @@ namespace NewHorizons.Components
{
if (_warpNotificationData != null) NotificationManager.SharedInstance.UnpinNotification(_warpNotificationData);
if (_target == null) return;
if (playSound) _oneShotSource.PlayOneShot(global::AudioType.ShipLogMarkLocation, 1f);
if (playSound) _oneShotSource.PlayOneShot(AudioType.ShipLogMarkLocation, 1f);
_target.SetMarkedOnHUD(false);
_target = null;
}

9
NewHorizons/Components/SizeControllers/StarEvolutionController.cs
View File

@ -1,5 +1,6 @@
using NewHorizons.Builder.Body;
using NewHorizons.Components.Orbital;
using NewHorizons.Components.Stars;
using NewHorizons.External.Modules.VariableSize;
using NewHorizons.Handlers;
using NewHorizons.Utility;
@ -286,9 +287,9 @@ namespace NewHorizons.Components.SizeControllers
{
_stellarRemnant.SetActive(true);
var remnantStarController = _stellarRemnant.GetComponentInChildren<StarController>();
if (remnantStarController != null) StarLightController.AddStar(remnantStarController);
if (remnantStarController != null) SunLightEffectsController.AddStar(remnantStarController);
var remnantStarLight = _stellarRemnant.FindChild("SunLight");
if (remnantStarLight != null) StarLightController.AddStarLight(remnantStarLight.GetComponent<Light>());
if (remnantStarLight != null) SunLightEffectsController.AddStarLight(remnantStarLight.GetComponent<Light>());
}
if (Time.time > _supernovaStartTime + supernovaTime)
@ -301,8 +302,8 @@ namespace NewHorizons.Components.SizeControllers
private void DisableStar(bool start = false)
{
if (controller != null) StarLightController.RemoveStar(controller);
if (!isProxy) StarLightController.RemoveStarLight(gameObject.FindChild("SunLight").GetAddComponent<Light>());
if (controller != null) SunLightEffectsController.RemoveStar(controller);
if (!isProxy) SunLightEffectsController.RemoveStarLight(gameObject.FindChild("SunLight").GetAddComponent<Light>());
if (_stellarRemnant != null)
{

4
NewHorizons/Components/StarController.cs → NewHorizons/Components/Stars/StarController.cs
View File

@ -1,5 +1,5 @@
using UnityEngine;
namespace NewHorizons.Components
using UnityEngine;
namespace NewHorizons.Components.Stars
{
public class StarController : MonoBehaviour
{

2
NewHorizons/Components/StarDestructionVolume.cs → NewHorizons/Components/Stars/StarDestructionVolume.cs
View File

@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using UnityEngine;
namespace NewHorizons.Components
namespace NewHorizons.Components.Stars
{
public class StarDestructionVolume : DestructionVolume
{

2
NewHorizons/Components/StarFluidVolume.cs → NewHorizons/Components/Stars/StarFluidVolume.cs
View File

@ -1,6 +1,6 @@
using NewHorizons.Components.SizeControllers;
using UnityEngine;
namespace NewHorizons.Components
namespace NewHorizons.Components.Stars
{
public class StarFluidVolume : SimpleFluidVolume
{

89
NewHorizons/Components/StarLightController.cs → NewHorizons/Components/Stars/StarLightController.cs
View File

@ -2,29 +2,31 @@ using NewHorizons.Builder.Atmosphere;
using System.Collections.Generic;
using UnityEngine;
using Logger = NewHorizons.Utility.Logger;
namespace NewHorizons.Components
namespace NewHorizons.Components.Stars
{
[RequireComponent(typeof(SunLightController))]
[RequireComponent(typeof(SunLightParamUpdater))]
public class StarLightController : MonoBehaviour
public class SunLightEffectsController : MonoBehaviour
{
private static readonly int SunIntensity = Shader.PropertyToID("_SunIntensity");
private static readonly float hearthSunDistanceSqr = 8593 * 8593;
public static StarLightController Instance { get; private set; }
public static SunLightEffectsController Instance { get; private set; }
private readonly List<StarController> _stars = new();
private readonly List<Light> _lights = new();
private List<StarController> _stars = new List<StarController>();
private List<Light> _lights = new List<Light>();
private StarController _activeStar;
private SunLightController _sunLightController;
private SunLightParamUpdater _sunLightParamUpdater;
public void Awake()
{
Instance = this;
_sunLightController = GetComponent<SunLightController>();
_sunLightController.enabled = true;
_sunLightParamUpdater = GetComponent<SunLightParamUpdater>();
_sunLightParamUpdater._sunLightController = _sunLightController;
}
@ -69,21 +71,61 @@ namespace NewHorizons.Components
}
public void Update()
{
// Player is always at 0,0,0 more or less so if they arent using the map camera then wtv
var origin = Vector3.zero;
if (PlayerState.InMapView())
{
origin = Locator.GetActiveCamera().transform.position;
// Keep all star lights on in map
foreach (var light in _lights)
{
light.enabled = true;
}
}
else
{
// Outside map, only show lights within 50km range or light.range
// For some reason outside of the actual range of the lights they still show reflection effects on water and glass
foreach (var light in _lights)
{
// Minimum 50km range so it's not badly noticeable for dim stars
if ((light.transform.position - origin).sqrMagnitude <= Mathf.Max(light.range * light.range, 2500000000))
{
light.enabled = true;
}
else
{
light.enabled = false;
}
}
}
if (_stars.Count > 0)
{
if (_activeStar == null || !_activeStar.gameObject.activeInHierarchy)
{
if (_stars.Contains(_activeStar)) _stars.Remove(_activeStar);
if (_stars.Count > 0) ChangeActiveStar(_stars[0]);
else gameObject.SetActive(false);
if (_stars.Contains(_activeStar))
{
_stars.Remove(_activeStar);
}
if (_stars.Count > 0)
{
ChangeActiveStar(_stars[0]);
}
else
{
foreach (var (_, material) in AtmosphereBuilder.Skys)
{
material.SetFloat(SunIntensity, 0);
}
return;
}
}
else
{
// Update atmo shaders
foreach (var (planet, material) in AtmosphereBuilder.Skys)
{
@ -93,37 +135,18 @@ namespace NewHorizons.Components
material.SetFloat(SunIntensity, intensity);
}
// Player is always at 0,0,0 more or less so if they arent using the map camera then wtv
var origin = Vector3.zero;
foreach (var star in _stars)
{
if (star == null) continue;
if (!(star.gameObject.activeSelf && star.gameObject.activeInHierarchy)) continue;
if (PlayerState.InMapView())
{
origin = Locator.GetActiveCamera().transform.position;
}
if (star.Intensity * (star.transform.position - origin).sqrMagnitude < _activeStar.Intensity * (_activeStar.transform.position - origin).sqrMagnitude)
{
ChangeActiveStar(star);
break;
}
}
if (PlayerState.InMapView())
{
foreach (var light in _lights) light.enabled = true;
return;
}
foreach (var light in _lights)
{
// Minimum 50km range so it's not badly noticeable for dim stars
if ((light.transform.position - origin).sqrMagnitude <= Mathf.Max(light.range * light.range, 2500000000)) light.enabled = true;
else light.enabled = false;
}
}
@ -151,8 +174,8 @@ namespace NewHorizons.Components
_sunLightParamUpdater._propID_OWSunColorIntensity = Shader.PropertyToID("_OWSunColorIntensity");
// For the param thing to work it wants this to be on the star idk
this.transform.parent = star.transform;
this.transform.localPosition = Vector3.zero;
transform.parent = star.transform;
transform.localPosition = Vector3.zero;
}
}
}

4
NewHorizons/Components/StarSurfaceAudioController.cs → NewHorizons/Components/Stars/StarSurfaceAudioController.cs
View File

@ -1,7 +1,7 @@
using UnityEngine;
using NewHorizons.Components.SizeControllers;
namespace NewHorizons.Components
namespace NewHorizons.Components.Stars
{
[RequireComponent(typeof(OWAudioSource))]
public class StarSurfaceAudioController : SectoredMonoBehaviour
@ -34,7 +34,7 @@ namespace NewHorizons.Components
public void Update()
{
_fade = Mathf.MoveTowards(_fade, 1, Time.deltaTime * 0.2f);
float value = Mathf.Max(0.0f, Vector3.Distance(Locator.GetPlayerCamera().transform.position, this.transform.position) - (_starEvolutionController != null ? _starEvolutionController.CurrentScale : _size));
float value = Mathf.Max(0.0f, Vector3.Distance(Locator.GetPlayerCamera().transform.position, transform.position) - (_starEvolutionController != null ? _starEvolutionController.CurrentScale : _size));
float num = Mathf.InverseLerp(1600f, 100f, value);
_audioSource.SetLocalVolume(num * num * _fade);
}

4
NewHorizons/Components/StellarDeathController.cs → NewHorizons/Components/Stars/StellarDeathController.cs
View File

@ -1,6 +1,6 @@
using UnityEngine;
namespace NewHorizons.Components
namespace NewHorizons.Components.Stars
{
public class StellarDeathController : MonoBehaviour
{
@ -71,7 +71,7 @@ namespace NewHorizons.Components
surface.transform.localScale = Vector3.one * _currentSupernovaScale;
_localSupernovaMat.color = Color.Lerp(Color.black, supernovaMaterial.color, supernovaAlpha.Evaluate(_time));
float distanceToPlayer = PlayerState.InDreamWorld() ? 20000f : (Vector3.Distance(transform.position, Locator.GetPlayerCamera().transform.position) - GetSupernovaRadius());
float distanceToPlayer = PlayerState.InDreamWorld() ? 20000f : Vector3.Distance(transform.position, Locator.GetPlayerCamera().transform.position) - GetSupernovaRadius();
if (_isProxy) return;

2
NewHorizons/Components/BaseVolume.cs → NewHorizons/Components/Volumes/BaseVolume.cs
View File

@ -1,6 +1,6 @@
using UnityEngine;
namespace NewHorizons.Components
namespace NewHorizons.Components.Volumes
{
[RequireComponent(typeof(OWTriggerVolume))]
public abstract class BaseVolume : MonoBehaviour

4
NewHorizons/Components/BlackHoleDestructionVolume.cs → NewHorizons/Components/Volumes/BlackHoleDestructionVolume.cs
View File

@ -1,6 +1,6 @@
using NewHorizons.OtherMods.AchievementsPlus.NH;
namespace NewHorizons.Components
namespace NewHorizons.Components.Volumes
{
public class BlackHoleDestructionVolume : DestructionVolume
{
@ -15,7 +15,7 @@ namespace NewHorizons.Components
SurveyorProbe requiredComponent = probeBody.GetRequiredComponent<SurveyorProbe>();
if (requiredComponent.IsLaunched())
{
UnityEngine.Object.Destroy(requiredComponent.gameObject);
Destroy(requiredComponent.gameObject);
ProbeLostAchievement.Earn();
}
}

2
NewHorizons/Components/ChangeStarSystemVolume.cs → NewHorizons/Components/Volumes/ChangeStarSystemVolume.cs
View File

@ -1,4 +1,4 @@
namespace NewHorizons.Components
namespace NewHorizons.Components.Volumes
{
public class ChangeStarSystemVolume : BlackHoleDestructionVolume
{

2
NewHorizons/Components/InterferenceVolume.cs → NewHorizons/Components/Volumes/InterferenceVolume.cs
View File

@ -6,7 +6,7 @@ using System.Text;
using System.Threading.Tasks;
using UnityEngine;
namespace NewHorizons.Components
namespace NewHorizons.Components.Volumes
{
public class InterferenceVolume : BaseVolume
{

2
NewHorizons/Components/MapRestrictionVolume.cs → NewHorizons/Components/Volumes/MapRestrictionVolume.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
namespace NewHorizons.Components
namespace NewHorizons.Components.Volumes
{
public class MapRestrictionVolume : BaseVolume
{

4
NewHorizons/Components/NHFluidVolume.cs → NewHorizons/Components/Volumes/NHFluidVolume.cs
View File

@ -1,5 +1,5 @@
using UnityEngine;
namespace NewHorizons.Components
using UnityEngine;
namespace NewHorizons.Components.Volumes
{
public class NHFluidVolume : RadialFluidVolume
{

2
NewHorizons/Components/NHInnerFogWarpVolume.cs → NewHorizons/Components/Volumes/NHInnerFogWarpVolume.cs
View File

@ -1,4 +1,4 @@
namespace NewHorizons.Components
namespace NewHorizons.Components.Volumes
{
public class NHInnerFogWarpVolume : InnerFogWarpVolume
{

4
NewHorizons/Components/NotificationVolume.cs → NewHorizons/Components/Volumes/NotificationVolume.cs
View File

@ -5,7 +5,7 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
namespace NewHorizons.Components
namespace NewHorizons.Components.Volumes
{
public class NotificationVolume : BaseVolume
{
@ -16,7 +16,7 @@ namespace NewHorizons.Components
public void SetPinned(bool pin) => _pin = pin;
public void SetTarget(External.Modules.VolumesModule.NotificationVolumeInfo.NotificationTarget target) => SetTarget(EnumUtils.Parse<NotificationTarget>(target.ToString(), NotificationTarget.All));
public void SetTarget(External.Modules.VolumesModule.NotificationVolumeInfo.NotificationTarget target) => SetTarget(EnumUtils.Parse(target.ToString(), NotificationTarget.All));
public void SetTarget(NotificationTarget target) => _target = target;

2
NewHorizons/Components/RingFluidVolume.cs → NewHorizons/Components/Volumes/RingFluidVolume.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
namespace NewHorizons.Components
namespace NewHorizons.Components.Volumes
{
public class RingFluidVolume : SimpleFluidVolume
{

2
NewHorizons/Handlers/InterferenceHandler.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace NewHorizons.Handlers
{
using InterferenceVolume = NewHorizons.Components.InterferenceVolume;
using InterferenceVolume = Components.Volumes.InterferenceVolume;
public static class InterferenceHandler
{

13
NewHorizons/Handlers/PlanetCreationHandler.cs
View File

@ -4,8 +4,9 @@ using NewHorizons.Builder.General;
using NewHorizons.Builder.Orbital;
using NewHorizons.Builder.Props;
using NewHorizons.Builder.Volumes;
using NewHorizons.Components;
using NewHorizons.Components.Orbital;
using NewHorizons.Components.Quantum;
using NewHorizons.Components.Stars;
using NewHorizons.OtherMods.OWRichPresence;
using NewHorizons.Utility;
using System;
@ -57,9 +58,9 @@ namespace NewHorizons.Handlers
GameObject.Destroy(starLightGO.GetComponent<Light>());
starLightGO.name = "StarLightController";
starLightGO.AddComponent<StarLightController>();
StarLightController.AddStar(starController);
StarLightController.AddStarLight(starController.Light);
starLightGO.AddComponent<SunLightEffectsController>();
SunLightEffectsController.AddStar(starController);
SunLightEffectsController.AddStarLight(starController.Light);
starLightGO.SetActive(true);
@ -499,10 +500,10 @@ namespace NewHorizons.Handlers
{
var (star, starController, starEvolutionController) = StarBuilder.Make(go, sector, body.Config.Star, body.Mod, body.Config.isStellarRemnant);
if (starController != null) StarLightController.AddStar(starController);
if (starController != null) SunLightEffectsController.AddStar(starController);
var starLight = star.FindChild("SunLight");
if (starLight != null) StarLightController.AddStarLight(starLight.GetComponent<Light>());
if (starLight != null) SunLightEffectsController.AddStarLight(starLight.GetComponent<Light>());
// If it has an evolution controller that means it will die -> we make a remnant (unless its a remnant)
if (starEvolutionController != null && !body.Config.isStellarRemnant)

6
NewHorizons/Handlers/PlanetDestructionHandler.cs
View File

@ -1,4 +1,4 @@
using NewHorizons.Components;
using NewHorizons.Components.Stars;
using NewHorizons.Utility;
using OWML.Utils;
using System;
@ -117,8 +117,8 @@ namespace NewHorizons.Handlers
break;
case AstroObject.Name.Sun:
var starController = ao.gameObject.GetComponent<StarController>();
StarLightController.RemoveStar(starController);
StarLightController.RemoveStarLight(ao.gameObject.FindChild("Sector_SUN/Effects_SUN/SunLight").GetComponent<Light>());
SunLightEffectsController.RemoveStar(starController);
SunLightEffectsController.RemoveStarLight(ao.gameObject.FindChild("Sector_SUN/Effects_SUN/SunLight").GetComponent<Light>());
GameObject.Destroy(starController);
var audio = ao.GetComponentInChildren<SunSurfaceAudioController>();

2
NewHorizons/Handlers/StarChartHandler.cs
View File

@ -1,4 +1,4 @@
using NewHorizons.Components;
using NewHorizons.Components.ShipLog;
using NewHorizons.Utility;
using System.Collections.Generic;
using UnityEngine;

2
NewHorizons/Handlers/VesselCoordinatePromptHandler.cs
View File

@ -1,4 +1,4 @@
using NewHorizons.Components;
using NewHorizons.Components.ShipLog;
using NewHorizons.Utility;
using System;
using System.Collections.Generic;

1
NewHorizons/Main.cs
View File

@ -3,6 +3,7 @@ using NewHorizons.Builder.Atmosphere;
using NewHorizons.Builder.Body;
using NewHorizons.Builder.Props;
using NewHorizons.Components;
using NewHorizons.Components.Fixers;
using NewHorizons.Components.SizeControllers;
using NewHorizons.External;
using NewHorizons.External.Configs;

2
NewHorizons/OtherMods/OWRichPresence/RichPresenceHandler.cs
View File

@ -1,4 +1,4 @@
using NewHorizons.Components;
using NewHorizons.Components.ShipLog;
using NewHorizons.Handlers;
using NewHorizons.Utility;
using System;

2
NewHorizons/Patches/DestructionVolumePatches.cs
View File

@ -1,5 +1,5 @@
using HarmonyLib;
using NewHorizons.Components;
using NewHorizons.Components.Quantum;
using System;
using System.Collections.Generic;
using System.Linq;

2
NewHorizons/Patches/RaftPatches.cs
View File

@ -1,5 +1,5 @@
using HarmonyLib;
using NewHorizons.Components;
using NewHorizons.Components.Volumes;
using UnityEngine;
namespace NewHorizons.Patches
{

3
NewHorizons/Patches/ShipLogPatches.cs
View File

@ -1,7 +1,6 @@
using HarmonyLib;
using NewHorizons.OtherMods.AchievementsPlus;
using NewHorizons.Builder.ShipLog;
using NewHorizons.Components;
using NewHorizons.Handlers;
using NewHorizons.Utility;
using System;
@ -10,6 +9,8 @@ using System.Linq;
using UnityEngine;
using Logger = NewHorizons.Utility.Logger;
using Object = UnityEngine.Object;
using NewHorizons.Components.ShipLog;
namespace NewHorizons.Patches
{
[HarmonyPatch]