diff --git a/NewHorizons/External/Modules/AtmosphereModule.cs b/NewHorizons/External/Modules/AtmosphereModule.cs index b93fbb65..b1f563ac 100644 --- a/NewHorizons/External/Modules/AtmosphereModule.cs +++ b/NewHorizons/External/Modules/AtmosphereModule.cs @@ -120,7 +120,7 @@ namespace NewHorizons.External.Modules /// /// Fluid type for sounds/effects when colliding with this cloud. /// - [DefaultValue("cloud")] public NHFluidType fluidType = NHFluidType.Cloud; + [DefaultValue("cloud")] public NHFluidType fluidType = NHFluidType.CLOUD; /// /// Add lightning to this planet like on Giant's Deep. diff --git a/NewHorizons/External/Modules/Props/Audio/AudioSourceInfo.cs b/NewHorizons/External/Modules/Props/Audio/AudioSourceInfo.cs index d2579780..09bff572 100644 --- a/NewHorizons/External/Modules/Props/Audio/AudioSourceInfo.cs +++ b/NewHorizons/External/Modules/Props/Audio/AudioSourceInfo.cs @@ -8,7 +8,8 @@ namespace NewHorizons.External.Modules.Props.Audio public class AudioSourceInfo : BaseAudioInfo { /// - /// The audio track of this audio source + /// The audio track of this audio source. + /// Most of the time you'll use environment (the default) for sound effects and music for music. /// [DefaultValue("environment")] public NHAudioMixerTrackName track = NHAudioMixerTrackName.Environment; } diff --git a/NewHorizons/External/Modules/Props/TornadoInfo.cs b/NewHorizons/External/Modules/Props/TornadoInfo.cs index 60e9cbda..6ec121c4 100644 --- a/NewHorizons/External/Modules/Props/TornadoInfo.cs +++ b/NewHorizons/External/Modules/Props/TornadoInfo.cs @@ -68,7 +68,7 @@ namespace NewHorizons.External.Modules.Props /// /// Fluid type for sounds/effects when colliding with this tornado. /// - [DefaultValue("cloud")] public NHFluidType fluidType = NHFluidType.Cloud; + [DefaultValue("cloud")] public NHFluidType fluidType = NHFluidType.CLOUD; } } diff --git a/NewHorizons/External/Modules/RingModule.cs b/NewHorizons/External/Modules/RingModule.cs index 3fa16675..ab4dac2c 100644 --- a/NewHorizons/External/Modules/RingModule.cs +++ b/NewHorizons/External/Modules/RingModule.cs @@ -12,7 +12,7 @@ namespace NewHorizons.External.Modules /// /// Fluid type for sounds/effects when colliding with this ring. /// - public NHFluidType fluidType = NHFluidType.None; + public NHFluidType fluidType = NHFluidType.NONE; /// /// Angle between the rings and the equatorial plane of the planet. diff --git a/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs b/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs index 6334ace0..2d302218 100644 --- a/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs +++ b/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs @@ -16,7 +16,8 @@ namespace NewHorizons.External.Modules.Volumes.VolumeInfos [DefaultValue("random")] public NHClipSelectionType clipSelection = NHClipSelectionType.RANDOM; /// - /// The audio track of this audio volume + /// The audio track of this audio volume. + /// Most of the time you'll use environment (the default) for sound effects and music for music. /// [DefaultValue("environment")] public NHAudioMixerTrackName track = NHAudioMixerTrackName.Environment; diff --git a/NewHorizons/External/SerializableEnums/NHFluidType.cs b/NewHorizons/External/SerializableEnums/NHFluidType.cs index f9eb0c83..f7b406f9 100644 --- a/NewHorizons/External/SerializableEnums/NHFluidType.cs +++ b/NewHorizons/External/SerializableEnums/NHFluidType.cs @@ -7,14 +7,14 @@ namespace NewHorizons.External.SerializableEnums [JsonConverter(typeof(StringEnumConverter))] public enum NHFluidType { - [EnumMember(Value = @"none")] None = 0, + [EnumMember(Value = @"none")] NONE = 0, - [EnumMember(Value = @"water")] Water = 1, + [EnumMember(Value = @"water")] WATER = 1, - [EnumMember(Value = @"cloud")] Cloud = 2, + [EnumMember(Value = @"cloud")] CLOUD = 2, - [EnumMember(Value = @"sand")] Sand = 3, + [EnumMember(Value = @"sand")] SAND = 3, - [EnumMember(Value = @"plasma")] Plasma = 4 + [EnumMember(Value = @"plasma")] PLASMA = 4 } } diff --git a/NewHorizons/Schemas/body_schema.json b/NewHorizons/Schemas/body_schema.json index cbcb608a..e6a1e5be 100644 --- a/NewHorizons/Schemas/body_schema.json +++ b/NewHorizons/Schemas/body_schema.json @@ -484,11 +484,11 @@ "type": "string", "description": "", "x-enumNames": [ - "None", - "Water", - "Cloud", - "Sand", - "Plasma" + "NONE", + "WATER", + "CLOUD", + "SAND", + "PLASMA" ], "enum": [ "none", @@ -2690,7 +2690,7 @@ "description": "An optional rename of this object" }, "track": { - "description": "The audio track of this audio source", + "description": "The audio track of this audio source.\nMost of the time you'll use environment (the default) for sound effects and music for music. ", "default": "environment", "$ref": "#/definitions/NHAudioMixerTrackName" } @@ -3424,7 +3424,7 @@ "$ref": "#/definitions/NHClipSelectionType" }, "track": { - "description": "The audio track of this audio volume", + "description": "The audio track of this audio volume.\nMost of the time you'll use environment (the default) for sound effects and music for music. ", "default": "environment", "$ref": "#/definitions/NHAudioMixerTrackName" }, diff --git a/NewHorizons/Utility/NewHorizonExtensions.cs b/NewHorizons/Utility/NewHorizonExtensions.cs index a0a5303b..e8e2222c 100644 --- a/NewHorizons/Utility/NewHorizonExtensions.cs +++ b/NewHorizons/Utility/NewHorizonExtensions.cs @@ -255,13 +255,13 @@ namespace NewHorizons.Utility } public static FluidVolume.Type ConvertToOW(this NHFluidType fluidType, FluidVolume.Type @default = FluidVolume.Type.NONE) - => EnumUtils.Parse(fluidType.ToString().ToUpper(), @default); + => EnumUtils.Parse(fluidType.ToString(), @default); public static OWAudioMixer.TrackName ConvertToOW(this NHAudioMixerTrackName trackName, OWAudioMixer.TrackName @default = OWAudioMixer.TrackName.Environment) - => EnumUtils.Parse(trackName.ToString().ToUpper(), @default); + => EnumUtils.Parse(trackName.ToString(), @default); public static OWAudioSource.ClipSelectionOnPlay ConvertToOW(this NHClipSelectionType clipSelection, OWAudioSource.ClipSelectionOnPlay @default = OWAudioSource.ClipSelectionOnPlay.RANDOM) - => EnumUtils.Parse(clipSelection.ToString().ToUpper(), @default); + => EnumUtils.Parse(clipSelection.ToString(), @default); public static void SmoothLookDir(this GameObject go, Vector3 direction, float dt, float angularVelocity) { diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index a295d1da..3154f875 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -4,7 +4,7 @@ "author": "xen, Bwc9876, clay, MegaPiggy, John, Trifid, Hawkbar, Book", "name": "New Horizons", "uniqueName": "xen.NewHorizons", - "version": "1.11.0", + "version": "1.11.1", "owmlVersion": "2.9.0", "dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ],