Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add timber hearth cairn variant (#452)

Browse Source 
resolves #444

![image](https://user-images.githubusercontent.com/34462599/204069103-4e626f80-322f-4b9b-a25b-6e8871fec19d.png)
This commit is contained in:
Will Corby 2022-11-25 18:43:52 -08:00 committed by GitHub
commit 041e915fa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NewHorizons/Builder/Props/NomaiTextBuilder.cs
View File

@ -23,6 +23,7 @@ namespace NewHorizons.Builder.Props
private static GameObject _computerPrefab; private static GameObject _computerPrefab;
private static GameObject _preCrashComputerPrefab; private static GameObject _preCrashComputerPrefab;
private static GameObject _cairnPrefab; private static GameObject _cairnPrefab;
private static GameObject _cairnVariantPrefab;
private static GameObject _recorderPrefab; private static GameObject _recorderPrefab;
private static GameObject _preCrashRecorderPrefab; private static GameObject _preCrashRecorderPrefab;
private static GameObject _trailmarkerPrefab; private static GameObject _trailmarkerPrefab;
@ -112,6 +113,12 @@ namespace NewHorizons.Builder.Props
_cairnPrefab.transform.rotation = Quaternion.identity; _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) if (_recorderPrefab == null)
{ {
_recorderPrefab = SearchUtilities.Find("Comet_Body/Prefab_NOM_Shuttle/Sector_NomaiShuttleInterior/Interactibles_NomaiShuttleInterior/Prefab_NOM_Recorder").InstantiateInactive().Rename("Prefab_NOM_Recorder").DontDestroyOnLoad(); _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; return computerObject;
} }
case PropModule.NomaiTextInfo.NomaiTextType.Cairn: 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)) if (!string.IsNullOrEmpty(info.rename))
{ {

4
NewHorizons/External/Modules/PropModule.cs vendored
View File

@ -512,6 +512,8 @@ namespace NewHorizons.External.Modules
[EnumMember(Value = @"preCrashComputer")] PreCrashComputer = 6, [EnumMember(Value = @"preCrashComputer")] PreCrashComputer = 6,
[EnumMember(Value = @"trailmarker")] Trailmarker = 7, [EnumMember(Value = @"trailmarker")] Trailmarker = 7,
[EnumMember(Value = @"cairnVariant")] CairnVariant = 8,
} }
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
@ -1001,4 +1003,4 @@ namespace NewHorizons.External.Modules
} }
} }
} }
} }

6
NewHorizons/Schemas/body_schema.json
View File

@ -1330,7 +1330,8 @@
"Recorder", "Recorder",
"PreCrashRecorder", "PreCrashRecorder",
"PreCrashComputer", "PreCrashComputer",
"Trailmarker" "Trailmarker",
"CairnVariant"
], ],
"enum": [ "enum": [
"wall", "wall",
@ -1340,7 +1341,8 @@
"recorder", "recorder",
"preCrashRecorder", "preCrashRecorder",
"preCrashComputer", "preCrashComputer",
"trailmarker" "trailmarker",
"cairnVariant"
] ]
}, },
"NomaiTextLocation": { "NomaiTextLocation": {