v0.19.8.0

2022-09-28 21:30:52 -03:00
parent fec8131243
commit 3ca584f2fc
152 changed files with 1931 additions and 1071 deletions
@@ -223,26 +223,26 @@ namespace Barotrauma
                    break;
            }
        }
-        
-        public override void End()
+
+        protected override bool DetermineCompleted()
+        {
+            return state > 0;
+        }
+
+        protected override void EndMissionSpecific(bool completed)
        {
            tempSonarPositions.Clear();
            monsters.Clear();
-            if (State < 1) { return; }
-
-            if (Prefab.LocationTypeChangeOnCompleted != null)
+            if (completed)
            {
-                ChangeLocationType(Prefab.LocationTypeChangeOnCompleted);
-            }
-            GiveReward();
-            completed = true;
-            if (level?.LevelData != null && Prefab.Tags.Any(t => t.Equals("huntinggrounds", StringComparison.OrdinalIgnoreCase)))
-            {
-                level.LevelData.HasHuntingGrounds = false;
+                if (level?.LevelData != null && Prefab.Tags.Contains("huntinggrounds"))
+                {
+                    level.LevelData.HasHuntingGrounds = false;
+                }
            }
        }

-        public bool IsEliminated(Character enemy) =>
+        public static bool IsEliminated(Character enemy) =>
            enemy == null ||
            enemy.Removed || 
            enemy.IsDead ||