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

Rewrite to support hijackdeathsequence, but haven't tested

Browse Source
This commit is contained in:
xen-42 2025-04-08 11:17:45 -04:00
parent 5d680277ec
commit ee776e384b
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
NewHorizons/Components/NHGameOverManager.cs
View File

@ -9,7 +9,6 @@ using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using UnityEngine; using UnityEngine;
namespace NewHorizons.Components namespace NewHorizons.Components
@ -20,14 +19,14 @@ namespace NewHorizons.Components
/// Mod unique id to game over module list /// Mod unique id to game over module list
/// Done as a dictionary so that Reload Configs can overwrite entries per mod /// Done as a dictionary so that Reload Configs can overwrite entries per mod
/// </summary> /// </summary>
public static Dictionary<string, GameOverModule[]> gameOvers = new(); public static Dictionary<IModBehaviour, GameOverModule[]> gameOvers = new();
public static NHGameOverManager Instance { get; private set; } public static NHGameOverManager Instance { get; private set; }
private GameOverController _gameOverController; private GameOverController _gameOverController;
private PlayerCameraEffectController _playerCameraEffectController; private PlayerCameraEffectController _playerCameraEffectController;
private GameOverModule[] _gameOvers; private (IModBehaviour mod, GameOverModule gameOver)[] _gameOvers;
private bool _gameOverSequenceStarted; private bool _gameOverSequenceStarted;
@ -41,15 +40,25 @@ namespace NewHorizons.Components
_gameOverController = FindObjectOfType<GameOverController>(); _gameOverController = FindObjectOfType<GameOverController>();
_playerCameraEffectController = FindObjectOfType<PlayerCameraEffectController>(); _playerCameraEffectController = FindObjectOfType<PlayerCameraEffectController>();
_gameOvers = gameOvers.SelectMany(x => x.Value).ToArray(); var gameOverList = new List<(IModBehaviour, GameOverModule)>();
foreach (var gameOverPair in gameOvers)
{
var mod = gameOverPair.Key;
foreach (var gameOver in gameOverPair.Value)
{
gameOverList.Add((mod, gameOver));
}
}
_gameOvers = gameOverList.ToArray();
} }
public void TryHijackDeathSequence() public void TryHijackDeathSequence()
{ {
var gameOver = _gameOvers.FirstOrDefault(x => !string.IsNullOrEmpty(x.condition) && DialogueConditionManager.SharedInstance.GetConditionState(x.condition)); var gameOver = _gameOvers.FirstOrDefault(x => !string.IsNullOrEmpty(x.gameOver.condition)
if (!_gameOverSequenceStarted && gameOver != null && !Locator.GetDeathManager()._finishedDLC) && DialogueConditionManager.SharedInstance.GetConditionState(x.gameOver.condition));
if (!_gameOverSequenceStarted && gameOver != default && !Locator.GetDeathManager()._finishedDLC)
{ {
StartGameOverSequence(gameOver, null, null); StartGameOverSequence(gameOver.gameOver, null, gameOver.mod);
} }
} }
@ -151,19 +160,13 @@ namespace NewHorizons.Components
EventHandler onCreditsBuilt = null; // needs to be done so we can unsubscribe from within the lambda. EventHandler onCreditsBuilt = null; // needs to be done so we can unsubscribe from within the lambda.
onCreditsBuilt = (sender, e) => onCreditsBuilt = (sender, e) =>
{ {
// Unsubscribe first, playing it safe in case it NREs
CreditsPatches.CreditsBuilt -= onCreditsBuilt;
// Patch new music clip // Patch new music clip
var musicSource = Locator.FindObjectsOfType<OWAudioSource>().Where(x => x.name == "AudioSource").Single(); // AudioSource that plays the credits music is literally called "AudioSource", luckily it's the only one called that. Lazy OW devs do be lazy. var musicSource = Locator.FindObjectsOfType<OWAudioSource>().Where(x => x.name == "AudioSource").Single(); // AudioSource that plays the credits music is literally called "AudioSource", luckily it's the only one called that. Lazy OW devs do be lazy.
if (mod is not null) AudioUtilities.SetAudioClip(musicSource, gameOver.audio, mod);
{
AudioUtilities.SetAudioClip(musicSource, gameOver.audio, mod);
}
else
{
// We can't load in custom music if an IModBehaviour cannot be provided. This should only happen if called via TryHijackDeathSequence().
NHLogger.Log("Credits called using TryHijackDeathSequence(), custom credits audio cannot not be loaded.");
return;
}
musicSource.loop = gameOver.audioLooping; musicSource.loop = gameOver.audioLooping;
musicSource._maxSourceVolume = gameOver.audioVolume; musicSource._maxSourceVolume = gameOver.audioVolume;
@ -174,8 +177,6 @@ namespace NewHorizons.Components
// Patch scroll duration // Patch scroll duration
var creditsScroll = Locator.FindObjectOfType<CreditsScrollSection>(); var creditsScroll = Locator.FindObjectOfType<CreditsScrollSection>();
creditsScroll._scrollDuration = gameOver.length; creditsScroll._scrollDuration = gameOver.length;
CreditsPatches.CreditsBuilt -= onCreditsBuilt;
}; };
CreditsPatches.CreditsBuilt += onCreditsBuilt; CreditsPatches.CreditsBuilt += onCreditsBuilt;

2
NewHorizons/Main.cs
View File

@ -849,7 +849,7 @@ namespace NewHorizons
} }
if (addonConfig.gameOver != null) if (addonConfig.gameOver != null)
{ {
NHGameOverManager.gameOvers[mod.ModHelper.Manifest.UniqueName] = addonConfig.gameOver; NHGameOverManager.gameOvers[mod] = addonConfig.gameOver;
} }
AddonConfigs[mod] = addonConfig; AddonConfigs[mod] = addonConfig;