diff --git a/NewHorizons/Builder/Body/StellarRemnantBuilder.cs b/NewHorizons/Builder/Body/StellarRemnantBuilder.cs index 8cfd7520..5dd00158 100644 --- a/NewHorizons/Builder/Body/StellarRemnantBuilder.cs +++ b/NewHorizons/Builder/Body/StellarRemnantBuilder.cs @@ -42,11 +42,6 @@ namespace NewHorizons.Builder.Body case StellarRemnantType.NeutronStar: MakeNeutronStar(go, sector, mod, star.Config.Star); - break; - case StellarRemnantType.Pulsar: - MakeNeutronStar(go, sector, mod, star.Config.Star); - // TODO: add jets, up rotation speed (use a RotateTransform on the star instead of changing sidereal period) - break; case StellarRemnantType.BlackHole: MakeBlackhole(go, sector, star.Config.Star); @@ -146,8 +141,6 @@ namespace NewHorizons.Builder.Body return MakeWhiteDwarf(planet, null, mod, progenitor, proxy); case StellarRemnantType.NeutronStar: return MakeNeutronStar(planet, null, mod, progenitor, proxy); - case StellarRemnantType.Pulsar: - return MakeNeutronStar(planet, null, mod, progenitor, proxy); case StellarRemnantType.BlackHole: return MakeBlackhole(planet, null, progenitor, proxy); default: diff --git a/NewHorizons/External/Configs/PlanetConfig.cs b/NewHorizons/External/Configs/PlanetConfig.cs index d1248900..db5dc435 100644 --- a/NewHorizons/External/Configs/PlanetConfig.cs +++ b/NewHorizons/External/Configs/PlanetConfig.cs @@ -459,6 +459,9 @@ namespace NewHorizons.External.Configs if (Star != null) { if (!Star.goSupernova) Star.stellarDeathType = StellarDeathType.None; + + // Gave up on supporting pulsars + if (Star.stellarRemnantType == StellarRemnantType.Pulsar) Star.stellarRemnantType = StellarRemnantType.NeutronStar; } // Signals no longer use two different variables for audio diff --git a/NewHorizons/External/Modules/VariableSize/StarModule.cs b/NewHorizons/External/Modules/VariableSize/StarModule.cs index 3b833051..2da1bc69 100644 --- a/NewHorizons/External/Modules/VariableSize/StarModule.cs +++ b/NewHorizons/External/Modules/VariableSize/StarModule.cs @@ -154,7 +154,7 @@ namespace NewHorizons.External.Modules.VariableSize [EnumMember(Value = @"default")] Default, [EnumMember(Value = @"whiteDwarf")] WhiteDwarf, [EnumMember(Value = @"neutronStar")] NeutronStar, - [EnumMember(Value = @"pulsar")] Pulsar, + [Obsolete] Pulsar, [EnumMember(Value = @"blackHole")] BlackHole, [EnumMember(Value = @"custom")] Custom } diff --git a/SchemaExporter/SchemaExporter.cs b/SchemaExporter/SchemaExporter.cs index 6aa43dcd..3874aa87 100644 --- a/SchemaExporter/SchemaExporter.cs +++ b/SchemaExporter/SchemaExporter.cs @@ -88,6 +88,8 @@ public static class SchemaExporter schema.Definitions["NomaiTextType"].EnumerationNames.Remove("CairnVariant"); schema.Definitions["QuantumGroupType"].Enumeration.Remove("FailedValidation"); schema.Definitions["QuantumGroupType"].EnumerationNames.Remove("FailedValidation"); + schema.Definitions["StellarRemnantType"].Enumeration.Remove("Pulsar"); + schema.Definitions["StellarRemnantType"].EnumerationNames.Remove("Pulsar"); break; case "Star System Schema": schema.Definitions["NomaiCoordinates"].Properties["x"].UniqueItems = true;