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 bodylist issue

Browse Source
This commit is contained in:
Mister_Nebula 2020-09-24 00:20:19 +01:00
parent 37c4f45939
commit 246bea3329
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Marshmallow/Main.cs
View File

@ -19,7 +19,7 @@ namespace Marshmallow
{ {
public static IModHelper helper; public static IModHelper helper;
public static List<MarshmallowBody> bodyList = new List<MarshmallowBody>(); public static List<MarshmallowBody> BodyList = new List<MarshmallowBody>();
private bool finishNextUpdate = false; private bool finishNextUpdate = false;
@ -39,8 +39,8 @@ namespace Marshmallow
{ {
foreach (var file in Directory.GetFiles(ModHelper.Manifest.ModFolderPath + @"planets\")) foreach (var file in Directory.GetFiles(ModHelper.Manifest.ModFolderPath + @"planets\"))
{ {
PlanetConfig config = ModHelper.Storage.Load<PlanetConfig>(file.Replace(ModHelper.Manifest.ModFolderPath, "")); var config = ModHelper.Storage.Load<PlanetConfig>(file.Replace(ModHelper.Manifest.ModFolderPath, ""));
bodyList.Add(new MarshmallowBody(config)); BodyList.Add(new MarshmallowBody(config));
Logger.Log("* " + config.Name + " at position " + config.Position.ToVector3() + " relative to " + config.PrimaryBody + ". Moon? : " + config.IsMoon, Logger.LogType.Log); Logger.Log("* " + config.Name + " at position " + config.Position.ToVector3() + " relative to " + config.PrimaryBody + ". Moon? : " + config.IsMoon, Logger.LogType.Log);
} }
@ -50,9 +50,9 @@ namespace Marshmallow
Logger.Log("Error! - " + ex.Message, Logger.LogType.Error); Logger.Log("Error! - " + ex.Message, Logger.LogType.Error);
} }
if (bodyList.Count != 0) if (BodyList.Count != 0)
{ {
Logger.Log("Loaded [" + bodyList.Count + "] config files.", Logger.LogType.Log); Logger.Log("Loaded [" + BodyList.Count + "] config files.", Logger.LogType.Log);
} }
else else
{ {
@ -62,7 +62,12 @@ namespace Marshmallow
void OnSceneLoaded(Scene scene, LoadSceneMode mode) void OnSceneLoaded(Scene scene, LoadSceneMode mode)
{ {
foreach (var body in bodyList) if (scene.name != "SolarSystem")
{
return;
}
foreach (var body in BodyList)
{ {
var planetObject = GenerateBody(body.Config); var planetObject = GenerateBody(body.Config);
@ -82,7 +87,7 @@ namespace Marshmallow
{ {
if (finishNextUpdate) if (finishNextUpdate)
{ {
foreach (var body in bodyList) foreach (var body in BodyList)
{ {
OrbitlineBuilder.Make(body.Object, body.Object.GetComponent<AstroObject>()); OrbitlineBuilder.Make(body.Object, body.Object.GetComponent<AstroObject>());
} }
@ -129,13 +134,6 @@ namespace Marshmallow
AmbientLightBuilder.Make(body, sector, config); AmbientLightBuilder.Make(body, sector, config);
AtmosphereBuilder.Make(body, config); AtmosphereBuilder.Make(body, config);
/*
if (config.HasSpawnPoint)
{
SpawnpointBuilder.Make(body, new Vector3(0, config.GroundSize + 10, 0));
}
*/
Logger.Log("Generation of [" + config.Name + "] completed.", Logger.LogType.Log); Logger.Log("Generation of [" + config.Name + "] completed.", Logger.LogType.Log);
return body; return body;
@ -194,12 +192,14 @@ namespace Marshmallow
LightTint = new MColor32(((Color32)config["LightTint"]).r, ((Color32)config["LightTint"]).g, ((Color32)config["LightTint"]).b, ((Color32)config["LightTint"]).a), LightTint = new MColor32(((Color32)config["LightTint"]).r, ((Color32)config["LightTint"]).g, ((Color32)config["LightTint"]).b, ((Color32)config["LightTint"]).a),
}; };
Main.BodyList.Add(new MarshmallowBody(planetConfig));
Main.helper.Events.Unity.RunWhen(() => Locator.GetCenterOfTheUniverse() != null, () => Main.CreateBody(planetConfig)); Main.helper.Events.Unity.RunWhen(() => Locator.GetCenterOfTheUniverse() != null, () => Main.CreateBody(planetConfig));
} }
public GameObject GetPlanet(string name) public GameObject GetPlanet(string name)
{ {
return Main.bodyList.FirstOrDefault(x => x.Config.Name == name).Object; return Main.BodyList.FirstOrDefault(x => x.Config.Name == name).Object;
} }
} }
} }