Merge pull request #627 from lionaneesh/dev

Fix the bug when player is stuck looting a dead body and can get beaten to death meanwhile
Xian55 · Dec 2, 2024 · 25a63cf · 25a63cf
2 parents 08b6372 + 4e50e45
commit 25a63cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/Core/Goals/ConsumeCorpseGoal.cs b/Core/Goals/ConsumeCorpseGoal.cs
@@ -23,11 +23,9 @@ public ConsumeCorpseGoal(ILogger<ConsumeCorpseGoal> logger,
         {
             AddPrecondition(GoapKey.consumablecorpsenearby, true);
         }
-        else
-        {
-            AddPrecondition(GoapKey.damagedone, false);
-            AddPrecondition(GoapKey.damagetaken, false);
-        }
+        AddPrecondition(GoapKey.pulled, false);
+        AddPrecondition(GoapKey.dangercombat, false);
+        AddPrecondition(GoapKey.incombat, false);
 
         AddPrecondition(GoapKey.producedcorpse, true);
         AddPrecondition(GoapKey.consumecorpse, false);

diff --git a/Core/Goals/CorpseConsumedGoal.cs b/Core/Goals/CorpseConsumedGoal.cs
@@ -30,11 +30,9 @@ public CorpseConsumedGoal(ILogger<CorpseConsumedGoal> logger,
         {
             AddPrecondition(GoapKey.consumablecorpsenearby, true);
         }
-        else
-        {
-            AddPrecondition(GoapKey.damagedone, false);
-            AddPrecondition(GoapKey.damagetaken, false);
-        }
+        AddPrecondition(GoapKey.pulled, false);
+        AddPrecondition(GoapKey.dangercombat, false);
+        AddPrecondition(GoapKey.incombat, false);
 
         AddPrecondition(GoapKey.consumecorpse, true);
 
@@ -70,4 +68,4 @@ public override void OnEnter()
         Level = LogLevel.Information,
         Message = "Total: {total} | Remaining: {remains}")]
     static partial void LogConsumed(ILogger logger, int total, int remains);
-}
+}