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 ship spawning separately from player #677

Browse Source
This commit is contained in:
Nick 2023-08-24 14:35:55 -04:00
parent b912593ed1
commit 455068077f
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
NewHorizons/Handlers/PlayerSpawnHandler.cs
View File

@ -51,24 +51,38 @@ 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 (ship != null)
if (SpawnPointBuilder.ShipSpawn != null)
{ {
ship.SetActive(true); NHLogger.Log("Spawning player ship");
var pos = SpawnPointBuilder.ShipSpawn.transform.position; if (ship != null)
// Move it up a bit more when aligning to surface
if (SpawnPointBuilder.ShipSpawnOffset != null)
{ {
pos += SpawnPointBuilder.ShipSpawn.transform.TransformDirection(SpawnPointBuilder.ShipSpawnOffset); ship.SetActive(true);
}
SpawnBody(ship.GetAttachedOWRigidbody(), SpawnPointBuilder.ShipSpawn, pos); var pos = SpawnPointBuilder.ShipSpawn.transform.position;
// Move it up a bit more when aligning to surface
if (SpawnPointBuilder.ShipSpawnOffset != null)
{
pos += SpawnPointBuilder.ShipSpawn.transform.TransformDirection(SpawnPointBuilder.ShipSpawnOffset);
}
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);
} }
} }
@ -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()