Merge branch 'feature/random-condition' into develop

Author: ashblue

Assets/FluidBehaviorTree/Scripts/BehaviorTree/BehaviorTreeBuilder.cs

@@ -97,6 +97,20 @@ public BehaviorTreeBuilder Condition (string name, Func<bool> action) {
         public BehaviorTreeBuilder Condition (Func<bool> action) {
             return Condition("condition", action);
         }
+        
+        public BehaviorTreeBuilder RandomChance (string name, int chance, int outOf) {
+            _tree.AddNode(Pointer, new RandomChance {
+                Name = name,
+                chance = chance,
+                outOf = outOf
+            });
+
+            return this;
+        }
+
+        public BehaviorTreeBuilder RandomChance (int chance, int outOf) {
+            return RandomChance("random chance", chance, outOf);
+        }
 
         public BehaviorTreeBuilder End () {
             _pointer.RemoveAt(_pointer.Count - 1);

Assets/FluidBehaviorTree/Scripts/BehaviorTree/Editor/BehaviorTreeBuilderTest.cs

@@ -369,5 +369,27 @@ public void It_should_create_a_ReturnFailure () {
                 Assert.AreEqual(1, _invokeCount);
             }
         }
+
+        public class RandomChanceMethod : BehaviorTreeBuilderTest {
+            [Test]
+            public void It_should_add_a_random_chance () {
+                var tree = _builder
+                    .Sequence()
+                        .RandomChance("random", 1, 3)
+                        .Do("action", () => {
+                            _invokeCount++;
+                            return TaskStatus.Success;
+                        })
+                    .Build();
+    
+                var sequence = tree.Root.Children[0] as Sequence;
+                var condition = sequence.Children[0] as RandomChance;
+
+                Assert.AreEqual(sequence.Children.Count, 2);
+                Assert.IsNotNull(condition);
+                Assert.AreEqual(TaskStatus.Success, tree.Tick());
+                Assert.AreEqual(1, _invokeCount);
+            }
+        }
     }
 }

Assets/FluidBehaviorTree/Scripts/Tasks/Conditions/Editor/RandomChanceTest.cs

@@ -0,0 +1,16 @@
+using Adnc.FluidBT.Tasks;
+using NUnit.Framework;
+
+namespace Adnc.FluidBT.Testing {
+    public class RandomChanceTest {
+        [Test]
+        public void It_should_create_a_random_chance () {
+            var randomChance = new RandomChance {
+                chance = 1,
+                outOf = 2
+            };
+            
+            Assert.IsNotNull(randomChance.Update());
+        }
+    }
+}

Assets/FluidBehaviorTree/Scripts/Tasks/Conditions/Editor/RandomChanceTest.cs.meta

@@ -0,0 +1,15 @@
+using UnityEngine;
+
+namespace Adnc.FluidBT.Tasks {
+    public class RandomChance : ConditionBase {
+        public float chance = 1;
+        public float outOf = 1;
+        
+        protected override bool OnUpdate () {
+            var percentage = chance / outOf;
+            var rng = Random.value;
+            
+            return rng <= percentage;
+        }
+    }
+}