From 260f8d9dbabd6b889d668e6db22a7470fff8f3a2 Mon Sep 17 00:00:00 2001 From: Ben C Date: Fri, 20 Jan 2023 17:56:26 -0500 Subject: [PATCH 1/4] Update Pipfile.lock --- docs/Pipfile.lock | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/docs/Pipfile.lock b/docs/Pipfile.lock index 5f0456a3..57e6d3dd 100644 --- a/docs/Pipfile.lock +++ b/docs/Pipfile.lock @@ -1,10 +1,12 @@ { "_meta": { "hash": { - "sha256": "d0e23851039e578ecd7c2df24e2808d281315a5e40fdeccd730ecd29cd17de8d" + "sha256": "e93f7f7087f635da529dc8dbaa56be872c12a26be4d8cfcaa9393f12fe7f1bda" }, "pipfile-spec": 6, - "requires": {}, + "requires": { + "python_version": "3.11" + }, "sources": [ { "name": "pypi", @@ -28,7 +30,7 @@ "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30", "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693" ], - "markers": "python_version >= '3.6'", + "markers": "python_full_version >= '3.6.0'", "version": "==4.11.1" }, "certifi": { @@ -141,14 +143,6 @@ "markers": "python_version >= '3.7'", "version": "==8.1.3" }, - "colorama": { - "hashes": [ - "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", - "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6" - ], - "markers": "platform_system == 'Windows'", - "version": "==0.4.6" - }, "dataclasses-json": { "hashes": [ "sha256:bc285b5f892094c3a53d558858a88553dd6a61a11ab1a8128a0e554385dcc5dd", @@ -234,7 +228,7 @@ "sha256:528f978beb3dbcf529a139b6c76f6ac6ecf8bb96c131beab751bb095b3873b58", "sha256:f65b4dbe1e16591b14fd40bc659b8b58d285eab70c1da21f390294fcdec42bb0" ], - "markers": "python_version >= '3.5' and python_version < '4.0'", + "markers": "python_version >= '3.5' and python_version < '4'", "version": "==2.4.6" }, "markupsafe": { @@ -310,11 +304,11 @@ }, "menagerie-docs": { "hashes": [ - "sha256:0b07000ced6adebb061dcf17d334c82259a21739cbca22f33e2675cfd53bacd3", - "sha256:127e687358e49bc155fb5d94519f35389423391e7b984980c117ed279d89c82f" + "sha256:214fb87bf94ce1b814c718ae98e319ef470fe3ea0b01f215ab43e46623289e92", + "sha256:b20d0f099edd3316f00e72ef754d885982a3f80c80c70ca8a01d43721388813b" ], "index": "pypi", - "version": "==0.1.12" + "version": "==0.1.13" }, "more-itertools": { "hashes": [ @@ -557,7 +551,7 @@ "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa", "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf" ], - "markers": "python_version >= '3.7' and python_version < '4.0'", + "markers": "python_version >= '3.7' and python_version < '4'", "version": "==2.28.2" }, "rjsmin": { From 7db864cf6fa7e9cf54ec912268ecf40f5338d255 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 3 Mar 2023 18:55:36 -0500 Subject: [PATCH 2/4] Fix getting camera to work with VR --- NewHorizons/Builder/Props/DetailBuilder.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs index 62f9cfdb..9bb82f71 100644 --- a/NewHorizons/Builder/Props/DetailBuilder.cs +++ b/NewHorizons/Builder/Props/DetailBuilder.cs @@ -336,7 +336,7 @@ namespace NewHorizons.Builder.Props // fix campfires if (component is InteractVolume interactVolume) { - interactVolume._playerCam = GameObject.Find("Player_Body/PlayerCamera").GetComponent(); + interactVolume._playerCam = Locator.GetPlayerCamera(); } if (component is PlayerAttachPoint playerAttachPoint) { @@ -344,7 +344,7 @@ namespace NewHorizons.Builder.Props playerAttachPoint._playerController = playerBody.GetComponent(); playerAttachPoint._playerOWRigidbody = playerBody.GetComponent(); playerAttachPoint._playerTransform = playerBody.transform; - playerAttachPoint._fpsCamController = GameObject.Find("Player_Body/PlayerCamera").GetComponent(); + playerAttachPoint._fpsCamController = Locator.GetPlayerCameraController(); } if (component is NomaiInterfaceOrb orb) @@ -357,7 +357,7 @@ namespace NewHorizons.Builder.Props { torchItem.enabled = true; torchItem.mindProjectorTrigger.enabled = true; - torchItem.mindSlideProjector._mindProjectorImageEffect = SearchUtilities.Find("Player_Body/PlayerCamera").GetComponent(); + torchItem.mindSlideProjector._mindProjectorImageEffect = Locator.GetPlayerCamera().GetComponent(); } if (component is Animator animator) animator.enabled = true; From 99868b94a803809e60de654e0fef4d12501dee0d Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 3 Mar 2023 19:49:15 -0500 Subject: [PATCH 3/4] Fix locator by waiting --- NewHorizons/Builder/Props/DetailBuilder.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs index 668cce51..6e9e41e7 100644 --- a/NewHorizons/Builder/Props/DetailBuilder.cs +++ b/NewHorizons/Builder/Props/DetailBuilder.cs @@ -344,7 +344,7 @@ namespace NewHorizons.Builder.Props // fix campfires if (component is InteractVolume interactVolume) { - interactVolume._playerCam = Locator.GetPlayerCamera(); + Delay.FireOnNextUpdate(() => interactVolume._playerCam = Locator.GetPlayerCamera()); } if (component is PlayerAttachPoint playerAttachPoint) { @@ -352,7 +352,7 @@ namespace NewHorizons.Builder.Props playerAttachPoint._playerController = playerBody.GetComponent(); playerAttachPoint._playerOWRigidbody = playerBody.GetComponent(); playerAttachPoint._playerTransform = playerBody.transform; - playerAttachPoint._fpsCamController = Locator.GetPlayerCameraController(); + Delay.FireOnNextUpdate(() => playerAttachPoint._fpsCamController = Locator.GetPlayerCameraController()); } if (component is NomaiInterfaceOrb orb) @@ -365,7 +365,7 @@ namespace NewHorizons.Builder.Props { torchItem.enabled = true; torchItem.mindProjectorTrigger.enabled = true; - torchItem.mindSlideProjector._mindProjectorImageEffect = Locator.GetPlayerCamera().GetComponent(); + Delay.FireOnNextUpdate(() => torchItem.mindSlideProjector._mindProjectorImageEffect = Locator.GetPlayerCamera().GetComponent()); } if (component is Animator animator) animator.enabled = true; From 0448ce8e9377ec4de961707b4271d54695185662 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 3 Mar 2023 20:42:21 -0500 Subject: [PATCH 4/4] Fixes scroll text showing in hand --- .../Builder/Props/TranslatorText/TranslatorTextBuilder.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs b/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs index ce06a4b1..96899393 100644 --- a/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs +++ b/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs @@ -269,9 +269,7 @@ namespace NewHorizons.Builder.Props customScroll.SetActive(true); - // Enable the collider and renderer - Delay.RunWhen( - () => Main.IsSystemReady, + Delay.FireOnNextUpdate( () => { Logger.LogVerbose("Fixing scroll!"); @@ -281,8 +279,12 @@ namespace NewHorizons.Builder.Props customScroll.transform.Find("Props_NOM_Scroll/Props_NOM_Scroll_Collider").gameObject.SetActive(true); nomaiWallText.gameObject.GetComponent().enabled = false; customScroll.GetComponent().enabled = true; + scrollItem._nomaiWallText.HideImmediate(); + scrollItem._nomaiWallText._collider.SetActivation(true); + scrollItem.SetColliderActivation(true); } ); + conversationInfoToCorrespondingSpawnedGameObject[info] = customScroll; return customScroll;