mirror of
https://github.com/Outer-Wilds-New-Horizons/new-horizons.git
synced 2025-12-11 20:15:44 +01:00
Treat TH spawnpoint as having isDefault set, meaning we never default to custom spawn points with no conditions or isDefault set
This commit is contained in:
parent
d5aa088e09
commit
fdb165943b
@ -51,7 +51,20 @@ namespace NewHorizons.Builder.General
|
|||||||
// This was a stupid hack to stop players getting stuck in the ground and now we have to keep it forever
|
// This was a stupid hack to stop players getting stuck in the ground and now we have to keep it forever
|
||||||
spawnGO.transform.position += spawnGO.transform.TransformDirection(point.offset ?? Vector3.up * 4f);
|
spawnGO.transform.position += spawnGO.transform.TransformDirection(point.offset ?? Vector3.up * 4f);
|
||||||
|
|
||||||
if (PlayerSpawn == null || point.GetPriority() > PlayerSpawnInfo.GetPriority())
|
var flagUseTHSpawn = false;
|
||||||
|
if (Main.Instance.CurrentStarSystem == "SolarSystem")
|
||||||
|
{
|
||||||
|
// When in the base solar system, treat the TH spawn point as being isDefault
|
||||||
|
// If the priority of any new spawn point is less than that, ignore it
|
||||||
|
// Do take them if they're equal tho
|
||||||
|
var minPriority = new SpawnModule.PlayerSpawnPoint() { isDefault = true }.GetPriority();
|
||||||
|
if (point.GetPriority() < minPriority)
|
||||||
|
{
|
||||||
|
//flagUseTHSpawn = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!flagUseTHSpawn && (PlayerSpawn == null || point.GetPriority() > PlayerSpawnInfo.GetPriority()))
|
||||||
{
|
{
|
||||||
PlayerSpawn = playerSpawn;
|
PlayerSpawn = playerSpawn;
|
||||||
PlayerSpawnInfo = point;
|
PlayerSpawnInfo = point;
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
"author": "xen, Bwc9876, JohnCorby, MegaPiggy, Trifid, and friends",
|
"author": "xen, Bwc9876, JohnCorby, MegaPiggy, Trifid, and friends",
|
||||||
"name": "New Horizons",
|
"name": "New Horizons",
|
||||||
"uniqueName": "xen.NewHorizons",
|
"uniqueName": "xen.NewHorizons",
|
||||||
"version": "1.24.3",
|
"version": "1.24.4",
|
||||||
"owmlVersion": "2.12.1",
|
"owmlVersion": "2.12.1",
|
||||||
"dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
|
"dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
|
||||||
"conflicts": [ "PacificEngine.OW_CommonResources" ],
|
"conflicts": [ "PacificEngine.OW_CommonResources" ],
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user