Merge branch 'dev' of github.com:xen-42/outer-wilds-new-horizons into dev
This commit is contained in:
FreezeDriedMangoes 2022-07-14 23:30:22 -04:00
commit 84cd0c3930
3 changed files with 14 additions and 2 deletions

View File

@ -11,7 +11,7 @@ on:
jobs: jobs:
Update_Release: Update_Release:
name: Create/Update Release name: Create/Update Release
if: ${{ github.event.pull_request.draft == 'false' && contains(github.event.pull_request.labels.*.name, 'update-pr') }} if: contains(github.event.pull_request.labels.*.name, 'update-pr')
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Create/Update Release - name: Create/Update Release

View File

@ -27,6 +27,8 @@ namespace NewHorizons.Builder.Atmosphere
ShockLayerRuleset shockLayerRuleset = planetGO.GetComponentInChildren<PlanetoidRuleset>().gameObject.AddComponent<ShockLayerRuleset>(); ShockLayerRuleset shockLayerRuleset = planetGO.GetComponentInChildren<PlanetoidRuleset>().gameObject.AddComponent<ShockLayerRuleset>();
shockLayerRuleset._type = ShockLayerRuleset.ShockType.Atmospheric; shockLayerRuleset._type = ShockLayerRuleset.ShockType.Atmospheric;
shockLayerRuleset._radialCenter = airGO.transform; shockLayerRuleset._radialCenter = airGO.transform;
shockLayerRuleset._minShockSpeed = config.Atmosphere.minShockSpeed;
shockLayerRuleset._maxShockSpeed = config.Atmosphere.maxShockSpeed;
if (config.Atmosphere.clouds != null) if (config.Atmosphere.clouds != null)
{ {

View File

@ -86,6 +86,16 @@ namespace NewHorizons.External.Modules
/// </summary> /// </summary>
public bool useAtmosphereShader; public bool useAtmosphereShader;
/// <summary>
/// Minimum speed that your ship can go in the atmosphere where flames will appear.
/// </summary>
[DefaultValue(100f)] public float minShockSpeed = 100f;
/// <summary>
/// Maximum speed that your ship can go in the atmosphere where flames will appear at their brightest.
/// </summary>
[DefaultValue(300f)] public float maxShockSpeed = 300f;
[JsonObject] [JsonObject]
public class CloudInfo public class CloudInfo
{ {