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

Deprecate goSupernova

Browse Source
This commit is contained in:
Noah Pilarski 2022-08-18 14:50:48 -04:00
parent 7c02d5f85b
commit fc6d5d8a74
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NewHorizons/Builder/Body/StarBuilder.cs
View File

@ -161,7 +161,7 @@ namespace NewHorizons.Builder.Body
controller.StartColour = starModule.tint; controller.StartColour = starModule.tint;
controller.EndColour = starModule.endTint; controller.EndColour = starModule.endTint;
controller.SupernovaColour = starModule.supernovaTint; controller.SupernovaColour = starModule.supernovaTint;
controller.WillExplode = starModule.goSupernova; controller.WillExplode = starModule.stellarDeathType != StellarDeathType.None;
controller.lifespan = starModule.lifespan; controller.lifespan = starModule.lifespan;
controller.normalRamp = !string.IsNullOrEmpty(starModule.starRampTexture) ? ImageUtilities.GetTexture(mod, starModule.starRampTexture) : ramp; controller.normalRamp = !string.IsNullOrEmpty(starModule.starRampTexture) ? ImageUtilities.GetTexture(mod, starModule.starRampTexture) : ramp;
controller._heatVolume = heatVolume.GetComponent<HeatHazardVolume>(); controller._heatVolume = heatVolume.GetComponent<HeatHazardVolume>();
@ -217,7 +217,7 @@ namespace NewHorizons.Builder.Body
controller.StartColour = starModule.tint; controller.StartColour = starModule.tint;
controller.EndColour = starModule.endTint; controller.EndColour = starModule.endTint;
controller.SupernovaColour = starModule.supernovaTint; controller.SupernovaColour = starModule.supernovaTint;
controller.WillExplode = starModule.goSupernova; controller.WillExplode = starModule.stellarDeathType != StellarDeathType.None;
controller.lifespan = starModule.lifespan; controller.lifespan = starModule.lifespan;
controller.normalRamp = !string.IsNullOrEmpty(starModule.starRampTexture) ? ImageUtilities.GetTexture(mod, starModule.starRampTexture) : ramp; controller.normalRamp = !string.IsNullOrEmpty(starModule.starRampTexture) ? ImageUtilities.GetTexture(mod, starModule.starRampTexture) : ramp;
if (!string.IsNullOrEmpty(starModule.starCollapseRampTexture)) if (!string.IsNullOrEmpty(starModule.starCollapseRampTexture))

7
NewHorizons/External/Configs/PlanetConfig.cs vendored
View File

@ -351,6 +351,13 @@ namespace NewHorizons.External.Configs
if (Props.signals == null) Props.signals = new SignalModule.SignalInfo[0]; if (Props.signals == null) Props.signals = new SignalModule.SignalInfo[0];
Props.signals = Props.signals.Concat(Signal.signals).ToArray(); Props.signals = Props.signals.Concat(Signal.signals).ToArray();
} }
// Star
if (Star != null)
{
if (!Star.goSupernova) Star.stellarDeathType = StellarDeathType.None;
}
// Signals no longer use two different variables for audio // Signals no longer use two different variables for audio
if (Props?.signals != null) if (Props?.signals != null)
{ {

4
NewHorizons/External/Modules/VariableSize/StarModule.cs vendored
View File

@ -1,3 +1,4 @@
using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization; using System.Runtime.Serialization;
@ -19,7 +20,7 @@ namespace NewHorizons.External.Modules.VariableSize
/// <summary> /// <summary>
/// Should this star explode at the end of its lifespan? /// Should this star explode at the end of its lifespan?
/// </summary> /// </summary>
[DefaultValue(true)] public bool goSupernova = true; [Obsolete("goSupernova is deprecated, please use stellarDeathType instead")] [DefaultValue(true)] public bool goSupernova = true;
/// <summary> /// <summary>
/// How long in minutes this star will last until it supernovas. /// How long in minutes this star will last until it supernovas.
@ -103,6 +104,7 @@ namespace NewHorizons.External.Modules.VariableSize
public enum StellarDeathType public enum StellarDeathType
{ {
[EnumMember(Value = @"default")] Default, [EnumMember(Value = @"default")] Default,
[EnumMember(Value = @"none")] None,
[EnumMember(Value = @"planetaryNebula")] PlanetaryNebula, [EnumMember(Value = @"planetaryNebula")] PlanetaryNebula,
[EnumMember(Value = @"supernova")] Supernova [EnumMember(Value = @"supernova")] Supernova
} }