Reset Back To Nonrx

MystikalPooka · MystikalPooka · commit f8bb9e4e9edf · 2018-03-29T22:19:08.000-06:00
diff --git a/Assets/Scripts/AI/BehaviorManager.cs b/Assets/Scripts/AI/BehaviorManager.cs
@@ -78,10 +78,10 @@ public void Reinitialize()
         IEnumerator Start()
         {
             WaitForSeconds wfs = new WaitForSeconds(SecondsBetweenTicks);
-
+            
             Debug.Log("Starting ticks on Runner: \n\t" + Runner.ToString());
             yield return Runner.Tick();
-            while (Runner.CurrentState == BehaviorState.Running && (TimesToTick != 0))
+            while (Runner.CurrentState.Equals(BehaviorState.Running) && (TimesToTick != 0))
             {
                 yield return StartCoroutine(Runner.Tick(wfs));
                 if(TimesToTick > 0) --TimesToTick;
diff --git a/Assets/Scripts/AI/BehaviorTreeElement.cs b/Assets/Scripts/AI/BehaviorTreeElement.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using UniRx;
 using UnityEngine;
 
 namespace Assets.Scripts.AI
@@ -44,24 +45,15 @@ public BehaviorTreeElement(string name, int depth, int id)
             : base(name, depth, id)
         {
             ElementType = this.GetType().ToString();
-            _CurrentState = BehaviorState.Null;
+            CurrentState = (BehaviorState.Null);
             Children = new List<TreeElement>();
         }
 
-        private BehaviorState _CurrentState;
+
         [Newtonsoft.Json.JsonIgnore]
-        public BehaviorState CurrentState
-        {
-            get
-            {
-                return _CurrentState;
-            }
-            protected set
-            {
-                _CurrentState = value;
+        public BehaviorState CurrentState;
 
-            }
-        }
+        
 
         public virtual IEnumerator Tick(WaitForSeconds delayStart = null)
         {
diff --git a/Assets/Scripts/AI/Components/BehaviorComponent.cs b/Assets/Scripts/AI/Components/BehaviorComponent.cs
@@ -21,7 +21,5 @@ public virtual void AddChild(BehaviorTreeElement element)
             element.BehaviorTreeManager = BehaviorTreeManager;
             Children.Add(element);
         }
-
-
     }
 }
diff --git a/Assets/Scripts/AI/Components/ParallelRunner.cs b/Assets/Scripts/AI/Components/ParallelRunner.cs
@@ -31,11 +31,11 @@ public ParallelRunner(string name, int depth, int id)
         public override IEnumerator Tick(WaitForSeconds delayStart = null)
         {
             yield return delayStart;
-            CurrentState = BehaviorState.Running;
+            CurrentState = (BehaviorState.Running);
             if (Children == null || Children.Count <=0)
             {
                 Debug.LogWarning("Children Null in parallel runner");
-                CurrentState = BehaviorState.Null;
+                CurrentState = (BehaviorState.Null);
                 yield return null;
             }
 
@@ -49,7 +49,7 @@ public override IEnumerator Tick(WaitForSeconds delayStart = null)
                     ++NumberOfFailures;
                     if(NumberOfFailures >= NumberOfFailuresBeforeFail)
                     {
-                        CurrentState = BehaviorState.Fail;
+                        CurrentState = (BehaviorState.Fail);
                         yield break;
                     }
                 }
@@ -60,12 +60,12 @@ public override IEnumerator Tick(WaitForSeconds delayStart = null)
                     ++NumberOfSuccesses;
                     if (NumberOfSuccesses >= NumberOfSuccessBeforeSucceed)
                     {
-                        CurrentState = BehaviorState.Success;
+                        CurrentState = (BehaviorState.Success);
                         yield break;
                     }
                 }
                 Debug.LogWarning("Ending Parallel Tick in Run State.");
-                CurrentState = BehaviorState.Running;
+                CurrentState = (BehaviorState.Running);
                 yield return null;
             }
         }
diff --git a/Assets/Scripts/AI/Components/Selector.cs b/Assets/Scripts/AI/Components/Selector.cs
@@ -21,7 +21,7 @@ public override IEnumerator Tick(UnityEngine.WaitForSeconds delayStart = null)
             base.Tick();
             UnityEngine.Debug.LogError("Selector START");
             
-            CurrentState = BehaviorState.Running;
+            CurrentState = (BehaviorState.Running);
             foreach (BehaviorTreeElement behavior in Children)
             {
                 yield return BehaviorTreeManager.StartCoroutine(behavior.Tick());
diff --git a/Assets/Scripts/AI/Decorators/Inverter.cs b/Assets/Scripts/AI/Decorators/Inverter.cs
@@ -20,13 +20,13 @@ public override IEnumerator Tick(WaitForSeconds delaySTart = null)
             switch (behavior.CurrentState)
             {
                 case BehaviorState.Fail:
-                    this.CurrentState = BehaviorState.Success;
+                    this.CurrentState = (BehaviorState.Success);
                     break;
                 case BehaviorState.Success:
-                    CurrentState = BehaviorState.Fail;
+                    CurrentState = (BehaviorState.Fail);
                     break;
                 case BehaviorState.Running:
-                    this.CurrentState = BehaviorState.Running;
+                    this.CurrentState = (BehaviorState.Running);
                     break;
                 default:
                     Debug.LogError("Something went wrong in an inverter.");
diff --git a/Assets/Scripts/AI/Nodes/DebugOutNode.cs b/Assets/Scripts/AI/Nodes/DebugOutNode.cs
@@ -17,7 +17,7 @@ public override IEnumerator Tick(WaitForSeconds delayStart = null)
             Debug.Log(Name + "node starting... waiting...");
             yield return delayStart;
             Debug.Log("BEHAVIOR NODE DOIN THE THANG!");
-            CurrentState = BehaviorState.Success;
+            CurrentState = (BehaviorState.Success);
             yield return null;
         }
     }
diff --git a/Assets/Scripts/AI/Nodes/MoveEnemyIfCloseToPlayer.cs b/Assets/Scripts/AI/Nodes/MoveEnemyIfCloseToPlayer.cs
@@ -56,7 +56,7 @@ public override IEnumerator Tick(WaitForSeconds delayStart = null)
                 if (Vector3.Distance(currentPosition, targetPosition) > myPos.GetComponentInParent<BoxCollider>().size.magnitude*2)
                 {
                     var directionOfTravel = targetPosition - currentPosition;
-                    CurrentState = BehaviorState.Running;
+                    CurrentState = (BehaviorState.Running);
                     float step = (MoveSpeed / directionOfTravel.magnitude) * Time.fixedDeltaTime;
                     float t = 0;
                     while (t <= 1.0f)
@@ -66,11 +66,11 @@ public override IEnumerator Tick(WaitForSeconds delayStart = null)
                         yield return new WaitForFixedUpdate();         // Leave the routine and return here in the next frame
                     }
                 }
-                CurrentState = BehaviorState.Success;
+                CurrentState = (BehaviorState.Success);
                 yield return null;
             }
 
-            CurrentState = BehaviorState.Success;
+            CurrentState = (BehaviorState.Success);
             yield return null;
         }
 
diff --git a/Assets/Scripts/AI/Tree/TreeElement.cs b/Assets/Scripts/AI/Tree/TreeElement.cs
@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using UniRx;
 using UnityEngine;
 
 namespace Assets.Scripts.AI.Tree
@@ -60,5 +61,4 @@ public TreeElement (string name, int depth, int id)
 			_Depth = depth;
 		}
     }
-
 }
diff --git a/Assets/Scripts/AI/Tree/TreeElementUtility.cs b/Assets/Scripts/AI/Tree/TreeElementUtility.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UniRx;
 
 namespace Assets.Scripts.AI.Tree
 {
@@ -68,8 +69,8 @@ public static T ListToTree<T>(IList<T> list) where T : TreeElement
 						break;
 				}
 
-				// Fill child array
-				List<TreeElement> childList = null;
+                // Fill child array
+                List<TreeElement> childList = null;
 				if (childCount != 0)
 				{
 					childList = new List<TreeElement>(childCount); // Allocate once

Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,10 @@ public void Reinitialize()`
`78`	`78`	`IEnumerator Start()`
`79`	`79`	`{`
`80`	`80`	`WaitForSeconds wfs = new WaitForSeconds(SecondsBetweenTicks);`
`81`		`-`
	`81`	`+`
`82`	`82`	`Debug.Log("Starting ticks on Runner: \n\t" + Runner.ToString());`
`83`	`83`	`yield return Runner.Tick();`
`84`		`- while (Runner.CurrentState == BehaviorState.Running && (TimesToTick != 0))`
	`84`	`+ while (Runner.CurrentState.Equals(BehaviorState.Running) && (TimesToTick != 0))`
`85`	`85`	`{`
`86`	`86`	`yield return StartCoroutine(Runner.Tick(wfs));`
`87`	`87`	`if(TimesToTick > 0) --TimesToTick;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,5 @@ public virtual void AddChild(BehaviorTreeElement element)`
`21`	`21`	`element.BehaviorTreeManager = BehaviorTreeManager;`
`22`	`22`	`Children.Add(element);`
`23`	`23`	`}`
`24`		`-`
`25`		`-`
`26`	`24`	`}`
`27`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,11 @@ public ParallelRunner(string name, int depth, int id)`
`31`	`31`	`public override IEnumerator Tick(WaitForSeconds delayStart = null)`
`32`	`32`	`{`
`33`	`33`	`yield return delayStart;`
`34`		`- CurrentState = BehaviorState.Running;`
	`34`	`+ CurrentState = (BehaviorState.Running);`
`35`	`35`	`if (Children == null \|\| Children.Count <=0)`
`36`	`36`	`{`
`37`	`37`	`Debug.LogWarning("Children Null in parallel runner");`
`38`		`- CurrentState = BehaviorState.Null;`
	`38`	`+ CurrentState = (BehaviorState.Null);`
`39`	`39`	`yield return null;`
`40`	`40`	`}`
`41`	`41`
`@@ -49,7 +49,7 @@ public override IEnumerator Tick(WaitForSeconds delayStart = null)`
`49`	`49`	`++NumberOfFailures;`
`50`	`50`	`if(NumberOfFailures >= NumberOfFailuresBeforeFail)`
`51`	`51`	`{`
`52`		`- CurrentState = BehaviorState.Fail;`
	`52`	`+ CurrentState = (BehaviorState.Fail);`
`53`	`53`	`yield break;`
`54`	`54`	`}`
`55`	`55`	`}`
`@@ -60,12 +60,12 @@ public override IEnumerator Tick(WaitForSeconds delayStart = null)`
`60`	`60`	`++NumberOfSuccesses;`
`61`	`61`	`if (NumberOfSuccesses >= NumberOfSuccessBeforeSucceed)`
`62`	`62`	`{`
`63`		`- CurrentState = BehaviorState.Success;`
	`63`	`+ CurrentState = (BehaviorState.Success);`
`64`	`64`	`yield break;`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`Debug.LogWarning("Ending Parallel Tick in Run State.");`
`68`		`- CurrentState = BehaviorState.Running;`
	`68`	`+ CurrentState = (BehaviorState.Running);`
`69`	`69`	`yield return null;`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public override IEnumerator Tick(UnityEngine.WaitForSeconds delayStart = null)`
`21`	`21`	`base.Tick();`
`22`	`22`	`UnityEngine.Debug.LogError("Selector START");`
`23`	`23`
`24`		`- CurrentState = BehaviorState.Running;`
	`24`	`+ CurrentState = (BehaviorState.Running);`
`25`	`25`	`foreach (BehaviorTreeElement behavior in Children)`
`26`	`26`	`{`
`27`	`27`	`yield return BehaviorTreeManager.StartCoroutine(behavior.Tick());`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public override IEnumerator Tick(WaitForSeconds delayStart = null)`
`17`	`17`	`Debug.Log(Name + "node starting... waiting...");`
`18`	`18`	`yield return delayStart;`
`19`	`19`	`Debug.Log("BEHAVIOR NODE DOIN THE THANG!");`
`20`		`- CurrentState = BehaviorState.Success;`
	`20`	`+ CurrentState = (BehaviorState.Success);`
`21`	`21`	`yield return null;`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public override IEnumerator Tick(WaitForSeconds delayStart = null)`
`56`	`56`	`if (Vector3.Distance(currentPosition, targetPosition) > myPos.GetComponentInParent<BoxCollider>().size.magnitude*2)`
`57`	`57`	`{`
`58`	`58`	`var directionOfTravel = targetPosition - currentPosition;`
`59`		`- CurrentState = BehaviorState.Running;`
	`59`	`+ CurrentState = (BehaviorState.Running);`
`60`	`60`	`float step = (MoveSpeed / directionOfTravel.magnitude) * Time.fixedDeltaTime;`
`61`	`61`	`float t = 0;`
`62`	`62`	`while (t <= 1.0f)`
`@@ -66,11 +66,11 @@ public override IEnumerator Tick(WaitForSeconds delayStart = null)`
`66`	`66`	`yield return new WaitForFixedUpdate(); // Leave the routine and return here in the next frame`
`67`	`67`	`}`
`68`	`68`	`}`
`69`		`- CurrentState = BehaviorState.Success;`
	`69`	`+ CurrentState = (BehaviorState.Success);`
`70`	`70`	`yield return null;`
`71`	`71`	`}`
`72`	`72`
`73`		`- CurrentState = BehaviorState.Success;`
	`73`	`+ CurrentState = (BehaviorState.Success);`
`74`	`74`	`yield return null;`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using Newtonsoft.Json;`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
	`4`	`+using UniRx;`
`4`	`5`	`using UnityEngine;`
`5`	`6`
`6`	`7`	`namespace Assets.Scripts.AI.Tree`
`@@ -60,5 +61,4 @@ public TreeElement (string name, int depth, int id)`
`60`	`61`	`_Depth = depth;`
`61`	`62`	`}`
`62`	`63`	`}`
`63`		`-`
`64`	`64`	`}`