Merge branch 'Develop' into Master

Fix editor bugs
SnpM · May 5, 2019 · 4751069 · 4751069
1 parent 5653f4d
commit 4751069
Show file tree

Hide file tree

Showing 296 changed files with 14,177 additions and 12,633 deletions.
diff --git a/Core/Game/Abilities/Ability.cs b/Core/Game/Abilities/Ability.cs
@@ -9,175 +9,179 @@
 
 namespace Lockstep
 {
-    public abstract class Ability : MonoBehaviour//CerealBehaviour
-    {
-        private bool isCasting;
-        
-        private LSAgent _agent;
-
-        public LSAgent Agent
-        {
-            get
-            {
+	public abstract class Ability : MonoBehaviour//CerealBehaviour
+	{
+		private bool isCasting;
+
+		private LSAgent _agent;
+
+		public LSAgent Agent
+		{
+			get
+			{
 #if UNITY_EDITOR
-                if (_agent == null)
-                    return GetComponent<LSAgent>();
+				if (_agent == null)
+					return GetComponent<LSAgent>();
 #endif
-                return _agent;
-            }
-        }
-
-        public string MyAbilityCode { get; private set; }
-
-        public AbilityDataItem Data { get; private set; }
-
-        public int ID { get; private set; }
-
-        public Transform CachedTransform { get { return Agent.CachedTransform; } }
-
-        public GameObject CachedGameObject { get { return Agent.CachedGameObject; } }
-
-        public int VariableContainerTicket { get; private set; }
-
-        private LSVariableContainer _variableContainer;
-
-        public LSVariableContainer VariableContainer { get { return _variableContainer; } }
-
-        public bool IsCasting
-        {
-            get
-            {
-                return isCasting;
-            }
-            protected set
-            {
-                if (value != isCasting)
-                {
-                    if (value == true)
-                    {
-                        Agent.CheckCasting = false;
-                    } else
-                    {
-                        Agent.CheckCasting = true;
-                    }
-                    isCasting = value;
-                }
-            }
-        }
-
-        internal void Setup(LSAgent agent, int id)
-        {
-            System.Type mainType = this.GetType();
-            if (mainType.IsSubclassOf(typeof(ActiveAbility)))
-            {
-				while ( mainType.BaseType != typeof(ActiveAbility) &&
-				       mainType.GetCustomAttributes(typeof (CustomActiveAbilityAttribute),false).Length == 0)
-                {
-                    mainType = mainType.BaseType;
-                }
-                Data = AbilityDataItem.FindInterfacer(mainType);
-                if (Data == null)
-                {
-                    throw new System.ArgumentException("The Ability of type " + mainType + " has not been registered in database");
-                }
-                this.MyAbilityCode = Data.Name;
-            } else
-            {
-                this.MyAbilityCode = mainType.Name;
-            }
-            _agent = agent;
-            ID = id;
-            TemplateSetup();
-            OnSetup();
-            this.VariableContainerTicket = LSVariableManager.Register(this);
-            this._variableContainer = LSVariableManager.GetContainer(VariableContainerTicket);
-        }
-
-        internal void LateSetup () {
-            this.OnLateSetup();
-        }
-        /// <summary>
-        /// Override for communicating with other abilities in the setup phase
-        /// </summary>
-        protected virtual void OnLateSetup () {}
-
-        protected virtual void TemplateSetup()
-        {
-
-        }
-
-        protected virtual void OnSetup()
-        {
-        }
-
-        internal void Initialize()
-        {
-            VariableContainer.Reset();
-            IsCasting = false;
+				return _agent;
+			}
+		}
+
+		public string MyAbilityCode { get; private set; }
+
+		public AbilityDataItem Data { get; private set; }
+
+		public int ID { get; private set; }
+
+		public Transform CachedTransform { get { return Agent.CachedTransform; } }
+
+		public GameObject CachedGameObject { get { return Agent.CachedGameObject; } }
+
+		public int VariableContainerTicket { get; private set; }
+
+		private LSVariableContainer _variableContainer;
+
+		public LSVariableContainer VariableContainer { get { return _variableContainer; } }
+
+		public bool IsCasting
+		{
+			get
+			{
+				return isCasting;
+			}
+			protected set
+			{
+				if (value != isCasting)
+				{
+					if (value == true)
+					{
+						Agent.CheckCasting = false;
+					}
+					else
+					{
+						Agent.CheckCasting = true;
+					}
+					isCasting = value;
+				}
+			}
+		}
+
+		internal void Setup(LSAgent agent, int id)
+		{
+			System.Type mainType = this.GetType();
+			if (mainType.IsSubclassOf(typeof(ActiveAbility)))
+			{
+				while (mainType.BaseType != typeof(ActiveAbility) &&
+					   mainType.GetCustomAttributes(typeof(CustomActiveAbilityAttribute), false).Length == 0)
+				{
+					mainType = mainType.BaseType;
+				}
+				Data = AbilityDataItem.FindInterfacer(mainType);
+				if (Data == null)
+				{
+					throw new System.ArgumentException("The Ability of type " + mainType + " has not been registered in database");
+				}
+				this.MyAbilityCode = Data.Name;
+			}
+			else
+			{
+				this.MyAbilityCode = mainType.Name;
+			}
+			_agent = agent;
+			ID = id;
+			TemplateSetup();
+			OnSetup();
+			this.VariableContainerTicket = LSVariableManager.Register(this);
+			this._variableContainer = LSVariableManager.GetContainer(VariableContainerTicket);
+		}
+
+		internal void LateSetup()
+		{
+			this.OnLateSetup();
+		}
+		/// <summary>
+		/// Override for communicating with other abilities in the setup phase
+		/// </summary>
+		protected virtual void OnLateSetup() { }
+
+		protected virtual void TemplateSetup()
+		{
+
+		}
+
+		protected virtual void OnSetup()
+		{
+		}
+
+		internal void Initialize()
+		{
+			VariableContainer.Reset();
+			IsCasting = false;
 			IsFirstFrame = true;
 
-            OnInitialize();
-        }
+			OnInitialize();
+		}
 
-        protected virtual void OnInitialize()
-        {
-        }
+		protected virtual void OnInitialize()
+		{
+		}
 
 		bool IsFirstFrame = true;
 		private void FirstFrame()
 		{
-			OnFirstFrame();	
+			OnFirstFrame();
 		}
 		protected virtual void OnFirstFrame()
 		{
 
 		}
-        internal void Simulate()
-        {
+		internal void Simulate()
+		{
 			if (IsFirstFrame)
 			{
 				FirstFrame();
 			}
-            TemplateSimulate ();
+			TemplateSimulate();
 
-            OnSimulate();
-            if (isCasting)
-            {
-                OnCast();
-            }
-        }
+			OnSimulate();
+			if (isCasting)
+			{
+				OnCast();
+			}
+		}
 
-        protected virtual void TemplateSimulate () {
+		protected virtual void TemplateSimulate()
+		{
 
-        }
+		}
 
-        protected virtual void OnSimulate()
-        {
-        }
+		protected virtual void OnSimulate()
+		{
+		}
 
-        internal void LateSimulate()
-        {
-            OnLateSimulate();
-        }
+		internal void LateSimulate()
+		{
+			OnLateSimulate();
+		}
 
-        protected virtual void OnLateSimulate()
-        {
+		protected virtual void OnLateSimulate()
+		{
 
-        }
+		}
 
-        protected virtual void OnCast()
-        {
-        }
+		protected virtual void OnCast()
+		{
+		}
 
-        internal void Visualize()
-        {
-            OnVisualize();
-        }
+		internal void Visualize()
+		{
+			OnVisualize();
+		}
 
 
-        protected virtual void OnVisualize()
-        {
-        }
+		protected virtual void OnVisualize()
+		{
+		}
 		public void LateVisualize()
 		{
 			this.OnLateVisualize();
@@ -187,32 +191,32 @@ protected virtual void OnLateVisualize()
 
 		}
 
-        public void BeginCast()
-        {
-            OnBeginCast();
-        }
+		public void BeginCast()
+		{
+			OnBeginCast();
+		}
 
-        protected virtual void OnBeginCast()
-        {
-        }
+		protected virtual void OnBeginCast()
+		{
+		}
 
-        public void StopCast()
-        {
-            OnStopCast();
-        }
+		public void StopCast()
+		{
+			OnStopCast();
+		}
 
-        protected virtual void OnStopCast()
-        {
-        }
+		protected virtual void OnStopCast()
+		{
+		}
 
-        public void Deactivate()
-        {
-            IsCasting = false;
-            OnDeactivate();
-        }
+		public void Deactivate()
+		{
+			IsCasting = false;
+			OnDeactivate();
+		}
 
-        protected virtual void OnDeactivate()
-        {
-        }
-    }
+		protected virtual void OnDeactivate()
+		{
+		}
+	}
 }