Fix leftover errors after merge

NewHorizons/Builder/Body/FunnelBuilder.cs

@@ -13,14 +13,6 @@ namespace NewHorizons.Builder.Body
         private static readonly int EmissionColor = Shader.PropertyToID("_EmissionColor");
         private static readonly int HeightScale = Shader.PropertyToID("_HeightScale");
 
-        private enum FunnelType
-        {
-            SAND,
-            WATER,
-            LAVA,
-            STAR
-        }
-
         public static void Make(GameObject planetGO, ConstantForceDetector detector, OWRigidbody rigidbody, FunnelModule module)
         {
             var funnelType = module.Type;

NewHorizons/Builder/Props/TornadoBuilder.cs

@@ -77,8 +77,8 @@ namespace NewHorizons.Builder.Props
                 return;
             }
 
-            if (info.type.ToLower() == "hurricane") MakeHurricane(planetGO, sector, info, position, hasClouds);
+            if (info.type == PropModule.TornadoInfo.TornadoType.Hurricane) MakeHurricane(planetGO, sector, info, position, hasClouds);
-            else MakeTornado(planetGO, sector, info, position, info.type.ToLower() == "downwards");
+            else MakeTornado(planetGO, sector, info, position, info.type == PropModule.TornadoInfo.TornadoType.Downwards);
         }
 
         private static void MakeTornado(GameObject planetGO, Sector sector, PropModule.TornadoInfo info, Vector3 position, bool downwards)

NewHorizons/External/Configs/PlanetConfig.cs

@@ -27,7 +27,7 @@ namespace NewHorizons.External.Configs
         /// <summary>
         /// Unique star system containing your planet
         /// </summary>
-        [DefaultValue("SolarSystem")]
+        [System.ComponentModel.DefaultValue("SolarSystem")]
         public string StarSystem = "SolarSystem";
 
         /// <summary>
@@ -43,7 +43,7 @@ namespace NewHorizons.External.Configs
         /// <summary>
         /// Set to a higher number if you wish for this body to be built sooner
         /// </summary>
-        [DefaultValue(-1)]
+        [System.ComponentModel.DefaultValue(-1)]
         public int BuildPriority = -1;
         
         /// <summary>
@@ -246,10 +246,9 @@ namespace NewHorizons.External.Configs
             {
                 foreach(var tornado in Props.Tornados)
                 {
-                    if (tornado.downwards) tornado.type = "downwards";
+                    if (tornado.downwards) tornado.type = PropModule.TornadoInfo.TornadoType.Downwards;
                 }
             }
-#pragma warning restore 612, 618
         }
     }
 }

NewHorizons/External/Configs/StarSystemConfig.cs

@@ -28,11 +28,21 @@ namespace NewHorizons.External.Configs
         /// Do you want a clean slate for this star system? Or will it be a modified version of the original.
         /// </summary>
         public bool destroyStockPlanets = true;
+
+        /// <summary>
+        /// Should the time loop be enabled in this system?
+        /// </summary>
+        [DefaultValue(true)]
+        public bool enableTimeLoop = true;
         
         /// <summary>
         /// Set to the FactID that must be revealed before it can be warped to. Don't set `CanEnterViaWarpDrive` to `false` if you're using this, that would make no sense.
         /// </summary>
         public string factRequiredForWarp;
+        
+        /// <summary>
+        /// Should the player not be able to view the map in this system?
+        /// </summary>
         public bool mapRestricted;
         
         /// <summary>

NewHorizons/External/Modules/AsteroidBeltModule.cs

@@ -1,6 +1,4 @@
 using Newtonsoft.Json;
-using UnityEngine.Internal;
-using System.ComponentModel;
 
 namespace NewHorizons.External.Modules
 {
@@ -20,19 +18,19 @@ namespace NewHorizons.External.Modules
         /// <summary>
         /// Minimum size of the asteroids.
         /// </summary>
-        [DefaultValue(20)]
+        [System.ComponentModel.DefaultValue(20)]
         public float MinSize = 20;
         
         /// <summary>
         /// Maximum size of the asteroids.
         /// </summary>
-        [DefaultValue(50)]
+        [System.ComponentModel.DefaultValue(50)]
         public float MaxSize = 50f;
         
         /// <summary>
         /// Amount of asteroids to create.
         /// </summary>
-        [DefaultValue(-1)]
+        [System.ComponentModel.DefaultValue(-1)]
         public int Amount = -1;
         
         /// <summary>

NewHorizons/External/Modules/BaseModule.cs

@@ -67,7 +67,7 @@ namespace NewHorizons.External.Modules
         /// <summary>
         /// Allows the object to be targeted on the map.
         /// </summary>
-        [DefaultValue(true)]
+        [System.ComponentModel.DefaultValue(true)]
         public bool HasReferenceFrame = true;
         
         /// <summary>
@@ -88,7 +88,7 @@ namespace NewHorizons.External.Modules
         /// <summary>
         /// Do we show the minimap when walking around this planet?
         /// </summary>
-        [DefaultValue(true)]
+        [System.ComponentModel.DefaultValue(true)]
         public bool ShowMinimap = true;
 
         #region Obsolete

NewHorizons/External/Modules/OrbitModule.cs

@@ -73,7 +73,7 @@ namespace NewHorizons.External.Modules
         /// <summary>
         /// Referring to the orbit line in the map screen.
         /// </summary>
-        [DefaultValue(true)]
+        [System.ComponentModel.DefaultValue(true)]
         public bool ShowOrbitLine { get; set; } = true;
         
         /// <summary>

NewHorizons/External/Modules/PropModule.cs

@@ -184,6 +184,18 @@ namespace NewHorizons.External.Modules
         [JsonObject]
         public class TornadoInfo
         {
+            public enum TornadoType
+            {
+                [EnumMember(Value = @"downwards")]
+                Downwards = 0,
+                
+                [EnumMember(Value = @"upwards")]
+                Upwards = 1,
+                
+                [EnumMember(Value = @"hurricane")]
+                Hurricane = 2
+            }
+            
             /// <summary>
             /// Position of the tornado
             /// </summary>
@@ -204,9 +216,15 @@ namespace NewHorizons.External.Modules
             /// The colour of the tornado.
             /// </summary>
             public MColor tint;
-            
+
             /// <summary>
-            /// Should it pull things downwards? Will push them upwards by default.
+            /// What type of cyclone should this be? Upwards and downwards are both tornados and will push in that direction.
+            /// </summary>
+            [JsonConverter(typeof(StringEnumConverter))]
+            public TornadoType type = TornadoType.Downwards;
+
+            /// <summary>
+            /// [DEPRECATED] Should this tornado shoot you down instead of up?
             /// </summary>
             public bool downwards;
             

NewHorizons/External/Modules/VariableSize/StarModule.cs

@@ -11,7 +11,7 @@ namespace NewHorizons.External.Modules.VariableSize
         /// <summary>
         /// Radius of the star.
         /// </summary>
-        [DefaultValue(2000f)]
+        [System.ComponentModel.DefaultValue(2000f)]
         public float Size = 2000f;
         
         /// <summary>
@@ -37,19 +37,19 @@ namespace NewHorizons.External.Modules.VariableSize
         /// <summary>
         /// Relative strength of the light compared to the sun.
         /// </summary>
-        [DefaultValue(1f)]
+        [System.ComponentModel.DefaultValue(1f)]
         public float SolarLuminosity = 1f;
         
         /// <summary>
         /// The default sun has its own atmosphere that is different from regular planets. If you want that, set this to `true`.
         /// </summary>
-        [DefaultValue(true)]
+        [System.ComponentModel.DefaultValue(true)]
         public bool HasAtmosphere = true;
         
         /// <summary>
         /// Should this star explode after 22 minutes?
         /// </summary>
-        [DefaultValue(true)]
+        [System.ComponentModel.DefaultValue(true)]
         public bool GoSupernova = true;
     }
 }