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

actually provide default values

Browse Source
This commit is contained in:
JohnCorby 2023-11-28 13:22:05 -08:00
parent 67ff544fb3
commit 914ff4df5c
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NewHorizons/Builder/Props/ProjectionBuilder.cs
View File

@ -335,7 +335,7 @@ namespace NewHorizons.Builder.Props
private static void AddModules(SlideInfo slideInfo, ref Slide slide, IModBehaviour mod) private static void AddModules(SlideInfo slideInfo, ref Slide slide, IModBehaviour mod)
{ {
var modules = new List<SlideFunctionModule>(); var modules = new List<SlideFunctionModule>();
if (!String.IsNullOrEmpty(slideInfo.beatAudio)) if (!string.IsNullOrEmpty(slideInfo.beatAudio))
{ {
var audioBeat = new SlideBeatAudioModule var audioBeat = new SlideBeatAudioModule
{ {
@ -344,7 +344,7 @@ namespace NewHorizons.Builder.Props
}; };
modules.Add(audioBeat); modules.Add(audioBeat);
} }
if (!String.IsNullOrEmpty(slideInfo.backdropAudio)) if (!string.IsNullOrEmpty(slideInfo.backdropAudio))
{ {
var audioBackdrop = new SlideBackdropAudioModule var audioBackdrop = new SlideBackdropAudioModule
{ {
@ -353,13 +353,13 @@ namespace NewHorizons.Builder.Props
}; };
modules.Add(audioBackdrop); modules.Add(audioBackdrop);
} }
if (slideInfo.ambientLightIntensity > 0) if (slideInfo.ambientLightIntensity != 0)
{ {
var ambientLight = new SlideAmbientLightModule var ambientLight = new SlideAmbientLightModule
{ {
_intensity = slideInfo.ambientLightIntensity, _intensity = slideInfo.ambientLightIntensity,
_range = slideInfo.ambientLightRange, _range = slideInfo.ambientLightRange,
_color = slideInfo.ambientLightColor.ToColor(), _color = slideInfo.ambientLightColor?.ToColor() ?? Color.white,
_spotIntensityMod = slideInfo.spotIntensityMod _spotIntensityMod = slideInfo.spotIntensityMod
}; };
modules.Add(ambientLight); modules.Add(ambientLight);
@ -380,7 +380,7 @@ namespace NewHorizons.Builder.Props
}; };
modules.Add(blackFrame); modules.Add(blackFrame);
} }
if (!String.IsNullOrEmpty(slideInfo.reveal)) if (!string.IsNullOrEmpty(slideInfo.reveal))
{ {
var shipLogEntry = new SlideShipLogEntryModule var shipLogEntry = new SlideShipLogEntryModule
{ {

37
NewHorizons/External/Modules/Props/EchoesOfTheEye/SlideInfo.cs vendored
View File

@ -1,5 +1,6 @@
using NewHorizons.External.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel;
namespace NewHorizons.External.Modules.Props.EchoesOfTheEye namespace NewHorizons.External.Modules.Props.EchoesOfTheEye
{ {
@ -14,67 +15,73 @@ namespace NewHorizons.External.Modules.Props.EchoesOfTheEye
// SlideAmbientLightModule // SlideAmbientLightModule
/// <summary> /// <summary>
/// Ambient light intensity when viewing this slide. (Base game default: 1) /// Ambient light intensity when viewing this slide.
/// Set this to add ambient light module. Base game default is 1.
/// </summary> /// </summary>
public float ambientLightIntensity; public float ambientLightIntensity;
/// <summary> /// <summary>
/// Ambient light range when viewing this slide. (Base game default: 20) /// Ambient light range when viewing this slide.
/// </summary> /// </summary>
public float ambientLightRange; [DefaultValue(20f)] public float ambientLightRange = 20f;
/// <summary> /// <summary>
/// Ambient light colour when viewing this slide. (Base game default: white) /// Ambient light colour when viewing this slide. Defaults to white.
/// </summary> /// </summary>
public MColor ambientLightColor; public MColor ambientLightColor;
/// <summary> /// <summary>
/// Spotlight intensity modifier when viewing this slide. (Base game default: 0) /// Spotlight intensity modifier when viewing this slide.
/// </summary> /// </summary>
public float spotIntensityMod; [DefaultValue(0f)] public float spotIntensityMod = 0f;
// SlideBackdropAudioModule // SlideBackdropAudioModule
/// <summary> /// <summary>
/// The name of the AudioClip that will continuously play while watching these slides (Base game default: Reel_1_Backdrop_A) /// The name of the AudioClip that will continuously loop while watching these slides.
/// Set this to include backdrop audio module. Base game default is Reel_1_Backdrop_A.
/// </summary> /// </summary>
public string backdropAudio; public string backdropAudio;
/// <summary> /// <summary>
/// The time to fade into the backdrop audio (Base game default: 2) /// The time to fade into the backdrop audio.
/// </summary> /// </summary>
public float backdropFadeTime; [DefaultValue(2f)] public float backdropFadeTime = 2f;
// SlideBeatAudioModule // SlideBeatAudioModule
/// <summary> /// <summary>
/// The name of the AudioClip for a one-shot sound when opening the slide. (Base game default: Reel_1_Beat_A) /// The name of the AudioClip for a one-shot sound when opening the slide.
/// Set this to include beat audio module. Base game default is Reel_1_Beat_A.
/// </summary> /// </summary>
public string beatAudio; public string beatAudio;
/// <summary> /// <summary>
/// The time delay until the one-shot audio (Base game default: 0) /// The time delay until the one-shot audio.
/// </summary> /// </summary>
public float beatDelay; [DefaultValue(0f)] public float beatDelay = 0f;
// SlideBlackFrameModule // SlideBlackFrameModule
/// <summary> /// <summary>
/// Before viewing this slide, there will be a black frame for this many seconds. (Base game default: 0) /// Before viewing this slide, there will be a black frame for this many seconds.
/// Set this to include black frame module. Base game default is 0.
/// </summary> /// </summary>
public float blackFrameDuration; public float blackFrameDuration;
// SlidePlayTimeModule // SlidePlayTimeModule
/// <summary> /// <summary>
/// Play-time duration for auto-projector slides. (Base game default: 0) /// Play-time duration for auto-projector slides.
/// Set this to include play time module. Base game default is 0.
/// </summary> /// </summary>
public float playTimeDuration; public float playTimeDuration;
// SlideShipLogEntryModule // SlideShipLogEntryModule
/// <summary> /// <summary>
/// Ship log fact revealed when viewing this slide (Base game default: "") /// Ship log fact revealed when viewing this slide.
/// Set this to include ship log entry module. Base game default is "".
/// </summary> /// </summary>
public string reveal; public string reveal;
} }