From f1ed8be741646db5c69840b4338571ac7fc5bfcd Mon Sep 17 00:00:00 2001 From: FreezeDriedMangoes Date: Tue, 24 May 2022 07:28:57 -0400 Subject: [PATCH] vision torches now work, as long as you're not wearing your suit --- NewHorizons/Builder/Props/ProjectionBuilder.cs | 1 + NewHorizons/Patches/VisionTorchPatches.cs | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NewHorizons/Builder/Props/ProjectionBuilder.cs b/NewHorizons/Builder/Props/ProjectionBuilder.cs index a6e11cc4..fe01b388 100644 --- a/NewHorizons/Builder/Props/ProjectionBuilder.cs +++ b/NewHorizons/Builder/Props/ProjectionBuilder.cs @@ -182,6 +182,7 @@ namespace NewHorizons.Builder.Props var slide = new Slide(); var slideInfo = slides[i]; + // TODO: do this part asynchronously so that you can load all the slides you want without stalling the game out for 5 days var texture = ImageUtilities.GetTexture(mod, slideInfo.imagePath); slide.textureOverride = ImageUtilities.Invert(texture); diff --git a/NewHorizons/Patches/VisionTorchPatches.cs b/NewHorizons/Patches/VisionTorchPatches.cs index acb8f61c..82d8fbf2 100644 --- a/NewHorizons/Patches/VisionTorchPatches.cs +++ b/NewHorizons/Patches/VisionTorchPatches.cs @@ -23,6 +23,7 @@ namespace NewHorizons.Patches // _slideCollectionItem is actually a reference to a SlideCollectionContainer. Not a slide reel item __instance._mindProjector._slideCollectionItem = t.slideCollectionContainer; __instance._mindProjector._mindSlideCollection = t.slideCollection; + __instance._mindProjector.SetMindSlideCollection(t.slideCollection); Main.Instance.ModHelper.Console.WriteLine("MIND PROJECTOR CUSTOM TRIGGER"); __instance.OnBeamStartHitPrisoner.Invoke(); @@ -30,10 +31,10 @@ namespace NewHorizons.Patches __instance._mindProjector.OnProjectionStart += new OWEvent.OWCallback(__instance.OnProjectionStart); __instance._mindProjector.OnProjectionComplete += new OWEvent.OWCallback(__instance.OnProjectionComplete); - __instance._mindProjector._slideCollectionItem.onSlideTextureUpdated += new OWEvent.OWCallback(__instance._mindProjector.OnSlideTextureUpdated); - __instance._mindProjector._slideCollectionItem.onPlayBeatAudio += new OWEvent.OWCallback(__instance._mindProjector.OnPlayBeatAudio); - __instance._mindProjector._slideCollectionItem.Initialize(); - + // __instance._mindProjector._slideCollectionItem.onSlideTextureUpdated += new OWEvent.OWCallback(__instance._mindProjector.OnSlideTextureUpdated); + //__instance._mindProjector._slideCollectionItem.onPlayBeatAudio += new OWEvent.OWCallback(__instance._mindProjector.OnPlayBeatAudio); + //__instance._mindProjector._slideCollectionItem.Initialize(); + Locator.GetPlayerTransform().GetComponent().LockOn(hitObj.transform, Vector3.zero); __instance._playerLockedOn = true; return false;