added: movement settings changing within graph

Assets/Scripts/Core/Graph Tasks/ChangeCameraSettings.cs

@@ -1,11 +1,10 @@
 using NodeCanvas.Framework;
 using ParadoxNotion.Design;
+using Reset.Core;
 using Unity.Cinemachine;
 using UnityEditor;
 using UnityEngine;
 
-
-
 namespace NodeCanvas.Tasks.Actions {
 	[Category("Reset")]
 	[Description("Change Cinemachine camera settings for the player")]

Assets/Scripts/Core/Graph Tasks/ChangeMovementSettings.cs

@@ -0,0 +1,214 @@
+using System;
+using NodeCanvas.Framework;
+using ParadoxNotion.Design;
+using Reset.Units;
+using UnityEngine;
+
+namespace Reset.Core {
+	[Category("Reset")]
+	[Description("Commits movement unit changes to the handler.")]
+	public class ChangeMovementSettings : ActionTask<UnitMovementHandler> {
+		//Use for initialization. This is called only once in the lifetime of the task.
+		// Move Speed
+		[ParadoxNotion.Design.Header("Speed")]
+		public FloatValueGroup moveSpeedTarget = new (newLabel: "Move Speed");
+		public FloatValueGroup moveSpeedSoothing = new (newLabel: "Move Speed Smoothing");
+
+		[ParadoxNotion.Design.Header("Speed")]
+		public Vector3ValueGroup feedNewDirection = new Vector3ValueGroup("Feed New Direction");
+		public float newDirectionPower;
+		
+		public FloatValueGroup accelerationSmoothing = new (newLabel: "Acceleration Smoothing");
+		public FloatValueGroup deaccelerationSmoothing = new (newLabel: "Deacceleration Smoothing");
+		public CurveValueGroup deaccelerationCurve = new (newLabel: "Deacceleration Curve");
+        
+		// Jumping
+		[ParadoxNotion.Design.Header("Jumping")]
+		public FloatValueGroup jumpPower = new (newLabel: "Jump Power");
+		public FloatValueGroup jumpPowerDecay = new (newLabel: "Jump Decay Speed");
+    
+		// Gravity
+		[ParadoxNotion.Design.Header("Gravity")]
+		public FloatValueGroup gravityPower = new (newLabel: "Gravity Power");
+		public FloatValueGroup gravityMax = new (newLabel: "Gravity Max");
+		public FloatValueGroup gravityAcceleration = new (newLabel: "Gravity Acceleration Speed");
+		public FloatValueGroup gravityScale = new (newLabel: "Gravity Scale");
+        
+		// Rotation
+		[ParadoxNotion.Design.Header("Rotation")]
+		public EnumValueGroup rotateFacing = new EnumValueGroup("Facing Direction", PlayerFacingDirection.TowardsTarget);
+		public FloatValueGroup rotationSpeedTarget = new (newLabel: "Rotation Speed");
+		public FloatValueGroup rotationSmoothing = new (newLabel: "Rotation Smoothing");
+		public BBParameter<Vector3> feedNewRotation;
+		public BBParameter<Vector3> feedRelativeTo;
+		public Space rotationRelativeSpace;
+
+		private Vector3 feedDir;
+		
+
+		//Return null if init was successfull. Return an error string otherwise
+		protected override string OnInit() {
+			return null;
+		}
+
+		//This is called once each time the task is enabled.
+		//Call EndAction() to mark the action as finished, either in success or failure.
+		//EndAction can be called from anywhere.
+		protected override void OnExecute() {
+			UpdateFloatValue(accelerationSmoothing, ref agent.data.accelerationSmoothing, ref agent.defaultData.accelerationSmoothing);
+			UpdateFloatValue(deaccelerationSmoothing, ref agent.data.deaccelerationSmoothing, ref agent.defaultData.deaccelerationSmoothing);
+			UpdateCurveProperty(deaccelerationCurve, ref agent.data.deaccelerationCurve, ref agent.defaultData.deaccelerationCurve);
+			
+			UpdateFloatValue(moveSpeedTarget, ref agent.data.moveSpeedTarget, ref agent.defaultData.moveSpeedTarget);
+			UpdateFloatValue(moveSpeedSoothing, ref agent.data.moveSpeedSoothing, ref agent.defaultData.moveSpeedSoothing);
+			
+			UpdateFloatValue(jumpPower, ref agent.data.jumpPower, ref agent.defaultData.jumpPower);
+			UpdateFloatValue(jumpPowerDecay, ref agent.data.jumpPowerDecay, ref agent.defaultData.jumpPowerDecay);
+			
+			UpdateFloatValue(gravityPower, ref agent.data.gravityPower, ref agent.defaultData.gravityPower);
+			UpdateFloatValue(gravityMax, ref agent.data.gravityMax, ref agent.defaultData.gravityMax);
+			UpdateFloatValue(gravityAcceleration, ref agent.data.gravityAcceleration, ref agent.defaultData.gravityAcceleration);
+			UpdateFloatValue(gravityScale, ref agent.data.gravityScale, ref agent.defaultData.gravityScale);
+
+			UpdateEnumValue(rotateFacing, ref agent.data.rotateFacing, ref agent.defaultData.rotateFacing);
+			
+			UpdateFloatValue(rotationSpeedTarget, ref agent.data.rotationSpeedTarget, ref agent.defaultData.rotationSpeedTarget);
+			UpdateFloatValue(rotationSmoothing, ref agent.data.rotationSmoothing, ref agent.defaultData.rotationSmoothing);
+
+			UpdateVector3Value(feedNewDirection, ref feedDir, ref feedDir);
+
+			// Debug.Log(feedDir);
+			
+			if (feedDir != Vector3.zero) {
+				agent.AddToCurrentDirection(agent.transform.rotation * feedDir.normalized, newDirectionPower);
+				feedDir = Vector3.zero;
+			}
+
+			if (feedNewRotation.value != Vector3.zero) {
+				if (rotationRelativeSpace == Space.World) {
+					Debug.Log(Quaternion.LookRotation(feedRelativeTo.value));
+					agent.SetSpecifiedRotation(Quaternion.Euler(feedNewRotation.value) * Quaternion.LookRotation(feedRelativeTo.value));
+				} else {
+					agent.SetSpecifiedRotation(agent.transform.rotation * Quaternion.Euler(feedNewRotation.value) * Quaternion.LookRotation(feedRelativeTo.value));
+				}
+				
+			}
+				
+			
+			EndAction(true);
+		}
+
+		//Called once per frame while the action is active.
+		protected override void OnUpdate() {
+			
+		}
+
+		//Called when the task is disabled.
+		protected override void OnStop() {
+			
+		}
+
+		//Called when the task is paused.
+		protected override void OnPause() {
+			
+		}
+
+		public void UpdateCurveProperty(CurveValueGroup valueGroup, ref AnimationCurve targetProperty, ref AnimationCurve defaultProperty){
+			switch (valueGroup.changeValue) {
+				case ValueChangeAction.NoChange:
+					break;
+				case ValueChangeAction.NewValue:
+					targetProperty = valueGroup.newValue;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty = defaultProperty;
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+		}
+		
+		public void UpdateVector3Value(Vector3ValueGroup valueGroup, ref Vector3 targetProperty, ref Vector3 defaultProperty){
+			switch (valueGroup.changeX) {
+				case ValueChangeAction.NewValue:
+					targetProperty.x = valueGroup.newValue.x;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty.x = defaultProperty.x;
+					break;
+			}
+			
+			switch (valueGroup.changeY) {
+				case ValueChangeAction.NewValue:
+					targetProperty.y = valueGroup.newValue.y;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty.y = defaultProperty.y;
+					break;
+			}
+			
+			switch (valueGroup.changeZ) {
+				case ValueChangeAction.NewValue:
+					targetProperty.z = valueGroup.newValue.z;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty.z = defaultProperty.z;
+					break;
+			}
+		}
+		
+		public void UpdateVector2Value(Vector2ValueGroup valueGroup, ref Vector2 targetProperty, ref Vector2 defaultProperty){
+			switch (valueGroup.changeX) {
+				case ValueChangeAction.NewValue:
+					targetProperty.x = valueGroup.newValue.x;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty.x = defaultProperty.x;
+					break;
+			}
+			
+			switch (valueGroup.changeY) {
+				case ValueChangeAction.NewValue:
+					targetProperty.y = valueGroup.newValue.y;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty.y = defaultProperty.y;
+					break;
+			}
+		}
+
+		
+		public void UpdateBoolValue(BoolValueGroup valueGroup, ref bool targetProperty, ref bool defaultProperty){
+			switch (valueGroup.changeValue) {
+				case ValueChangeAction.NewValue:
+					targetProperty = valueGroup.value;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty = defaultProperty;
+					break;
+			}
+		}
+		
+		public void UpdateEnumValue(EnumValueGroup valueGroup, ref Enum targetProperty, ref Enum defaultProperty){
+			switch (valueGroup.changeValue) {
+				case ValueChangeAction.NewValue:
+					targetProperty = valueGroup.newValue;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty = defaultProperty;
+					break;
+			}
+		}
+		
+		public void UpdateFloatValue(FloatValueGroup valueGroup, ref float targetProperty, ref float defaultProperty){
+			switch (valueGroup.changeValue) {
+				case ValueChangeAction.NewValue:
+					targetProperty = valueGroup.value;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty = defaultProperty;
+					break;
+			}
+		}
+	}
+}

Assets/Scripts/Core/Graph Tasks/ChangeMovementSettings.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5132a76af4f722e49bc7fbbc75edcaf1

Assets/Scripts/Core/Graph Tasks/UpdateRotation.cs

@@ -65,6 +65,7 @@ namespace Reset.Player.Movement {
 				case PlayerFacingDirection.Static:
 					targetRotation = agent.transform.rotation;
 					break;
+
 			}
 			
 			// Set final rotation

Assets/Scripts/Core/ValueGroup.cs

@@ -1,372 +1,488 @@
+using System;
 using ParadoxNotion.Design;
+using Reset.Core;
 using UnityEditor;
 using UnityEngine;
 
-// Individual bool setting for each ring. Three of these will be used. 
-public struct OrbitalFollowValueGroup : IValueGroup{
-	public string label;
-	
-	public ValueChangeAction changeHeight;
-	public float height;
-	
-	public ValueChangeAction changeRadius;
-	public float radius;
+namespace Reset.Core{
+	// Individual bool setting for each ring. Three of these will be used. 
+	public struct OrbitalFollowValueGroup{
+		public string label;
+		
+		public ValueChangeAction changeHeight;
+		public float height;
+		
+		public ValueChangeAction changeRadius;
+		public float radius;
 
-	public OrbitalFollowValueGroup(string newLabel){
-		label = newLabel;
-		changeHeight = ValueChangeAction.NoChange;
-		height = 0f;
-		changeRadius = ValueChangeAction.NoChange;
-		radius = 0f;
+		public OrbitalFollowValueGroup(string newLabel){
+			label = newLabel;
+			changeHeight = ValueChangeAction.NoChange;
+			height = 0f;
+			changeRadius = ValueChangeAction.NoChange;
+			radius = 0f;
+		}
 	}
-}
 
-// Enum options for individual camera settings
-public enum ValueChangeAction{
-	NoChange,
-	NewValue,
-	ResetValue,
-	RelativeValue, // Placeholder for using as altering existing value
-}
-
-public interface IValueGroup{
-	
-}
-
-public struct Vector3ValueGroup : IValueGroup{
-	public string label;
-	public Vector3 newValue;
-	
-	public ValueChangeAction changeX;
-	public ValueChangeAction changeY;
-	public ValueChangeAction changeZ;
-	
-	public Vector3ValueGroup(string newLabel){
-		changeX = ValueChangeAction.NoChange;
-		changeY = ValueChangeAction.NoChange;
-		changeZ = ValueChangeAction.NoChange;
-
-		newValue = Vector3.zero;
-		label = newLabel;
+	// Enum options for individual camera settings
+	public enum ValueChangeAction{
+		NoChange,
+		NewValue,
+		ResetValue,
+		RelativeValue, // Placeholder for using as altering existing value
 	}
-}
 
-public struct Vector2ValueGroup : IValueGroup{
-	public string label;
-	public Vector2 newValue;
-	
-	public ValueChangeAction changeX;
-	public ValueChangeAction changeY;
-	
-	public Vector2ValueGroup(string newLabel){
-		changeX = ValueChangeAction.NoChange;
-		changeY = ValueChangeAction.NoChange;
+	public struct CurveValueGroup{
+		public string label;
+		public AnimationCurve newValue;
 
-		newValue = Vector2.zero;
-		label = newLabel;
+		public ValueChangeAction changeValue;
+
+		public CurveValueGroup(string newLabel){
+			changeValue = ValueChangeAction.NoChange;
+
+			newValue = new AnimationCurve();
+			label = newLabel;
+		}
 	}
-}
 
-public struct FloatValueGroup : IValueGroup{
-	public string label;
-	public float value;
+	public struct EnumValueGroup{
+		public string label;
+		public Enum newValue;
 
-	public ValueChangeAction changeValue;
+		public ValueChangeAction changeValue;
 
-	public FloatValueGroup(string newLabel){
-		label = newLabel;
-		value = 0f;
-		changeValue = ValueChangeAction.NoChange;
+		public EnumValueGroup(string newLabel, Enum enumType){
+			changeValue = ValueChangeAction.NoChange;
+
+			newValue = enumType;
+			label = newLabel;
+
+
+		}
 	}
-}
 
-public struct BoolValueGroup : IValueGroup{
-	public string label;
-	public bool value;
+	public struct Vector3ValueGroup{
+		public string label;
+		public Vector3 newValue;
+		
+		public ValueChangeAction changeX;
+		public ValueChangeAction changeY;
+		public ValueChangeAction changeZ;
+		
+		public Vector3ValueGroup(string newLabel){
+			changeX = ValueChangeAction.NoChange;
+			changeY = ValueChangeAction.NoChange;
+			changeZ = ValueChangeAction.NoChange;
 
-	public ValueChangeAction changeValue;
-
-	public BoolValueGroup(string newLabel){
-		label = newLabel;
-		value = true;
-		changeValue = ValueChangeAction.NoChange;
+			newValue = Vector3.zero;
+			label = newLabel;
+		}
+	}
+
+	public struct Vector2ValueGroup{
+		public string label;
+		public Vector2 newValue;
+		
+		public ValueChangeAction changeX;
+		public ValueChangeAction changeY;
+		
+		public Vector2ValueGroup(string newLabel){
+			changeX = ValueChangeAction.NoChange;
+			changeY = ValueChangeAction.NoChange;
+
+			newValue = Vector2.zero;
+			label = newLabel;
+		}
+	}
+
+	public struct FloatValueGroup{
+		public string label;
+		public float value;
+
+		public ValueChangeAction changeValue;
+
+		public FloatValueGroup(string newLabel){
+			label = newLabel;
+			value = 0f;
+			changeValue = ValueChangeAction.NoChange;
+		}
+	}
+
+	public struct BoolValueGroup{
+		public string label;
+		public bool value;
+
+		public ValueChangeAction changeValue;
+
+		public BoolValueGroup(string newLabel){
+			label = newLabel;
+			value = true;
+			changeValue = ValueChangeAction.NoChange;
+		}
 	}
-}
 
 #if UNITY_EDITOR
-public class BoolValueGroupDrawer : ObjectDrawer<BoolValueGroup>  {
-	public override BoolValueGroup OnGUI(GUIContent content, BoolValueGroup _instance){
-		// Remove label for floats
-		EditorGUIUtility.labelWidth = 50;
-		
-		// Set layout options for the label and the float fields
-		GUILayoutOption[] floatOptions = new GUILayoutOption[] {
-			GUILayout.Width(80.0f), 
-			GUILayout.MinWidth(20.0f), 
-			GUILayout.ExpandWidth(true), 
-		};
+	public class BoolValueGroupDrawer : ObjectDrawer<BoolValueGroup>  {
+		public override BoolValueGroup OnGUI(GUIContent content, BoolValueGroup _instance){
+			// Remove label for floats
+			EditorGUIUtility.labelWidth = 50;
+			
+			// Set layout options for the label and the float fields
+			GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+				GUILayout.Width(80.0f), 
+				GUILayout.MinWidth(20.0f), 
+				GUILayout.ExpandWidth(true), 
+			};
 
-		GUILayoutOption[] labelOptions = new GUILayoutOption[]{
-			GUILayout.Width(200.0f),
-		};
-		
-		// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
-		GUILayout.BeginVertical();
-		GUILayout.Label(_instance.label, labelOptions);
-		GUILayout.BeginHorizontal();
-		
-		// Create the x settings enum
-		_instance.changeValue = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeValue);
-		
-		// Create the value/disabled information field
-		if (_instance.changeValue == ValueChangeAction.NewValue){
-			_instance.value = EditorGUILayout.Toggle(_instance.value, floatOptions);
-		} else {
-			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(_instance.changeValue == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
-			EditorGUI.EndDisabledGroup();
+			GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+				GUILayout.Width(200.0f),
+			};
+			
+			// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
+			GUILayout.BeginVertical();
+			GUILayout.Label(_instance.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeValue = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeValue);
+			
+			// Create the value/disabled information field
+			if (_instance.changeValue == ValueChangeAction.NewValue){
+				_instance.value = EditorGUILayout.Toggle(_instance.value, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeValue == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			
+			// Close this line up
+			GUILayout.EndHorizontal();
+			GUILayout.EndVertical();
+			
+			// Reset to default so the rest of things don't get messed up
+			EditorGUIUtility.labelWidth = 0;
+			return _instance;
 		}
-		
-		// Close this line up
-		GUILayout.EndHorizontal();
-		GUILayout.EndVertical();
-		
-		// Reset to default so the rest of things don't get messed up
-		EditorGUIUtility.labelWidth = 0;
-		return _instance;
 	}
-}
+	
+	public class CurveVlueGroupDrawer : ObjectDrawer<CurveValueGroup>  {
+		public override CurveValueGroup OnGUI(GUIContent _content, CurveValueGroup _instance){
+			// Remove label for floats
+			EditorGUIUtility.labelWidth = 50;
+			
+			// Set layout options for the label and the float fields
+			GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+				GUILayout.Width(80.0f), 
+				GUILayout.MinWidth(20.0f), 
+				GUILayout.ExpandWidth(true), 
+			};
 
-public class FloatValueGroupDrawer : ObjectDrawer<FloatValueGroup>  {
-	public override FloatValueGroup OnGUI(GUIContent _content, FloatValueGroup _instance){
-		// Remove label for floats
-		EditorGUIUtility.labelWidth = 50;
-		
-		// Set layout options for the label and the float fields
-		GUILayoutOption[] floatOptions = new GUILayoutOption[] {
-			GUILayout.Width(80.0f), 
-			GUILayout.MinWidth(20.0f), 
-			GUILayout.ExpandWidth(true), 
-		};
-
-		GUILayoutOption[] labelOptions = new GUILayoutOption[]{
-			GUILayout.Width(200.0f),
-		};
-		
-		// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
-		GUILayout.BeginVertical();
-		GUILayout.Label(_instance.label, labelOptions);
-		GUILayout.BeginHorizontal();
-		
-		// Create the x settings enum
-		_instance.changeValue = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeValue);
-		
-		// Create the value/disabled information field
-		if (_instance.changeValue == ValueChangeAction.NewValue){
-			_instance.value = EditorGUILayout.FloatField(_instance.value, floatOptions);
-		} else {
-			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(_instance.changeValue == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
-			EditorGUI.EndDisabledGroup();
+			GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+				GUILayout.Width(200.0f),
+			};
+			
+			// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
+			GUILayout.BeginVertical();
+			GUILayout.Label(_instance.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeValue = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeValue);
+			
+			// Create the value/disabled information field
+			if (_instance.changeValue == ValueChangeAction.NewValue){
+				_instance.newValue = EditorGUILayout.CurveField(_instance.newValue, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeValue == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			
+			// Close this line up
+			GUILayout.EndHorizontal();
+			GUILayout.EndVertical();
+			
+			// Reset to default so the rest of things don't get messed up
+			EditorGUIUtility.labelWidth = 0;
+			return _instance;
 		}
-		
-		// Close this line up
-		GUILayout.EndHorizontal();
-		GUILayout.EndVertical();
-		
-		// Reset to default so the rest of things don't get messed up
-		EditorGUIUtility.labelWidth = 0;
-		return _instance;
 	}
-}
 
-public class Vector3ValueGroupDrawer : ObjectDrawer<Vector3ValueGroup>  {
-	public override Vector3ValueGroup OnGUI(GUIContent _content, Vector3ValueGroup _instance){
-		// Remove label for floats
-		EditorGUIUtility.labelWidth = 20;
-		
-		// Set layout options for the label and the float fields
-		GUILayoutOption[] floatOptions = new GUILayoutOption[] {
-			GUILayout.Width(300.0f), 
-			GUILayout.MinWidth(20.0f), 
-			GUILayout.ExpandWidth(true), 
-		};
+	public class EnumValueGroupDrawer : ObjectDrawer<EnumValueGroup>{
+		public override EnumValueGroup OnGUI(GUIContent _content, EnumValueGroup _instance){
+			// Set layout options for the label and the float fields
+			GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+				GUILayout.Width(200.0f), 
+				GUILayout.MinWidth(100.0f), 
+				GUILayout.ExpandWidth(true), 
+			};
 
-		GUILayoutOption[] labelOptions = new GUILayoutOption[]{
-			GUILayout.Width(200.0f),
-		};
-		
-		// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
-		GUILayout.BeginVertical();
-		GUILayout.Label(_instance.label, labelOptions);
-		GUILayout.BeginHorizontal();
-		
-		// Create the x settings enum
-		_instance.changeX = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeX);
-		
-		// Create the value/disabled information field
-		if (_instance.changeX == ValueChangeAction.NewValue){
-			_instance.newValue.x = EditorGUILayout.FloatField(_instance.newValue.x, floatOptions);
-		} else {
-			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(_instance.changeX == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
-			EditorGUI.EndDisabledGroup();
+			GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+				GUILayout.Width(200.0f),
+			};
+			
+			// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
+			GUILayout.BeginVertical();
+			GUILayout.Label(_instance.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeValue = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeValue);
+			
+			// Create the value/disabled information field
+			if (_instance.changeValue == ValueChangeAction.NewValue){
+				_instance.newValue = EditorGUILayout.EnumPopup("", instance.newValue, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeValue == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			
+			// Close this line up
+			GUILayout.EndHorizontal();
+			GUILayout.EndVertical();
+			
+			// Reset to default so the rest of things don't get messed up
+			EditorGUIUtility.labelWidth = 0;
+			return _instance;
 		}
-		  
-		// It do what it do.
-		GUILayout.Space(5);
+
 		
-		// Create the y settings enum
-		_instance.changeY = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeY);
-		
-		// Create the value/disabled information field
-		if (_instance.changeY == ValueChangeAction.NewValue){
-			_instance.newValue.y = EditorGUILayout.FloatField(_instance.newValue.y, floatOptions);
-		} else {
-			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(_instance.changeY == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
-			EditorGUI.EndDisabledGroup();
-		}
-		
-		// It do what it do.
-		GUILayout.Space(5);
-		
-		// Create the y settings enum
-		_instance.changeZ = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeZ);
-		
-		// Create the value/disabled information field
-		if (_instance.changeZ == ValueChangeAction.NewValue){
-			_instance.newValue.z = EditorGUILayout.FloatField(_instance.newValue.z, floatOptions);
-		} else {
-			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(_instance.changeZ == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
-			EditorGUI.EndDisabledGroup();
-		}
-		
-		// Close this line up
-		GUILayout.EndHorizontal();
-		GUILayout.EndVertical();
-		
-		// Reset to default so the rest of things don't get messed up
-		EditorGUIUtility.labelWidth = 0;
-		return _instance;
 	}
-}
 
-public class Vector2ValueGroupDrawer : ObjectDrawer<Vector2ValueGroup>  {
-	public override Vector2ValueGroup OnGUI(GUIContent _content, Vector2ValueGroup _instance){
-		// Remove label for floats
-		EditorGUIUtility.labelWidth = 50;
-		
-		// Set layout options for the label and the float fields
-		GUILayoutOption[] floatOptions = new GUILayoutOption[] {
-			GUILayout.Width(300.0f), 
-			GUILayout.MinWidth(20.0f), 
-			GUILayout.ExpandWidth(true), 
-		};
+	public class FloatValueGroupDrawer : ObjectDrawer<FloatValueGroup>  {
+		public override FloatValueGroup OnGUI(GUIContent _content, FloatValueGroup _instance){
+			// Remove label for floats
+			EditorGUIUtility.labelWidth = 50;
+			
+			// Set layout options for the label and the float fields
+			GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+				GUILayout.Width(80.0f), 
+				GUILayout.MinWidth(20.0f), 
+				GUILayout.ExpandWidth(true), 
+			};
 
-		GUILayoutOption[] labelOptions = new GUILayoutOption[]{
-			GUILayout.Width(200.0f),
-		};
-		
-		// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
-		GUILayout.BeginVertical();
-		GUILayout.Label(_instance.label, labelOptions);
-		GUILayout.BeginHorizontal();
-		
-		// Create the x settings enum
-		_instance.changeX = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeX);
-		
-		// Create the value/disabled information field
-		if (_instance.changeX == ValueChangeAction.NewValue){
-			_instance.newValue.x = EditorGUILayout.FloatField(_instance.newValue.x, floatOptions);
-		} else {
-			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(_instance.changeX == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
-			EditorGUI.EndDisabledGroup();
+			GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+				GUILayout.Width(200.0f),
+			};
+			
+			// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
+			GUILayout.BeginVertical();
+			GUILayout.Label(_instance.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeValue = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeValue);
+			
+			// Create the value/disabled information field
+			if (_instance.changeValue == ValueChangeAction.NewValue){
+				_instance.value = EditorGUILayout.FloatField(_instance.value, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeValue == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			
+			// Close this line up
+			GUILayout.EndHorizontal();
+			GUILayout.EndVertical();
+			
+			// Reset to default so the rest of things don't get messed up
+			EditorGUIUtility.labelWidth = 0;
+			return _instance;
 		}
-		  
-		// It do what it do.
-		GUILayout.Space(5);
-		
-		// Create the y settings enum
-		_instance.changeY = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeY);
-		
-		// Create the value/disabled information field
-		if (_instance.changeY == ValueChangeAction.NewValue){
-			_instance.newValue.y = EditorGUILayout.FloatField(_instance.newValue.y, floatOptions);
-		} else {
-			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(_instance.changeY == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
-			EditorGUI.EndDisabledGroup();
-		}
-		
-		// Close this line up
-		GUILayout.EndHorizontal();
-		GUILayout.EndVertical();
-		
-		// Reset to default so the rest of things don't get messed up
-		EditorGUIUtility.labelWidth = 0;
-		return _instance;
 	}
-}
 
-// Custom editor for each orbital follow ring setting
-public class OrbitalFollowValueGroupDrawer : ObjectDrawer<OrbitalFollowValueGroup>{
-	public override OrbitalFollowValueGroup OnGUI(GUIContent _content, OrbitalFollowValueGroup _instance){
-		// Remove label for floats
-		EditorGUIUtility.labelWidth = 1;
-		
-		// Set layout options for the label and the float fields
-		GUILayoutOption[] floatOptions = new GUILayoutOption[] {
-			GUILayout.Width(300.0f), 
-			GUILayout.MinWidth(20.0f), 
-			GUILayout.ExpandWidth(true), 
-		};
+	public class Vector3ValueGroupDrawer : ObjectDrawer<Vector3ValueGroup>  {
+		public override Vector3ValueGroup OnGUI(GUIContent _content, Vector3ValueGroup _instance){
+			// Remove label for floats
+			EditorGUIUtility.labelWidth = 20;
+			
+			// Set layout options for the label and the float fields
+			GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+				GUILayout.Width(300.0f), 
+				GUILayout.MinWidth(20.0f), 
+				GUILayout.ExpandWidth(true), 
+			};
 
-		GUILayoutOption[] labelOptions = new GUILayoutOption[]{
-			GUILayout.Width(60.0f),
-		};
-		
-		// Start a Horiztonal Section
-		GUILayout.BeginHorizontal();
-		
-		// Add the left side label
-		GUILayout.Label(_instance.label, labelOptions);
-		
-		// Create the height settings enum
-		_instance.changeHeight = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeHeight);
-		
-		// Create the value/disabled information field
-		if (_instance.changeHeight == ValueChangeAction.NewValue){
-			_instance.height = EditorGUILayout.FloatField(_instance.height, floatOptions);
-		} else {
-			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(_instance.changeHeight == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
-			EditorGUI.EndDisabledGroup();
+			GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+				GUILayout.Width(200.0f),
+			};
+			
+			// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
+			GUILayout.BeginVertical();
+			GUILayout.Label(_instance.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeX = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeX);
+			
+			// Create the value/disabled information field
+			if (_instance.changeX == ValueChangeAction.NewValue){
+				_instance.newValue.x = EditorGUILayout.FloatField(_instance.newValue.x, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeX == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			  
+			// It do what it do.
+			GUILayout.Space(5);
+			
+			// Create the y settings enum
+			_instance.changeY = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeY);
+			
+			// Create the value/disabled information field
+			if (_instance.changeY == ValueChangeAction.NewValue){
+				_instance.newValue.y = EditorGUILayout.FloatField(_instance.newValue.y, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeY == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			
+			// It do what it do.
+			GUILayout.Space(5);
+			
+			// Create the y settings enum
+			_instance.changeZ = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeZ);
+			
+			// Create the value/disabled information field
+			if (_instance.changeZ == ValueChangeAction.NewValue){
+				_instance.newValue.z = EditorGUILayout.FloatField(_instance.newValue.z, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeZ == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			
+			// Close this line up
+			GUILayout.EndHorizontal();
+			GUILayout.EndVertical();
+			
+			// Reset to default so the rest of things don't get messed up
+			EditorGUIUtility.labelWidth = 0;
+			return _instance;
 		}
-		  
-		// It do what it do.
-		GUILayout.Space(5);
-		
-		// Create the radius settings enum
-		_instance.changeRadius = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeRadius);
-		
-		// Create the value/disabled information field
-		if (_instance.changeRadius == ValueChangeAction.NewValue){
-			_instance.radius = EditorGUILayout.FloatField(_instance.radius, floatOptions);
-		} else {
-			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(_instance.changeRadius == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
-			EditorGUI.EndDisabledGroup();
-		}
-		
-		// Close this line up
-		GUILayout.EndHorizontal();
-		
-		// Reset to default so the rest of things don't get messed up
-		EditorGUIUtility.labelWidth = 0;
-		return _instance;
 	}
+
+	public class Vector2ValueGroupDrawer : ObjectDrawer<Vector2ValueGroup>  {
+		public override Vector2ValueGroup OnGUI(GUIContent _content, Vector2ValueGroup _instance){
+			// Remove label for floats
+			EditorGUIUtility.labelWidth = 50;
+			
+			// Set layout options for the label and the float fields
+			GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+				GUILayout.Width(300.0f), 
+				GUILayout.MinWidth(20.0f), 
+				GUILayout.ExpandWidth(true), 
+			};
+
+			GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+				GUILayout.Width(200.0f),
+			};
+			
+			// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
+			GUILayout.BeginVertical();
+			GUILayout.Label(_instance.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeX = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeX);
+			
+			// Create the value/disabled information field
+			if (_instance.changeX == ValueChangeAction.NewValue){
+				_instance.newValue.x = EditorGUILayout.FloatField(_instance.newValue.x, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeX == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			  
+			// It do what it do.
+			GUILayout.Space(5);
+			
+			// Create the y settings enum
+			_instance.changeY = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeY);
+			
+			// Create the value/disabled information field
+			if (_instance.changeY == ValueChangeAction.NewValue){
+				_instance.newValue.y = EditorGUILayout.FloatField(_instance.newValue.y, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeY == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			
+			// Close this line up
+			GUILayout.EndHorizontal();
+			GUILayout.EndVertical();
+			
+			// Reset to default so the rest of things don't get messed up
+			EditorGUIUtility.labelWidth = 0;
+			return _instance;
+		}
+	}
+
+	// Custom editor for each orbital follow ring setting
+	public class OrbitalFollowValueGroupDrawer : ObjectDrawer<OrbitalFollowValueGroup>{
+		public override OrbitalFollowValueGroup OnGUI(GUIContent _content, OrbitalFollowValueGroup _instance){
+			// Remove label for floats
+			EditorGUIUtility.labelWidth = 1;
+			
+			// Set layout options for the label and the float fields
+			GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+				GUILayout.Width(300.0f), 
+				GUILayout.MinWidth(20.0f), 
+				GUILayout.ExpandWidth(true), 
+			};
+
+			GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+				GUILayout.Width(60.0f),
+			};
+			
+			// Start a Horiztonal Section
+			GUILayout.BeginHorizontal();
+			
+			// Add the left side label
+			GUILayout.Label(_instance.label, labelOptions);
+			
+			// Create the height settings enum
+			_instance.changeHeight = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeHeight);
+			
+			// Create the value/disabled information field
+			if (_instance.changeHeight == ValueChangeAction.NewValue){
+				_instance.height = EditorGUILayout.FloatField(_instance.height, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeHeight == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			  
+			// It do what it do.
+			GUILayout.Space(5);
+			
+			// Create the radius settings enum
+			_instance.changeRadius = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeRadius);
+			
+			// Create the value/disabled information field
+			if (_instance.changeRadius == ValueChangeAction.NewValue){
+				_instance.radius = EditorGUILayout.FloatField(_instance.radius, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeRadius == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			
+			// Close this line up
+			GUILayout.EndHorizontal();
+			
+			// Reset to default so the rest of things don't get messed up
+			EditorGUIUtility.labelWidth = 0;
+			return _instance;
+		}
+	}
+	#endif
+
 }
-#endif