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

Ship spawn (#711)

Browse Source 
## Bug fixes
- Allow setting ship spawns in main solar system / separately from the
player spawn. Implements #677
This commit is contained in:
Nick 2023-08-25 22:23:43 -04:00 committed by GitHub
commit 72e984f531
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NewHorizons/Components/ShipLog/ShipLogStarChartMode.cs
View File

@ -259,7 +259,7 @@ namespace NewHorizons.Components.ShipLog
if (!name.Equals(uniqueID)) return name; if (!name.Equals(uniqueID)) return name;
// Else we return a default name // Else we return a default name
if (uniqueID.Equals("SolarSystem")) return "Hearthian System"; if (uniqueID.Equals("SolarSystem")) return "The Outer Wilds";
var splitString = uniqueID.Split('.'); var splitString = uniqueID.Split('.');
if (splitString.Length > 1) splitString = splitString.Skip(1).ToArray(); if (splitString.Length > 1) splitString = splitString.Skip(1).ToArray();

3
NewHorizons/Handlers/PlanetCreationHandler.cs
View File

@ -391,7 +391,8 @@ namespace NewHorizons.Handlers
if (defaultPrimaryToSun) if (defaultPrimaryToSun)
{ {
NHLogger.LogError($"Couldn't find {body.Config.Orbit.primaryBody}, defaulting to center of solar system"); NHLogger.LogError($"Couldn't find {body.Config.Orbit.primaryBody}, defaulting to center of solar system");
primaryBody = Locator.GetCenterOfTheUniverse().GetAttachedOWRigidbody().GetComponent<AstroObject>(); // TODO: Make this work in other systems. We tried using Locator.GetCenterOfUniverse before but that doesn't work since its too early now
primaryBody = SearchUtilities.Find("Sun_Body")?.GetComponent<AstroObject>();
} }
else else
{ {

28
NewHorizons/Handlers/PlayerSpawnHandler.cs
View File

@ -51,11 +51,19 @@ namespace NewHorizons.Handlers
// Ensures it has invoked everything and actually placed the player in the cloaking field #671 // Ensures it has invoked everything and actually placed the player in the cloaking field #671
cloak._firstUpdate = true; cloak._firstUpdate = true;
} }
// Spawn ship
Delay.FireInNUpdates(SpawnShip, 30);
} }
public static void SpawnShip() public static void SpawnShip()
{ {
var ship = SearchUtilities.Find("Ship_Body"); var ship = SearchUtilities.Find("Ship_Body");
if (SpawnPointBuilder.ShipSpawn != null)
{
NHLogger.Log("Spawning player ship");
if (ship != null) if (ship != null)
{ {
ship.SetActive(true); ship.SetActive(true);
@ -71,6 +79,12 @@ namespace NewHorizons.Handlers
SpawnBody(ship.GetAttachedOWRigidbody(), SpawnPointBuilder.ShipSpawn, pos); SpawnBody(ship.GetAttachedOWRigidbody(), SpawnPointBuilder.ShipSpawn, pos);
} }
} }
else if (Main.Instance.CurrentStarSystem != "SolarSystem" && !Main.Instance.IsWarpingFromShip)
{
NHLogger.Log("System has no ship spawn. Deactivating it.");
ship?.SetActive(false);
}
}
private static IEnumerator SpawnCoroutine(int length) private static IEnumerator SpawnCoroutine(int length)
{ {
@ -81,20 +95,6 @@ namespace NewHorizons.Handlers
} }
InvulnerabilityHandler.MakeInvulnerable(false); InvulnerabilityHandler.MakeInvulnerable(false);
if (!Main.Instance.IsWarpingFromShip)
{
if (SpawnPointBuilder.ShipSpawn != null)
{
NHLogger.Log("Spawning player ship");
SpawnShip();
}
else
{
NHLogger.Log("System has no ship spawn. Deactivating it.");
SearchUtilities.Find("Ship_Body")?.SetActive(false);
}
}
} }
private static void FixPlayerVelocity() private static void FixPlayerVelocity()