Feature: v3

Demo/Assembly-CSharp-Editor.csproj.DotSettings

@@ -1,2 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Ccrashkonijn/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Ccrashkonijn_005Cgoap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Ccrashkonijn_005Cgoap_005Cdemos/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Ccrashkonijn_005Cgoap_005Cdemos_005Ccomplex/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cpackages/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Demo/Assembly-CSharp.csproj.DotSettings

@@ -1,2 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Ccrashkonijn/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Ccrashkonijn_005Cgoap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Ccrashkonijn_005Cgoap_005Cdemos/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Ccrashkonijn_005Cgoap_005Cdemos_005Ccomplex/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cpackages/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Actions/CreateItemAction.cs

@@ -1,18 +1,18 @@
-using System.Linq;
-using CrashKonijn.Goap.Behaviours;
-using CrashKonijn.Goap.Classes;
-using CrashKonijn.Goap.Classes.References;
-using CrashKonijn.Goap.Enums;
-using CrashKonijn.Goap.Interfaces;
-using Demos.Complex.Behaviours;
-using Demos.Complex.Classes.Items;
-using Demos.Complex.Goap;
-using Demos.Complex.Interfaces;
+using System;
+using System.Linq;
+using CrashKonijn.Agent.Core;
+using CrashKonijn.Agent.Runtime;
+using CrashKonijn.Goap.Demos.Complex.Behaviours;
+using CrashKonijn.Goap.Demos.Complex.Classes.Items;
+using CrashKonijn.Goap.Demos.Complex.Goap;
+using CrashKonijn.Goap.Demos.Complex.Interfaces;
+using CrashKonijn.Goap.Runtime;
 using UnityEngine;
+using Random = UnityEngine.Random;
 
-namespace Demos.Complex.Actions
+namespace CrashKonijn.Goap.Demos.Complex.Actions
 {
-    public class CreateItemAction<TCreatable> : ActionBase<CreateItemAction<TCreatable>.Data>, IInjectable
+    public class CreateItemAction<TCreatable> : GoapActionBase<CreateItemAction<TCreatable>.Data, CreateItemAction<TCreatable>.Props>, IInjectable
         where TCreatable : ItemBase, ICreatable
     {
         private ItemFactory itemFactory;
@@ -30,60 +30,50 @@ public override void Created()
 
         public override void Start(IMonoAgent agent, Data data)
         {
-            data.Timer = 5f;
-            data.RequiredWood = this.GetRequiredWood();
-            data.RequiredIron = this.GetRequiredIron();
+            data.WaitState = ActionRunState.Wait(5f);
         }
 
-        public override ActionRunState Perform(IMonoAgent agent, Data data, ActionContext context)
+        public override void BeforePerform(IMonoAgent agent, Data data)
         {
-            if (data.State == State.NotStarted)
+            this.RemoveRequiredResources(data);
+        }
+
+        public override IActionRunState Perform(IMonoAgent agent, Data data, IActionContext context)
+        {
+            if (data.WaitState.IsRunning())
             {
-                data.State = State.Started;
-                this.RemoveRequiredResources(data);
+                return data.WaitState;
             }
 
-            data.Timer -= context.DeltaTime;
-
-            if (data.Timer > 0)
-                return ActionRunState.Continue;
-
-            var item = this.itemFactory.Instantiate<TCreatable>();
-            item.transform.position = this.GetRandomPosition(agent);
-
-            return ActionRunState.Stop;
+            return ActionRunState.Completed;
+        }
+
+        public override void Stop(IMonoAgent agent, Data data)
+        {
         }
 
-        public override void End(IMonoAgent agent, Data data)
+        public override void Complete(IMonoAgent agent, Data data)
         {
+            var item = this.itemFactory.Instantiate<TCreatable>();
+            item.transform.position = this.GetRandomPosition(agent);
         }
 
         private void RemoveRequiredResources(Data data)
         {
-            for (var i = 0; i < data.RequiredIron; i++)
+            for (var i = 0; i < this.Properties.requiredIron; i++)
             {
                 var iron = data.Inventory.Get<Iron>().FirstOrDefault();
                 data.Inventory.Remove(iron);
                 this.instanceHandler.QueueForDestroy(iron);
             }
 
-            for (var j = 0; j < data.RequiredWood; j++)
+            for (var j = 0; j < this.Properties.requiredWood; j++)
             {
                 var wood = data.Inventory.Get<Wood>().FirstOrDefault();
                 data.Inventory.Remove(wood);
                 this.instanceHandler.QueueForDestroy(wood);
             }
         }
-
-        private int GetRequiredWood()
-        {
-            return this.Config.Conditions.FirstOrDefault(x => x.WorldKey.Name == "IsHolding<Wood>")!.Amount;
-        }
-
-        private int GetRequiredIron()
-        {
-            return this.Config.Conditions.FirstOrDefault(x => x.WorldKey.Name == "IsHolding<Iron>")!.Amount;
-        }
 
         private Vector3 GetRandomPosition(IMonoAgent agent)
         {
@@ -92,22 +82,20 @@ private Vector3 GetRandomPosition(IMonoAgent agent)
             return agent.transform.position + new Vector3(pos.x, 0f, pos.y);
         }
 
+        [Serializable]
+        public class Props : IActionProperties
+        {
+            public int requiredWood;
+            public int requiredIron;
+        }
+
         public class Data : IActionData
         {
             public ITarget Target { get; set; }
-            public int RequiredWood { get; set; }
-            public int RequiredIron { get; set; }
-            public State State { get; set; } = State.NotStarted;
-            public float Timer { get; set; }
+            public IActionRunState WaitState { get; set; }
 
             [GetComponent]
             public ComplexInventoryBehaviour Inventory { get; set; }
         }
-
-        public enum State
-        {
-            NotStarted,
-            Started
-        }
     }
 }

Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Actions/EatAction.cs

@@ -1,25 +1,23 @@
 using System.Linq;
-using CrashKonijn.Goap.Behaviours;
-using CrashKonijn.Goap.Classes;
-using CrashKonijn.Goap.Classes.References;
-using CrashKonijn.Goap.Enums;
-using CrashKonijn.Goap.Interfaces;
-using Demos.Complex.Behaviours;
-using Demos.Complex.Goap;
-using Demos.Complex.Interfaces;
-using Demos.Shared.Behaviours;
+using CrashKonijn.Agent.Core;
+using CrashKonijn.Agent.Runtime;
+using CrashKonijn.Goap.Demos.Complex.Behaviours;
+using CrashKonijn.Goap.Demos.Complex.Goap;
+using CrashKonijn.Goap.Demos.Complex.Interfaces;
+using CrashKonijn.Goap.Runtime;
+using UnityEngine;
 
-namespace Demos.Complex.Actions
+namespace CrashKonijn.Goap.Demos.Complex.Actions
 {
-    public class EatAction : ActionBase<EatAction.Data>, IInjectable
+    public class EatAction : GoapActionBase<EatAction.Data>, IInjectable
     {
         private InstanceHandler instanceHandler;
 
         public void Inject(GoapInjector injector)
         {
             this.instanceHandler = injector.instanceHandler;
         }
-
+        
         public override void Created()
         {
         }
@@ -30,28 +28,30 @@ public override void Start(IMonoAgent agent, Data data)
             data.Inventory.Hold(data.Eatable);
         }
 
-        public override ActionRunState Perform(IMonoAgent agent, Data data, ActionContext context)
+        public override bool IsValid(IActionReceiver agent, Data data)
         {
             if (data.Eatable == null)
-                return ActionRunState.Stop;
+                return false;
 
+            return true;
+        }
+
+        public override IActionRunState Perform(IMonoAgent agent, Data data, IActionContext context)
+        {
             var eatNutrition = context.DeltaTime * 20f;
             data.Eatable.NutritionValue -= eatNutrition;
-            data.Hunger.hunger -= eatNutrition;
+            data.ComplexHunger.hunger -= eatNutrition;
 
-            if (data.Hunger.hunger <= 20f)
-                return ActionRunState.Stop;
+            if (data.ComplexHunger.hunger <= 20f)
+                return ActionRunState.Completed;
 
             if (data.Eatable.NutritionValue > 0)
                 return ActionRunState.Continue;
-
-            if (data.Eatable == null)
-                return ActionRunState.Stop;
 
             data.Inventory.Remove(data.Eatable);
             this.instanceHandler.QueueForDestroy(data.Eatable);
 
-            return ActionRunState.Stop;
+            return ActionRunState.Completed;
         }
 
         public override void End(IMonoAgent agent, Data data)
@@ -62,7 +62,7 @@ public override void End(IMonoAgent agent, Data data)
             if (data.Eatable.NutritionValue > 0)
                 data.Inventory.Add(data.Eatable);
         }
-        
+
         public class Data : IActionData
         {
             public ITarget Target { get; set; }
@@ -72,7 +72,7 @@ public class Data : IActionData
             public ComplexInventoryBehaviour Inventory { get; set; }
 
             [GetComponent]
-            public HungerBehaviour Hunger { get; set; }
+            public ComplexHungerBehaviour ComplexHunger { get; set; }
         }
     }
 }

Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Actions/GatherItemAction.cs

@@ -1,16 +1,16 @@
-using CrashKonijn.Goap.Behaviours;
-using CrashKonijn.Goap.Classes;
-using CrashKonijn.Goap.Classes.References;
-using CrashKonijn.Goap.Enums;
-using CrashKonijn.Goap.Interfaces;
-using Demos.Complex.Behaviours;
-using Demos.Complex.Goap;
-using Demos.Complex.Interfaces;
+using System;
+using CrashKonijn.Agent.Core;
+using CrashKonijn.Agent.Runtime;
+using CrashKonijn.Goap.Demos.Complex.Behaviours;
+using CrashKonijn.Goap.Demos.Complex.Goap;
+using CrashKonijn.Goap.Demos.Complex.Interfaces;
+using CrashKonijn.Goap.Runtime;
 using UnityEngine;
+using Random = UnityEngine.Random;
 
-namespace Demos.Complex.Actions
+namespace CrashKonijn.Goap.Demos.Complex.Actions
 {
-    public class GatherItemAction<TGatherable> : ActionBase<GatherItemAction<TGatherable>.Data>, IInjectable
+    public class GatherItemAction<TGatherable> : GoapActionBase<GatherItemAction<TGatherable>.Data, GatherItemAction<TGatherable>.Props>, IInjectable
         where TGatherable : ItemBase
     {
         private ItemFactory itemFactory;
@@ -27,40 +27,51 @@ public override void Created()
         public override void Start(IMonoAgent agent, Data data)
         {
             // There is a normal and slow version of this action
-            // based on whether or not the agent is holding an (pick)axe
-            // We use the cost as a timer
-            data.Timer = this.Config.BaseCost;
+            // based on whether  the agent is holding a (pick)axe
+            data.WaitState = ActionRunState.Wait(this.Properties.timer);
         }
 
-        public override ActionRunState Perform(IMonoAgent agent, Data data, ActionContext context)
+        public override IActionRunState Perform(IMonoAgent agent, Data data, IActionContext context)
         {
-            data.Timer -= context.DeltaTime;
-
-            if (data.Timer > 0)
-                return ActionRunState.Continue;
+            if (data.WaitState.IsRunning())
+                return data.WaitState;
 
             var item = this.itemFactory.Instantiate<TGatherable>();
+
             item.transform.position = this.GetRandomPosition(agent);
 
+            if (this.Properties.pickupItem)
+                data.Inventory.Add(item);
+
             return ActionRunState.Stop;
         }
 
-        public override void End(IMonoAgent agent, Data data)
+        public override void Stop(IMonoAgent agent, Data data)
         {
         }
-
+
+        public override void Complete(IMonoAgent agent, Data data)
+        {
+        }
+
         private Vector3 GetRandomPosition(IMonoAgent agent)
         {
             var pos = Random.insideUnitCircle.normalized * Random.Range(1f, 2f);
 
             return agent.transform.position + new Vector3(pos.x, 0f, pos.y);
         }
 
+        [Serializable]
+        public class Props : IActionProperties
+        {
+            public bool pickupItem = false;
+            public float timer = 3f;
+        }
+
         public class Data : IActionData
         {
             public ITarget Target { get; set; }
-            public float Timer { get; set; }
-
+            public IActionRunState WaitState { get; set; }
             [GetComponent]
             public ComplexInventoryBehaviour Inventory { get; set; }
         }