From e7ecdd632847a7daa01e00ae916575188c7d85ad Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Thu, 14 Jul 2022 23:11:35 -0400 Subject: [PATCH 1/9] clouds --- NewHorizons/Builder/Atmosphere/AirBuilder.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/NewHorizons/Builder/Atmosphere/AirBuilder.cs b/NewHorizons/Builder/Atmosphere/AirBuilder.cs index f9c3c617..3336bc59 100644 --- a/NewHorizons/Builder/Atmosphere/AirBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/AirBuilder.cs @@ -28,11 +28,19 @@ namespace NewHorizons.Builder.Atmosphere shockLayerRuleset._type = ShockLayerRuleset.ShockType.Atmospheric; shockLayerRuleset._radialCenter = airGO.transform; - var bottom = config.Base.surfaceSize; - var top = config.Atmosphere.size; + if (config.Atmosphere.clouds != null) + { + shockLayerRuleset._innerRadius = config.Atmosphere.clouds.innerCloudRadius; + shockLayerRuleset._outerRadius = config.Atmosphere.clouds.outerCloudRadius; + } + else + { + var bottom = config.Base.surfaceSize; + var top = config.Atmosphere.size; - shockLayerRuleset._innerRadius = (bottom + top) / 2f; - shockLayerRuleset._outerRadius = top; + shockLayerRuleset._innerRadius = (bottom + top) / 2f; + shockLayerRuleset._outerRadius = top; + } if (config.Atmosphere.hasOxygen) { From 3f91f70571a8ed52d134c8f51422fc3fdd402359 Mon Sep 17 00:00:00 2001 From: FreezeDriedMangoes Date: Thu, 14 Jul 2022 23:13:44 -0400 Subject: [PATCH 2/9] fixed screen fog not scaling to the node size and fixed nodes not warping player if they were scaled down too much --- NewHorizons/Patches/BramblePatches.cs | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 NewHorizons/Patches/BramblePatches.cs diff --git a/NewHorizons/Patches/BramblePatches.cs b/NewHorizons/Patches/BramblePatches.cs new file mode 100644 index 00000000..bbd5e33b --- /dev/null +++ b/NewHorizons/Patches/BramblePatches.cs @@ -0,0 +1,31 @@ +using HarmonyLib; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NewHorizons.Patches +{ + [HarmonyPatch] + public class BramblePatches + { + [HarmonyPrefix] + [HarmonyPatch(typeof(SphericalFogWarpVolume), nameof(SphericalFogWarpVolume.IsProbeOnly))] + public static bool SphericalFogWarpVolume_IsProbeOnly(SphericalFogWarpVolume __instance, ref bool __result) + { + __result = false; + return false; + } + + [HarmonyPrefix] + [HarmonyPatch(typeof(FogWarpVolume), nameof(FogWarpVolume.GetFogThickness))] + public static bool FogWarpVolume_GetFogThickness(FogWarpVolume __instance, ref float __result) + { + if (__instance is InnerFogWarpVolume sph) __result = sph._exitRadius; + else __result = 50; // 50f is hardcoded as the return value in the base game + + return false; + } + } +} From 7c981b32a43e2930b1f4aeb31bb3b260ff6aa17f Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Thu, 14 Jul 2022 23:26:17 -0400 Subject: [PATCH 3/9] 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 4/9] 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 5/9] 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 From 281b93c1fbcc061589e0ea059d656d16ce2a3009 Mon Sep 17 00:00:00 2001 From: FreezeDriedMangoes Date: Thu, 14 Jul 2022 23:30:15 -0400 Subject: [PATCH 6/9] bramble dimension sphere shape now scales with the dimension scale --- NewHorizons/Builder/Body/BrambleDimensionBuilder.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NewHorizons/Builder/Body/BrambleDimensionBuilder.cs b/NewHorizons/Builder/Body/BrambleDimensionBuilder.cs index 0af643bd..dd472e73 100644 --- a/NewHorizons/Builder/Body/BrambleDimensionBuilder.cs +++ b/NewHorizons/Builder/Body/BrambleDimensionBuilder.cs @@ -235,6 +235,9 @@ namespace NewHorizons.Builder.Body fog._fogRadius *= scale; fog._fogDensity *= scale; + var volumesShape = volumes.FindChild("ZeroG_Fluid_Audio_Volume"); + volumesShape.GetComponent().radius *= scale; + // Change fog color if (body.Config.Bramble.dimension.fogTint != null) { From 4cd1eeaa1f71f3572b8b13d2c73660d6f5da4123 Mon Sep 17 00:00:00 2001 From: Ben C Date: Thu, 14 Jul 2022 20:30:46 -0700 Subject: [PATCH 7/9] Fix Release Build Thingy --- .github/workflows/release_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index 513d04da..3f202d16 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -22,7 +22,7 @@ on: jobs: Build: - if: ${{ github.ref == 'refs/heads/main' || (github.event.pull_request.draft == 'false' && contains(github.event.pull_request.labels.*.name, 'update-pr')) }} + if: ${{ github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'update-pr') }} uses: ./.github/workflows/build.yaml with: build_type: Release From ce17b48b7c2803d44abdb5f2b9ca313978fb3adb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 15 Jul 2022 03:32:28 +0000 Subject: [PATCH 8/9] Updated Schemas --- NewHorizons/Schemas/body_schema.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NewHorizons/Schemas/body_schema.json b/NewHorizons/Schemas/body_schema.json index 7e079ea6..c5f9c369 100644 --- a/NewHorizons/Schemas/body_schema.json +++ b/NewHorizons/Schemas/body_schema.json @@ -286,6 +286,18 @@ "useAtmosphereShader": { "type": "boolean", "description": "Whether we use an atmospheric shader on the planet. Doesn't affect clouds, fog, rain, snow, oxygen, etc. Purely\nvisual." + }, + "minShockSpeed": { + "type": "number", + "description": "Minimum speed that your ship can go in the atmosphere where flames will appear.", + "format": "float", + "default": 100.0 + }, + "maxShockSpeed": { + "type": "number", + "description": "Maximum speed that your ship can go in the atmosphere where flames will appear at their brightest.", + "format": "float", + "default": 300.0 } } }, From 50b3094a91bdb457a17775a16a8acd93019c6809 Mon Sep 17 00:00:00 2001 From: Ben C Date: Thu, 14 Jul 2022 20:36:03 -0700 Subject: [PATCH 9/9] Fix Release Build Again --- .github/workflows/release_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index 3f202d16..f90bb8ee 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -43,7 +43,7 @@ jobs: Update_Release: name: 'Create/Update Release Asset' needs: Build - if: ${{ github.ref != 'refs/heads/main' && github.event.pull_request.draft == 'false' && contains(github.event.pull_request.labels.*.name, 'update-pr') }} + if: ${{ github.ref != 'refs/heads/main' && contains(github.event.pull_request.labels.*.name, 'update-pr') }} runs-on: ubuntu-latest steps: - name: Download Asset