Merge pull request #370 from crashkonijn/feature/value-condition

Feature: Dynamic conditions (code only)

Author: crashkonijn

Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Factories/Capabilities/HungerCapability.cs

@@ -28,7 +28,7 @@ public override ICapabilityConfig Create()
                 .SetTarget<TransformTarget>()
                 .AddEffect<Hunger>(EffectType.Decrease)
                 .AddCondition<IsHolding<IEatable>>(Comparison.GreaterThanOrEqual, 1)
-                .AddCondition<Hunger>(Comparison.GreaterThanOrEqual, 30)
+                .AddCondition<Hunger, LowHunger>(Comparison.GreaterThanOrEqual)
                 .SetValidateConditions(false); // We don't need to validate conditions for this action, or it will stop when becoming below 80 hunger
 
             builder.AddAction<GatherItemAction<Apple>>()
@@ -50,6 +50,8 @@ public override ICapabilityConfig Create()
             builder.AddIsHoldingSensor<IEatable>();
             builder.AddWorldSensor<HungerSensor>()
                 .SetKey<Hunger>();
+            builder.AddWorldSensor<LowHungerSensor>()
+                .SetKey<LowHunger>();
 
             // Multi sensor
             builder.AddMultiSensor<ItemSensor<IEatable>>();

Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Sensors/World/LowHungerSensor.cs

@@ -0,0 +1,24 @@
+using CrashKonijn.Agent.Core;
+using CrashKonijn.Goap.Core;
+using CrashKonijn.Goap.Runtime;
+
+namespace CrashKonijn.Goap.Demos.Complex.Sensors.World
+{
+    public class LowHungerSensor : LocalWorldSensorBase
+    {
+        public override ISensorTimer Timer { get; } = SensorTimer.Once;
+
+        public override void Created()
+        {
+        }
+
+        public override void Update()
+        {
+        }
+
+        public override SenseValue Sense(IActionReceiver agent, IComponentReference references)
+        {
+            return  30;
+        }
+    }
+}

Demo/Assets/CrashKonijn/GOAP/Demos/Complex/Sensors/World/LowHungerSensor.cs.meta

@@ -0,0 +1,8 @@
+using CrashKonijn.Goap.Runtime;
+
+namespace CrashKonijn.Goap.Demos.Complex.WorldKeys
+{
+    public class LowHunger : WorldKeyBase
+    {
+    }
+}

Demo/Assets/CrashKonijn/GOAP/Demos/Complex/WorldKeys/LowHunger.cs

@@ -76,6 +76,16 @@ namespace CrashKonijn.Docs.GettingStarted.Capabilities
 ```
 {% endcode %}
 
+### Dynamic Conditions
+Since v3.1 you can now add dynamic conditions!
+
+{% code lineNumbers="true" %}
+```csharp
+builder.AddAction<EatAction>()
+    .AddCondition<Hunger, LowHunger>(Comparison.GreaterThanOrEqual);
+```
+{% endcode %}
+
 ### Callbacks
 In v3 you can add a callback to your builder methods, giving you access to the instance of each class. This allows you to set extra data.
 

Demo/Assets/CrashKonijn/GOAP/Demos/Complex/WorldKeys/LowHunger.cs.meta

@@ -30,6 +30,13 @@ public interface IGoapInjector
 
 ## New Features
 
+### You can now make dynamic conditions (code only)!
+
+```csharp
+builder.AddAction<EatAction>()
+    .AddCondition<Hunger, LowHunger>(Comparison.GreaterThanOrEqual);
+```
+
 ### AgenTypeFactory and CapabilityFactory can now be injected
 You can now inject into `AgentTypeFactoryBase` and `CapabilityFactoryBase` classes, similar to other actions, goals and sensors.
 

Package/Documentation/Config/Code.md

@@ -33,5 +33,13 @@ public static float GetCost(this INode node, IGoapActionProvider provider)
 
             return 0;
         }
+
+        public static int GetAmount(this ICondition condition)
+        {
+            if (condition is IValueCondition serializableCondition)
+                return serializableCondition.Amount;
+
+            return 0;
+        }
     }
 }

Package/Documentation/upgrade/upgrade-guide-3.0-3.1.md

@@ -62,7 +62,28 @@ private string GetText(ICondition condition)
         {
             var suffix = this.GetSuffix(condition);
 
-            return $"{condition.WorldKey.Name} {this.GetText(condition.Comparison)} {condition.Amount} {suffix}";
+            return $"{condition.WorldKey.Name} {this.GetText(condition.Comparison)} {GetValueText(condition)} {suffix}";
+        }
+
+        private string GetValueText(ICondition condition)
+        {
+            if (condition is IValueCondition valueCondition)
+                return valueCondition.Amount.ToString();
+            
+            if (condition is IReferenceCondition referenceCondition)
+            {
+                if (!Application.isPlaying)
+                    return referenceCondition.ValueKey.Name;
+            
+                if (this.values.SelectedObject is not IMonoGoapActionProvider agent)
+                    return referenceCondition.ValueKey.Name;
+                
+                var (exists, value) = agent.WorldData.GetWorldValue(referenceCondition.ValueKey);
+                
+                return $"{value} ({referenceCondition.ValueKey.Name})";
+            }
+            
+            return "";
         }
 
         private string GetSuffix(ICondition condition)

Package/Editor/CrashKonijn.Goap.Editor/Extensions.cs

@@ -125,7 +125,7 @@ private void Upgrade(CapabilityConfigScriptable capabilityScriptable)
                             Name = x.WorldKey.Name
                         },
                         comparison = x.Comparison,
-                        amount = x.Amount
+                        amount = x.GetAmount()
                     }).ToList()
                 });
             }
@@ -152,7 +152,7 @@ private void Upgrade(CapabilityConfigScriptable capabilityScriptable)
                             Name = x.WorldKey.Name
                         },
                         comparison = x.Comparison,
-                        amount = x.Amount
+                        amount = x.GetAmount()
                     }).ToList(),
                     effects = actionConfig.Effects.Select(x => new CapabilityEffect
                     {