Keep shuttles/cannons loaded, fix cannon fact NRE

This commit is contained in:
Nick 2023-07-22 12:29:54 -04:00
parent edd81d0c39
commit 615fe2f47c
2 changed files with 6 additions and 6 deletions

View File

@ -39,16 +39,16 @@ namespace NewHorizons.Builder.Props
if (_prefab == null || planetGO == null || sector == null) return null;
var detailInfo = new DetailInfo(info);
var detailInfo = new DetailInfo(info) { keepLoaded = true };
var gravityCannonObject = DetailBuilder.Make(planetGO, sector, _prefab, detailInfo);
gravityCannonObject.SetActive(false);
StreamingHandler.SetUpStreaming(gravityCannonObject, sector);
var gravityCannonController = gravityCannonObject.GetComponent<GravityCannonController>();
gravityCannonController._shuttleID = ShuttleHandler.GetShuttleID(info.shuttleID);
gravityCannonController._retrieveShipLogFact = info.retrieveReveal;
gravityCannonController._launchShipLogFact = info.launchReveal;
// Gravity controller checks string length instead of isnullorempty
gravityCannonController._retrieveShipLogFact = info.retrieveReveal ?? string.Empty;
gravityCannonController._launchShipLogFact = info.launchReveal ?? string.Empty;
if (info.computer != null)
{

View File

@ -71,7 +71,7 @@ namespace NewHorizons.Builder.Props
if (_prefab == null || planetGO == null || sector == null) return null;
var detailInfo = new DetailInfo(info);
var detailInfo = new DetailInfo(info) { keepLoaded = true };
var shuttleObject = DetailBuilder.Make(planetGO, sector, _prefab, detailInfo);
shuttleObject.SetActive(false);