[FSMExample] Removed useless parameters in AddResourceToBankAction

luxkun · Dec 18, 2016 · bfabfca · bfabfca
1 parent 98b01c8
commit bfabfca
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/Unity/FSMExample/Actions/AddResourceToBankAction.cs b/Unity/FSMExample/Actions/AddResourceToBankAction.cs
@@ -17,6 +17,9 @@ public override void Precalculations(IReGoapAgent goapAgent, ReGoapState goalSta
     {
         base.Precalculations(goapAgent, goalState);
         var bankPosition = agent.GetMemory().GetWorldState().Get<Vector3>("nearestBankPosition");
+
+        preconditions.Clear();
+        effects.Clear();
         preconditions.Set("isAtPosition", bankPosition);
         effects.Set("isAtPosition", Vector3.zero);
 
@@ -28,13 +31,9 @@ public override void Precalculations(IReGoapAgent goapAgent, ReGoapState goalSta
                 preconditions.Set("hasResource" + resourceName, true);
                 preconditions.Set("collectedResource" + resourceName, false);
                 effects.Set("collectedResource" + resourceName, true);
-                var resourcePosition =
-                    agent.GetMemory().GetWorldState().Get<Vector3>(string.Format("nearest{0}Position", resourceName));
-                var resource = agent.GetMemory().GetWorldState().Get<IResource>("nearest" + resourcePosition);
                 settings = new AddResourceToBankSettings
                 {
-                    Resource = resource, 
-                    ResourcePosition = resourcePosition
+                    ResourceName = resourceName
                 };
                 break;
             }
@@ -47,7 +46,7 @@ public override void Run(IReGoapAction previous, IReGoapAction next, IReGoapActi
         base.Run(previous, next, settings, goalState, done, fail);
         this.settings = (AddResourceToBankSettings) settings;
         var bank = agent.GetMemory().GetWorldState().Get<Bank>("nearestBank");
-        if (bank.AddResource(resourcesBag, ((AddResourceToBankSettings) settings).Resource.GetName()))
+        if (bank.AddResource(resourcesBag, ((AddResourceToBankSettings) settings).ResourceName))
         {
             done(this);
         }
@@ -65,6 +64,5 @@ public override string ToString()
 
 public class AddResourceToBankSettings : IReGoapActionSettings
 {
-    public IResource Resource;
-    public Vector3 ResourcePosition;
+    public string ResourceName;
 }