Unstable 0.17.4.0

2022-03-30 00:08:09 +09:00
parent 2968e23ae8
commit c1b8e5a341
177 changed files with 3388 additions and 1977 deletions
@@ -112,6 +112,13 @@ namespace Barotrauma
                }
                foreach (FireSource fs in targetHull.FireSources)
                {
+                    if (fs == null) { continue; }
+                    if (fs.Removed) { continue; }
+                    if (character.CurrentHull == null)
+                    {
+                        Abandon = true;
+                        break;
+                    }
                    float xDist = Math.Abs(character.WorldPosition.X - fs.WorldPosition.X) - fs.DamageRange;
                    float yDist = Math.Abs(character.WorldPosition.Y - fs.WorldPosition.Y);
                    bool inRange = xDist + yDist < extinguisher.Range;
@@ -153,7 +160,7 @@ namespace Barotrauma
                                onAbandon: () =>  Abandon = true, 
                                onCompleted: () => RemoveSubObjective(ref gotoObjective)))
                        {
-                            gotoObjective.requiredCondition = () => targetHull == null || character.CanSeeTarget(targetHull);
+                            gotoObjective.requiredCondition = () => character.CanSeeTarget(targetHull);
                        }
                    }
                    else
@@ -164,7 +164,7 @@ namespace Barotrauma
                    TargetName = Leak.FlowTargetHull?.DisplayName,
                    requiredCondition = () => 
                        Leak.Submarine == character.Submarine &&
-                        (Leak.FlowTargetHull != null && character.CurrentHull == Leak.FlowTargetHull || character.CanSeeTarget(Leak)),
+                        Leak.linkedTo.Any(e => e is Hull h && character.CurrentHull == h),
                    // The Go To objective can be abandoned if the leak is fixed (in which case we don't want to use the dialogue)
                    SpeakCannotReachCondition = () => !CheckObjectiveSpecific()
                },