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

Fix merge

Browse Source
This commit is contained in:
Nick 2022-05-22 00:46:39 -04:00
parent 92350845ee
commit 134ba469d3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NewHorizons/Main.cs
View File

@ -16,6 +16,8 @@ using UnityEngine;
using UnityEngine.Events; using UnityEngine.Events;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
using Logger = NewHorizons.Utility.Logger; using Logger = NewHorizons.Utility.Logger;
using NewHorizons.Utility.DebugUtilities;
namespace NewHorizons namespace NewHorizons
{ {
public class Main : ModBehaviour public class Main : ModBehaviour
@ -266,6 +268,8 @@ namespace NewHorizons
private void OnSystemReady(bool shouldWarpIn) private void OnSystemReady(bool shouldWarpIn)
{ {
Locator.GetPlayerBody().gameObject.AddComponent<DebugRaycaster>(); Locator.GetPlayerBody().gameObject.AddComponent<DebugRaycaster>();
Locator.GetPlayerBody().gameObject.AddComponent<DebugPropPlacer>();
Locator.GetPlayerBody().gameObject.AddComponent<DebugMenu>();
if (shouldWarpIn) _shipWarpController.WarpIn(WearingSuit); if (shouldWarpIn) _shipWarpController.WarpIn(WearingSuit);
else FindObjectOfType<PlayerSpawner>().DebugWarp(SystemDict[_currentStarSystem].SpawnPoint); else FindObjectOfType<PlayerSpawner>().DebugWarp(SystemDict[_currentStarSystem].SpawnPoint);
@ -393,7 +397,7 @@ namespace NewHorizons
BodyDict.Add(config.StarSystem, new List<NewHorizonsBody>()); BodyDict.Add(config.StarSystem, new List<NewHorizonsBody>());
} }
body = new NewHorizonsBody(config, mod); body = new NewHorizonsBody(config, mod, relativeDirectory);
} }
catch (Exception e) catch (Exception e)
{ {