From 1f68a122966d6f9c7a82e7ee0c708d44bd6f74a4 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 22 Jul 2023 12:18:25 -0400 Subject: [PATCH] Can't use vessel computers --- NewHorizons/Builder/Props/GravityCannonBuilder.cs | 12 +++--------- NewHorizons/Builder/Props/WarpPadBuilder.cs | 12 +++--------- .../External/Modules/Props/NomaiComputerInfo.cs | 14 -------------- 3 files changed, 6 insertions(+), 32 deletions(-) diff --git a/NewHorizons/Builder/Props/GravityCannonBuilder.cs b/NewHorizons/Builder/Props/GravityCannonBuilder.cs index cc62756e..271c9699 100644 --- a/NewHorizons/Builder/Props/GravityCannonBuilder.cs +++ b/NewHorizons/Builder/Props/GravityCannonBuilder.cs @@ -1,4 +1,5 @@ using NewHorizons.Builder.Props.TranslatorText; +using NewHorizons.External.Modules; using NewHorizons.External.Modules.Props; using NewHorizons.External.Modules.Props.Shuttle; using NewHorizons.Handlers; @@ -63,16 +64,9 @@ namespace NewHorizons.Builder.Props return gravityCannonObject; } - private static NomaiComputer CreateComputer(GameObject planetGO, Sector sector, NomaiComputerInfo computerInfo) + private static NomaiComputer CreateComputer(GameObject planetGO, Sector sector, GeneralPropInfo computerInfo) { - var prefab = computerInfo.type switch - { - NomaiComputerType.NORMAL => TranslatorTextBuilder.ComputerPrefab, - NomaiComputerType.PRECRASH => TranslatorTextBuilder.PreCrashComputerPrefab, - _ => throw new System.NotImplementedException() - }; - - var computerObject = DetailBuilder.Make(planetGO, sector, prefab, new DetailInfo(computerInfo)); + var computerObject = DetailBuilder.Make(planetGO, sector, TranslatorTextBuilder.ComputerPrefab, new DetailInfo(computerInfo)); var computer = computerObject.GetComponentInChildren(); computer.SetSector(sector); diff --git a/NewHorizons/Builder/Props/WarpPadBuilder.cs b/NewHorizons/Builder/Props/WarpPadBuilder.cs index 5cc6c511..4c5a9ae8 100644 --- a/NewHorizons/Builder/Props/WarpPadBuilder.cs +++ b/NewHorizons/Builder/Props/WarpPadBuilder.cs @@ -1,5 +1,6 @@ using NewHorizons.Builder.Props.TranslatorText; using NewHorizons.Components; +using NewHorizons.External.Modules; using NewHorizons.External.Modules.Props; using NewHorizons.External.Modules.WarpPad; using NewHorizons.Utility; @@ -144,16 +145,9 @@ namespace NewHorizons.Builder.Props transmitterObject.SetActive(true); } - private static void CreateComputer(GameObject planetGO, Sector sector, NomaiComputerInfo computerInfo, NomaiWarpReceiver receiver) + private static void CreateComputer(GameObject planetGO, Sector sector, GeneralPropInfo computerInfo, NomaiWarpReceiver receiver) { - var prefab = computerInfo.type switch - { - NomaiComputerType.NORMAL => TranslatorTextBuilder.ComputerPrefab, - NomaiComputerType.PRECRASH => TranslatorTextBuilder.PreCrashComputerPrefab, - _ => throw new System.NotImplementedException() - }; - - var computerObject = DetailBuilder.Make(planetGO, sector, prefab, new DetailInfo(computerInfo)); + var computerObject = DetailBuilder.Make(planetGO, sector, TranslatorTextBuilder.ComputerPrefab, new DetailInfo(computerInfo)); var computer = computerObject.GetComponentInChildren(); computer.SetSector(sector); diff --git a/NewHorizons/External/Modules/Props/NomaiComputerInfo.cs b/NewHorizons/External/Modules/Props/NomaiComputerInfo.cs index 90b58c34..6b17b032 100644 --- a/NewHorizons/External/Modules/Props/NomaiComputerInfo.cs +++ b/NewHorizons/External/Modules/Props/NomaiComputerInfo.cs @@ -1,23 +1,9 @@ using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using System.ComponentModel; -using System.Runtime.Serialization; namespace NewHorizons.External.Modules.Props { [JsonObject] public class NomaiComputerInfo : GeneralPropInfo { - /// - /// What design the computer will use. - /// - [DefaultValue(NomaiComputerType.NORMAL)] public NomaiComputerType type = NomaiComputerType.NORMAL; - } - - [JsonConverter(typeof(StringEnumConverter))] - public enum NomaiComputerType - { - [EnumMember(Value = @"normal")] NORMAL = 0, - [EnumMember(Value = @"precrash")] PRECRASH = 1 } }