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

Only clear certain caches on star system changed

Browse Source
This commit is contained in:
Nick 2023-08-25 22:36:48 -04:00
parent 601acecbb2
commit 4c9c353145
1 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
NewHorizons/Main.cs
View File

@ -58,7 +58,21 @@ namespace NewHorizons
public static bool IsSystemReady { get; private set; } public static bool IsSystemReady { get; private set; }
public string DefaultStarSystem => SystemDict.ContainsKey(_defaultSystemOverride) ? _defaultSystemOverride : _defaultStarSystem; public string DefaultStarSystem => SystemDict.ContainsKey(_defaultSystemOverride) ? _defaultSystemOverride : _defaultStarSystem;
public string CurrentStarSystem => _currentStarSystem; public string CurrentStarSystem
{
get
{
return _currentStarSystem;
}
private set
{
_previousStarSystem = _currentStarSystem;
_currentStarSystem = value;
}
}
private string _currentStarSystem = "SolarSystem";
private string _previousStarSystem;
public bool TimeLoopEnabled => SystemDict[CurrentStarSystem]?.Config?.enableTimeLoop ?? true; public bool TimeLoopEnabled => SystemDict[CurrentStarSystem]?.Config?.enableTimeLoop ?? true;
public bool IsWarpingFromShip { get; private set; } = false; public bool IsWarpingFromShip { get; private set; } = false;
public bool IsWarpingFromVessel { get; private set; } = false; public bool IsWarpingFromVessel { get; private set; } = false;
@ -72,7 +86,7 @@ namespace NewHorizons
public static bool HasWarpDrive { get; private set; } = false; public static bool HasWarpDrive { get; private set; } = false;
private string _defaultStarSystem = "SolarSystem"; private string _defaultStarSystem = "SolarSystem";
internal string _currentStarSystem = "SolarSystem";
private bool _firstLoad = true; private bool _firstLoad = true;
private bool _playerAwake; private bool _playerAwake;
@ -259,12 +273,19 @@ namespace NewHorizons
private void OnSceneUnloaded(Scene scene) private void OnSceneUnloaded(Scene scene)
{ {
// Caches of GameObjects must always be cleared
SearchUtilities.ClearCache(); SearchUtilities.ClearCache();
ProxyHandler.OnSceneUnloaded();
// Caches of other assets only have to be cleared if we changed star systems
if (CurrentStarSystem != _previousStarSystem)
{
ImageUtilities.ClearCache(); ImageUtilities.ClearCache();
AudioUtilities.ClearCache(); AudioUtilities.ClearCache();
AssetBundleUtilities.ClearCache(); AssetBundleUtilities.ClearCache();
EnumUtilities.ClearCache(); EnumUtilities.ClearCache();
ProxyHandler.OnSceneUnloaded(); }
IsSystemReady = false; IsSystemReady = false;
} }
@ -330,7 +351,7 @@ namespace NewHorizons
if (isEyeOfTheUniverse) if (isEyeOfTheUniverse)
{ {
_currentStarSystem = "EyeOfTheUniverse"; CurrentStarSystem = "EyeOfTheUniverse";
} }
else if (IsWarpingBackToEye) else if (IsWarpingBackToEye)
{ {
@ -341,14 +362,14 @@ namespace NewHorizons
return; return;
} }
if (!SystemDict.ContainsKey(_currentStarSystem) || !BodyDict.ContainsKey(_currentStarSystem)) if (!SystemDict.ContainsKey(CurrentStarSystem) || !BodyDict.ContainsKey(CurrentStarSystem))
{ {
NHLogger.LogError($"System \"{_currentStarSystem}\" does not exist!"); NHLogger.LogError($"System \"{CurrentStarSystem}\" does not exist!");
_currentStarSystem = DefaultStarSystem; CurrentStarSystem = DefaultStarSystem;
} }
// Set time loop stuff if its enabled and if we're warping to a new place // Set time loop stuff if its enabled and if we're warping to a new place
if (IsChangingStarSystem && (SystemDict[_currentStarSystem].Config.enableTimeLoop || _currentStarSystem == "SolarSystem") && SecondsElapsedInLoop > 0f) if (IsChangingStarSystem && (SystemDict[CurrentStarSystem].Config.enableTimeLoop || CurrentStarSystem == "SolarSystem") && SecondsElapsedInLoop > 0f)
{ {
TimeLoopUtilities.SetSecondsElapsed(SecondsElapsedInLoop); TimeLoopUtilities.SetSecondsElapsed(SecondsElapsedInLoop);
// Prevent the OPC from firing // Prevent the OPC from firing
@ -604,7 +625,7 @@ namespace NewHorizons
if (starSystemName != "SolarSystem") if (starSystemName != "SolarSystem")
{ {
SetDefaultSystem(starSystemName); SetDefaultSystem(starSystemName);
_currentStarSystem = DefaultStarSystem; CurrentStarSystem = DefaultStarSystem;
} }
} }
@ -821,7 +842,7 @@ namespace NewHorizons
// If we're just on the title screen set the system for later // If we're just on the title screen set the system for later
if (LoadManager.GetCurrentScene() == OWScene.TitleScreen) if (LoadManager.GetCurrentScene() == OWScene.TitleScreen)
{ {
_currentStarSystem = newStarSystem; CurrentStarSystem = newStarSystem;
IsWarpingFromShip = warp; IsWarpingFromShip = warp;
IsWarpingFromVessel = vessel; IsWarpingFromVessel = vessel;
DidWarpFromVessel = false; DidWarpFromVessel = false;
@ -865,13 +886,13 @@ namespace NewHorizons
{ {
PlayerData.SaveEyeCompletion(); // So that the title screen doesn't keep warping you back to eye PlayerData.SaveEyeCompletion(); // So that the title screen doesn't keep warping you back to eye
if (SystemDict[_currentStarSystem].Config.enableTimeLoop) SecondsElapsedInLoop = TimeLoop.GetSecondsElapsed(); if (SystemDict[CurrentStarSystem].Config.enableTimeLoop) SecondsElapsedInLoop = TimeLoop.GetSecondsElapsed();
else SecondsElapsedInLoop = -1; else SecondsElapsedInLoop = -1;
sceneToLoad = OWScene.SolarSystem; sceneToLoad = OWScene.SolarSystem;
} }
_currentStarSystem = newStarSystem; CurrentStarSystem = newStarSystem;
// Freeze player inputs // Freeze player inputs
OWInput.ChangeInputMode(InputMode.None); OWInput.ChangeInputMode(InputMode.None);
@ -891,7 +912,7 @@ namespace NewHorizons
// We reset the solar system on death // We reset the solar system on death
if (!IsChangingStarSystem) if (!IsChangingStarSystem)
{ {
if (SystemDict[_currentStarSystem].Config.respawnHere) return; if (SystemDict[CurrentStarSystem].Config.respawnHere) return;
ResetCurrentStarSystem(); ResetCurrentStarSystem();
} }
@ -901,7 +922,7 @@ namespace NewHorizons
{ {
if (SystemDict.ContainsKey(_defaultSystemOverride)) if (SystemDict.ContainsKey(_defaultSystemOverride))
{ {
_currentStarSystem = _defaultSystemOverride; CurrentStarSystem = _defaultSystemOverride;
// Sometimes the override will not support spawning regularly, so always warp in // Sometimes the override will not support spawning regularly, so always warp in
IsWarpingFromShip = true; IsWarpingFromShip = true;
@ -914,7 +935,7 @@ namespace NewHorizons
NHLogger.LogError($"The given default system override {_defaultSystemOverride} is invalid - no system exists with that name"); NHLogger.LogError($"The given default system override {_defaultSystemOverride} is invalid - no system exists with that name");
} }
_currentStarSystem = _defaultStarSystem; CurrentStarSystem = _defaultStarSystem;
IsWarpingFromShip = false; IsWarpingFromShip = false;
} }
} }