From 7c981b32a43e2930b1f4aeb31bb3b260ff6aa17f Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Thu, 14 Jul 2022 23:26:17 -0400 Subject: [PATCH 1/3] Configurable shock speeds --- NewHorizons/Builder/Atmosphere/AirBuilder.cs | 2 ++ NewHorizons/External/Modules/AtmosphereModule.cs | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/NewHorizons/Builder/Atmosphere/AirBuilder.cs b/NewHorizons/Builder/Atmosphere/AirBuilder.cs index 3336bc59..b3cda09b 100644 --- a/NewHorizons/Builder/Atmosphere/AirBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/AirBuilder.cs @@ -27,6 +27,8 @@ namespace NewHorizons.Builder.Atmosphere ShockLayerRuleset shockLayerRuleset = planetGO.GetComponentInChildren().gameObject.AddComponent(); shockLayerRuleset._type = ShockLayerRuleset.ShockType.Atmospheric; shockLayerRuleset._radialCenter = airGO.transform; + shockLayerRuleset._minShockSpeed = config.Atmosphere.minShockSpeed; + shockLayerRuleset._maxShockSpeed = config.Atmosphere.maxShockSpeed; if (config.Atmosphere.clouds != null) { diff --git a/NewHorizons/External/Modules/AtmosphereModule.cs b/NewHorizons/External/Modules/AtmosphereModule.cs index 786475f5..b0f31bc9 100644 --- a/NewHorizons/External/Modules/AtmosphereModule.cs +++ b/NewHorizons/External/Modules/AtmosphereModule.cs @@ -86,6 +86,16 @@ namespace NewHorizons.External.Modules /// public bool useAtmosphereShader; + /// + /// Minimum speed that your ship can go in the atmosphere where flames will appear. + /// + [DefaultValue(100f)] public float minShockSpeed = 100f; + + /// + /// Maximum speed that your ship can go in the atmosphere where flames will appear at their brightest. + /// + [DefaultValue(300f)] public float maxShockSpeed = 300f; + [JsonObject] public class CloudInfo { From fab9dcb4e59f14f71c68c0d65989d3ce5c9b4cc1 Mon Sep 17 00:00:00 2001 From: Ben C Date: Thu, 14 Jul 2022 20:27:57 -0700 Subject: [PATCH 2/3] Gorp --- .github/workflows/update_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update_release.yml b/.github/workflows/update_release.yml index 7428c467..207995d5 100644 --- a/.github/workflows/update_release.yml +++ b/.github/workflows/update_release.yml @@ -11,7 +11,7 @@ on: jobs: Update_Release: name: Create/Update Release - if: ${{ github.event.pull_request.draft == 'false' && contains(github.event.pull_request.labels.*.name, 'update-pr') }} + if: github.event.pull_request.draft == 'false' && contains(github.event.pull_request.labels.*.name, 'update-pr') runs-on: ubuntu-latest steps: - name: Create/Update Release @@ -26,4 +26,4 @@ jobs: **Generated From PR: ${{ github.event.pull_request.html_url }}** draft: true - prerelease: false \ No newline at end of file + prerelease: false From fc9887e58b03a161648facab576235c26dfaabae Mon Sep 17 00:00:00 2001 From: Ben C Date: Thu, 14 Jul 2022 20:29:12 -0700 Subject: [PATCH 3/3] Remove draft check --- .github/workflows/update_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_release.yml b/.github/workflows/update_release.yml index 207995d5..1bad2aae 100644 --- a/.github/workflows/update_release.yml +++ b/.github/workflows/update_release.yml @@ -11,7 +11,7 @@ on: jobs: 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 steps: - name: Create/Update Release