diff --git a/NewHorizons/Builder/Body/FunnelBuilder.cs b/NewHorizons/Builder/Body/FunnelBuilder.cs index 5f9ccd93..9c54486f 100644 --- a/NewHorizons/Builder/Body/FunnelBuilder.cs +++ b/NewHorizons/Builder/Body/FunnelBuilder.cs @@ -147,12 +147,12 @@ namespace NewHorizons.Builder.Body var funnelSizeController = funnelGO.AddComponent(); - if (module.Curve != null) + if (module.curve != null) { var curve = new AnimationCurve(); - foreach (var pair in module.Curve) + foreach (var pair in module.curve) { - curve.AddKey(new Keyframe(pair.Time, pair.Value)); + curve.AddKey(new Keyframe(pair.time, pair.value)); } funnelSizeController.scaleCurve = curve; } diff --git a/NewHorizons/Builder/Body/LavaBuilder.cs b/NewHorizons/Builder/Body/LavaBuilder.cs index 9d2f40df..ea831506 100644 --- a/NewHorizons/Builder/Body/LavaBuilder.cs +++ b/NewHorizons/Builder/Body/LavaBuilder.cs @@ -12,12 +12,12 @@ namespace NewHorizons.Builder.Body public static void Make(GameObject planetGO, Sector sector, OWRigidbody rb, LavaModule module) { var heightScale = module.size; - if (module.Curve != null) + if (module.curve != null) { var modifier = 1f; - foreach (var pair in module.Curve) + foreach (var pair in module.curve) { - if (pair.Value < modifier) modifier = pair.Value; + if (pair.value < modifier) modifier = pair.value; } heightScale = Mathf.Max(0.1f, heightScale * modifier); } @@ -54,13 +54,13 @@ namespace NewHorizons.Builder.Body destructionVolume.GetComponent().radius = 1; destructionVolume.SetActive(true); - if (module.Curve != null) + if (module.curve != null) { var levelController = moltenCore.AddComponent(); var curve = new AnimationCurve(); - foreach (var pair in module.Curve) + foreach (var pair in module.curve) { - curve.AddKey(new Keyframe(pair.Time, module.size * pair.Value)); + curve.AddKey(new Keyframe(pair.time, module.size * pair.value)); } levelController._scaleCurve = curve; } diff --git a/NewHorizons/Builder/Body/ProxyBuilder.cs b/NewHorizons/Builder/Body/ProxyBuilder.cs index 33510c62..5d972ca7 100644 --- a/NewHorizons/Builder/Body/ProxyBuilder.cs +++ b/NewHorizons/Builder/Body/ProxyBuilder.cs @@ -73,7 +73,7 @@ namespace NewHorizons.Builder.Body } if (body.Config.Lava != null) { - var sphere = AddColouredSphere(newProxy, body.Config.Lava.size, body.Config.Lava.Curve, Color.black); + var sphere = AddColouredSphere(newProxy, body.Config.Lava.size, body.Config.Lava.curve, Color.black); if (realSize < body.Config.Lava.size) realSize = body.Config.Lava.size; var material = new Material(lavaMaterial); @@ -83,14 +83,14 @@ namespace NewHorizons.Builder.Body if (body.Config.Water != null) { var colour = body.Config.Water.tint?.ToColor() ?? Color.blue; - AddColouredSphere(newProxy, body.Config.Water.size, body.Config.Water.Curve, colour); + AddColouredSphere(newProxy, body.Config.Water.size, body.Config.Water.curve, colour); if (realSize < body.Config.Water.size) realSize = body.Config.Water.size; } if (body.Config.Sand != null) { - var colour = body.Config.Sand.Tint?.ToColor() ?? Color.yellow; - AddColouredSphere(newProxy, body.Config.Sand.Size, body.Config.Sand.Curve, colour); - if (realSize < body.Config.Sand.Size) realSize = body.Config.Sand.Size; + var colour = body.Config.Sand.tint?.ToColor() ?? Color.yellow; + AddColouredSphere(newProxy, body.Config.Sand.size, body.Config.Sand.curve, colour); + if (realSize < body.Config.Sand.size) realSize = body.Config.Sand.size; } // Could improve this to actually use the proper renders and materials if (body.Config.Singularity != null) @@ -168,7 +168,7 @@ namespace NewHorizons.Builder.Body var animCurve = new AnimationCurve(); foreach (var pair in curve) { - animCurve.AddKey(new Keyframe(pair.Time, pair.Value)); + animCurve.AddKey(new Keyframe(pair.time, pair.value)); } sizeController.scaleCurve = animCurve; sizeController.size = size; diff --git a/NewHorizons/Builder/Body/RingBuilder.cs b/NewHorizons/Builder/Body/RingBuilder.cs index bb92feee..ff464bfc 100644 --- a/NewHorizons/Builder/Body/RingBuilder.cs +++ b/NewHorizons/Builder/Body/RingBuilder.cs @@ -123,13 +123,13 @@ namespace NewHorizons.Builder.Body rot._localAxis = Vector3.down; } - if (ring.Curve != null) + if (ring.curve != null) { var levelController = ringGO.AddComponent(); var curve = new AnimationCurve(); - foreach (var pair in ring.Curve) + foreach (var pair in ring.curve) { - curve.AddKey(new Keyframe(pair.Time, pair.Value)); + curve.AddKey(new Keyframe(pair.time, pair.value)); } levelController.scaleCurve = curve; } diff --git a/NewHorizons/Builder/Body/SandBuilder.cs b/NewHorizons/Builder/Body/SandBuilder.cs index c9e02920..35de7c8b 100644 --- a/NewHorizons/Builder/Body/SandBuilder.cs +++ b/NewHorizons/Builder/Body/SandBuilder.cs @@ -12,7 +12,7 @@ namespace NewHorizons.Builder.Body sandGO.SetActive(false); var sandSphere = GameObject.Instantiate(GameObject.Find("TowerTwin_Body/SandSphere_Draining/SandSphere"), sandGO.transform); - if (module.Tint != null) + if (module.tint != null) { var oldMR = sandSphere.GetComponent(); var sandMaterials = oldMR.sharedMaterials; @@ -24,8 +24,8 @@ namespace NewHorizons.Builder.Body new Material(sandMaterials[1]) }; GameObject.Destroy(oldMR); - sandMR.sharedMaterials[0].color = module.Tint.ToColor(); - sandMR.sharedMaterials[1].color = module.Tint.ToColor(); + sandMR.sharedMaterials[0].color = module.tint.ToColor(); + sandMR.sharedMaterials[1].color = module.tint.ToColor(); } var collider = GameObject.Instantiate(GameObject.Find("TowerTwin_Body/SandSphere_Draining/Collider"), sandGO.transform); @@ -40,20 +40,20 @@ namespace NewHorizons.Builder.Body sandSphere.AddComponent(); - if (module.Curve != null) + if (module.curve != null) { var levelController = sandGO.AddComponent(); var curve = new AnimationCurve(); - foreach (var pair in module.Curve) + foreach (var pair in module.curve) { - curve.AddKey(new Keyframe(pair.Time, 2f * module.Size * pair.Value)); + curve.AddKey(new Keyframe(pair.time, 2f * module.size * pair.value)); } levelController._scaleCurve = curve; } sandGO.transform.parent = sector?.transform ?? planetGO.transform; sandGO.transform.position = planetGO.transform.position; - sandGO.transform.localScale = Vector3.one * module.Size * 2f; + sandGO.transform.localScale = Vector3.one * module.size * 2f; sandGO.SetActive(true); } diff --git a/NewHorizons/Builder/Body/StarBuilder.cs b/NewHorizons/Builder/Body/StarBuilder.cs index 29de1a84..6e7dbe58 100644 --- a/NewHorizons/Builder/Body/StarBuilder.cs +++ b/NewHorizons/Builder/Body/StarBuilder.cs @@ -122,7 +122,7 @@ namespace NewHorizons.Builder.Body starGO.SetActive(false); var controller = starGO.AddComponent(); - if (starModule.Curve != null) controller.scaleCurve = starModule.GetAnimationCurve(); + if (starModule.curve != null) controller.scaleCurve = starModule.GetAnimationCurve(); controller.size = starModule.size; controller.atmosphere = sunAtmosphere; controller.supernova = supernova; @@ -151,7 +151,7 @@ namespace NewHorizons.Builder.Body starGO.SetActive(false); var controller = starGO.AddComponent(); - if (starModule.Curve != null) controller.scaleCurve = starModule.GetAnimationCurve(); + if (starModule.curve != null) controller.scaleCurve = starModule.GetAnimationCurve(); controller.size = starModule.size; controller.supernova = supernova; controller.StartColour = starModule.tint; diff --git a/NewHorizons/Builder/Body/WaterBuilder.cs b/NewHorizons/Builder/Body/WaterBuilder.cs index acca5a7d..3cd0f2aa 100644 --- a/NewHorizons/Builder/Body/WaterBuilder.cs +++ b/NewHorizons/Builder/Body/WaterBuilder.cs @@ -90,13 +90,13 @@ namespace NewHorizons.Builder.Body fogGO.GetComponent().material.color = adjustedColour; } - if (module.Curve != null) + if (module.curve != null) { var sizeController = waterGO.AddComponent(); var curve = new AnimationCurve(); - foreach (var pair in module.Curve) + foreach (var pair in module.curve) { - curve.AddKey(new Keyframe(pair.Time, pair.Value)); + curve.AddKey(new Keyframe(pair.time, pair.value)); } sizeController.scaleCurve = curve; sizeController.oceanFogMaterial = fogGO.GetComponent().material; diff --git a/NewHorizons/Builder/ShipLog/MapModeBuilder.cs b/NewHorizons/Builder/ShipLog/MapModeBuilder.cs index feb17183..8b007aa3 100644 --- a/NewHorizons/Builder/ShipLog/MapModeBuilder.cs +++ b/NewHorizons/Builder/ShipLog/MapModeBuilder.cs @@ -543,7 +543,7 @@ namespace NewHorizons.Builder.ShipLog var lavaColor = body.Config.Lava?.tint; if (lavaColor != null) return lavaColor.ToColor(); - var sandColor = body.Config.Sand?.Tint; + var sandColor = body.Config.Sand?.tint; if (sandColor != null) return sandColor.ToColor(); } catch (Exception) diff --git a/NewHorizons/External/Modules/VariableSize/SandModule.cs b/NewHorizons/External/Modules/VariableSize/SandModule.cs index d163e102..cc096166 100644 --- a/NewHorizons/External/Modules/VariableSize/SandModule.cs +++ b/NewHorizons/External/Modules/VariableSize/SandModule.cs @@ -7,11 +7,11 @@ namespace NewHorizons.External.Modules.VariableSize /// /// Size of the sand /// - public float Size { get; set; } + public float size; /// /// Tint of the sand /// - public MColor Tint { get; set; } + public MColor tint; } } \ No newline at end of file diff --git a/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs b/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs index d4ae9ac3..7daf95f2 100644 --- a/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs +++ b/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs @@ -9,14 +9,14 @@ namespace NewHorizons.External.Modules.VariableSize /// /// Scale this module over time /// - public TimeValuePair[] Curve { get; set; } + public TimeValuePair[] curve; public AnimationCurve GetAnimationCurve(float size = 1f) { var curve = new AnimationCurve(); - if (Curve != null) - foreach (var pair in Curve) - curve.AddKey(new Keyframe(pair.Time, size * pair.Value)); + if (this.curve != null) + foreach (var pair in this.curve) + curve.AddKey(new Keyframe(pair.time, size * pair.value)); return curve; } @@ -26,12 +26,12 @@ namespace NewHorizons.External.Modules.VariableSize /// /// A specific point in time /// - public float Time { get; set; } + public float time; /// /// The value for this point in time /// - public float Value { get; set; } + public float value; } } } \ No newline at end of file