Release 1.9.7.0 - Summer Update 2025

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCWaitAction.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -14,7 +14,10 @@ namespace Barotrauma
 
         [Serialize(true, IsPropertySaveable.Yes, description: "Should the NPC start or stop waiting?")]
         public bool Wait { get; set; }
-        
+
+        [Serialize(true, IsPropertySaveable.Yes, description: "The event actions reset when a GoTo action makes the event jump to a different point. Should the NPC stop waiting when the event resets?")]
+        public bool AbandonOnReset { get; set; }
+
         [Serialize(AIObjectiveManager.MaxObjectivePriority, IsPropertySaveable.Yes, description: "AI priority for the action. Uses 100 by default, which is the absolute maximum for any objectives, " +
                                                                                                  "meaning nothing can be prioritized over it, including the emergency objectives, such as find safety and combat." +
                                                                                                  "Setting the priority to 70 would function like a regular order, but with the highest priority." +
@@ -76,7 +79,7 @@ namespace Barotrauma
 
         public override void Reset()
         {
-            if (affectedNpcs != null)
+            if (affectedNpcs != null && AbandonOnReset)
             {
                 foreach (var npc in affectedNpcs)
                 {