From 8ad674b64357c8d71dd07c3da9ace0bb303a3cfd Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Fri, 25 Nov 2022 21:31:54 -0500 Subject: [PATCH 1/3] Add timber hearth cairn variant --- NewHorizons/Builder/Props/NomaiTextBuilder.cs | 10 +++++++++- NewHorizons/External/Modules/PropModule.cs | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/NewHorizons/Builder/Props/NomaiTextBuilder.cs b/NewHorizons/Builder/Props/NomaiTextBuilder.cs index f108edaa..35aa045f 100644 --- a/NewHorizons/Builder/Props/NomaiTextBuilder.cs +++ b/NewHorizons/Builder/Props/NomaiTextBuilder.cs @@ -23,6 +23,7 @@ namespace NewHorizons.Builder.Props private static GameObject _computerPrefab; private static GameObject _preCrashComputerPrefab; private static GameObject _cairnPrefab; + private static GameObject _cairnVariantPrefab; private static GameObject _recorderPrefab; private static GameObject _preCrashRecorderPrefab; private static GameObject _trailmarkerPrefab; @@ -112,6 +113,12 @@ namespace NewHorizons.Builder.Props _cairnPrefab.transform.rotation = Quaternion.identity; } + if (_cairnVariantPrefab == null) + { + _cairnVariantPrefab = SearchUtilities.Find("TimberHearth_Body/Sector_TH/Sector_NomaiMines/Interactables_NomaiMines/Prefab_NOM_TH_Cairn_Arc").InstantiateInactive().Rename("Prefab_NOM_Cairn").DontDestroyOnLoad(); + _cairnVariantPrefab.transform.rotation = Quaternion.identity; + } + if (_recorderPrefab == null) { _recorderPrefab = SearchUtilities.Find("Comet_Body/Prefab_NOM_Shuttle/Sector_NomaiShuttleInterior/Interactibles_NomaiShuttleInterior/Prefab_NOM_Recorder").InstantiateInactive().Rename("Prefab_NOM_Recorder").DontDestroyOnLoad(); @@ -390,8 +397,9 @@ namespace NewHorizons.Builder.Props return computerObject; } case PropModule.NomaiTextInfo.NomaiTextType.Cairn: + case PropModule.NomaiTextInfo.NomaiTextType.CairnVariant: { - var cairnObject = _cairnPrefab.InstantiateInactive(); + var cairnObject = (info.type == PropModule.NomaiTextInfo.NomaiTextType.CairnVariant ? _cairnVariantPrefab : _cairnPrefab).InstantiateInactive(); if (!string.IsNullOrEmpty(info.rename)) { diff --git a/NewHorizons/External/Modules/PropModule.cs b/NewHorizons/External/Modules/PropModule.cs index 839f75b6..b4ba3cb8 100644 --- a/NewHorizons/External/Modules/PropModule.cs +++ b/NewHorizons/External/Modules/PropModule.cs @@ -512,6 +512,8 @@ namespace NewHorizons.External.Modules [EnumMember(Value = @"preCrashComputer")] PreCrashComputer = 6, [EnumMember(Value = @"trailmarker")] Trailmarker = 7, + + [EnumMember(Value = @"cairnVariant")] CairnVariant = 9, } [JsonConverter(typeof(StringEnumConverter))] From 5a1f712dd3afc205eccec7169d7e877ddd9f18e0 Mon Sep 17 00:00:00 2001 From: Ben C Date: Sat, 26 Nov 2022 02:34:29 +0000 Subject: [PATCH 2/3] Updated Schemas --- NewHorizons/Schemas/body_schema.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Schemas/body_schema.json b/NewHorizons/Schemas/body_schema.json index 1d301eca..66e70e23 100644 --- a/NewHorizons/Schemas/body_schema.json +++ b/NewHorizons/Schemas/body_schema.json @@ -1330,7 +1330,8 @@ "Recorder", "PreCrashRecorder", "PreCrashComputer", - "Trailmarker" + "Trailmarker", + "CairnVariant" ], "enum": [ "wall", @@ -1340,7 +1341,8 @@ "recorder", "preCrashRecorder", "preCrashComputer", - "trailmarker" + "trailmarker", + "cairnVariant" ] }, "NomaiTextLocation": { From 88663f79354e7a1ba227101bd427041945930b88 Mon Sep 17 00:00:00 2001 From: Noah <34462599+MegaPiggy@users.noreply.github.com> Date: Fri, 25 Nov 2022 21:39:32 -0500 Subject: [PATCH 3/3] why did i make it 9 --- NewHorizons/External/Modules/PropModule.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NewHorizons/External/Modules/PropModule.cs b/NewHorizons/External/Modules/PropModule.cs index b4ba3cb8..4e0a3a1e 100644 --- a/NewHorizons/External/Modules/PropModule.cs +++ b/NewHorizons/External/Modules/PropModule.cs @@ -513,7 +513,7 @@ namespace NewHorizons.External.Modules [EnumMember(Value = @"trailmarker")] Trailmarker = 7, - [EnumMember(Value = @"cairnVariant")] CairnVariant = 9, + [EnumMember(Value = @"cairnVariant")] CairnVariant = 8, } [JsonConverter(typeof(StringEnumConverter))] @@ -1003,4 +1003,4 @@ namespace NewHorizons.External.Modules } } } -} \ No newline at end of file +}