From 804665b3a9010cf5d46ae713780927608ad98c98 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 18 Jun 2024 22:33:20 -0400 Subject: [PATCH] Ignore asset bundle guys, remove unneeded comment, comment angler stuff --- NewHorizons/Builder/Props/DetailBuilder.cs | 3 ++- NewHorizons/Handlers/EyeDetailCacher.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs index 3d14ad07..5700ced2 100644 --- a/NewHorizons/Builder/Props/DetailBuilder.cs +++ b/NewHorizons/Builder/Props/DetailBuilder.cs @@ -438,7 +438,7 @@ namespace NewHorizons.Builder.Props NHLogger.LogVerbose("Fixing anglerfish animation"); - // Remove any event reference to its angler + // Remove any event reference to its angler so that they dont change its state if (angler._anglerfishController) { angler._anglerfishController.OnChangeAnglerState -= angler.OnChangeAnglerState; @@ -446,6 +446,7 @@ namespace NewHorizons.Builder.Props angler._anglerfishController.OnAnglerSuspended -= angler.OnAnglerSuspended; angler._anglerfishController.OnAnglerUnsuspended -= angler.OnAnglerUnsuspended; } + // Disable the angler anim controller because we don't want Update or LateUpdate to run, just need it to set the initial Animator state angler.enabled = false; angler.OnChangeAnglerState(AnglerfishController.AnglerState.Lurking); diff --git a/NewHorizons/Handlers/EyeDetailCacher.cs b/NewHorizons/Handlers/EyeDetailCacher.cs index 289e5cba..422e74d3 100644 --- a/NewHorizons/Handlers/EyeDetailCacher.cs +++ b/NewHorizons/Handlers/EyeDetailCacher.cs @@ -25,11 +25,11 @@ public static class EyeDetailCacher { NHLogger.LogVerbose($"{nameof(EyeDetailCacher)}: {detail.path}"); + if (!string.IsNullOrEmpty(detail.assetBundle)) continue; if (string.IsNullOrEmpty(detail.path)) continue; var planet = detail.path.Contains('/') ? detail.path.Split('/').First() : string.Empty; - // TODO: what other root paths can we ignore if (planet != "EyeOfTheUniverse_Body" && planet != "Vessel_Body") { NHLogger.LogVerbose($"{nameof(EyeDetailCacher)}: Looking for {detail.path}");