Unstable 0.1300.0.9

2021-04-13 16:58:13 +03:00
parent 86597456ca
commit f48dfb5862
30 changed files with 245 additions and 57 deletions
@@ -12,7 +12,7 @@ namespace Barotrauma
 {
    class CharacterHUD
    {        
-        const float BossHealthBarDuration = 1200.0f;
+        const float BossHealthBarDuration = 120.0f;

        class BossHealthBar
        {
@@ -615,10 +615,6 @@ namespace Barotrauma
                {
                    bossHealthBar.FadeTimer = Math.Min(bossHealthBar.FadeTimer, 5.0f);
                }
-                else if (bossHealthBar.Character.AIController is EnemyAIController enemyAI && !enemyAI.IsTargetingPlayerTeam)
-                {
-                    bossHealthBar.FadeTimer = Math.Min(bossHealthBar.FadeTimer, 60.0f);
-                }
                bossHealthBar.FadeTimer -= deltaTime;
            }

@@ -3198,10 +3198,10 @@ namespace Barotrauma
            return characters.Where(c => Character.Controlled == null || ((includeSelf || c != Character.Controlled) && c.TeamID == Character.Controlled.TeamID)).Union(GetOrderableFriendlyNPCs())
                    // 1. Prioritize those who are on the same submarine than the controlled character
                    .OrderByDescending(c => Character.Controlled == null || c.Submarine == Character.Controlled.Submarine)
-                    // 2. Prioritize those who are already ordered to operate the item target of the new 'operate' order, or given the same maintenance order as now issued
+                    // 2. Prioritize those who have been given the same maintenance or operate order as now issued
                    .ThenByDescending(c => c.CurrentOrders.Any(o =>
                        o.Order != null && o.Order.Identifier == order.Identifier &&
-                        (order.Category == OrderCategory.Maintenance || (order.Category == OrderCategory.Operate && o.Order.TargetSpatialEntity == order.TargetSpatialEntity))))
+                        (order.Category == OrderCategory.Maintenance || order.Category == OrderCategory.Operate)))
                    // 3. Prioritize those with the appropriate job for the order
                    .ThenByDescending(c => order.HasAppropriateJob(c))
                    // 4. Prioritize bots over player controlled characters
@@ -113,14 +113,16 @@ namespace Barotrauma
        public static void OnSetSelectedConstruction(Character character, Item oldConstruction, Item newConstruction)
        {
            if (oldConstruction == newConstruction) { return; }
+
            if (Character.Controlled != null && Character.Controlled == character && oldConstruction != null && oldConstruction.GetComponent<Ladder>() == null)
            {
                TimeStoppedInteracting = Timing.TotalTime;
            }
-            if (newConstruction != null && newConstruction.GetComponent<Ladder>() == null)
-            {
-                OnStartedInteracting(character, newConstruction);
-            }
+
+            if (newConstruction == null) { return; }
+            if (newConstruction.GetComponent<Ladder>() != null) { return; }
+            if (newConstruction.GetComponent<ConnectionPanel>() is ConnectionPanel cp && cp.User == character) { return; }
+            OnStartedInteracting(character, newConstruction);
        }

        private static void OnStartedInteracting(Character character, Item item)
@@ -136,6 +138,9 @@ namespace Barotrauma
                if (DisplayHint($"{hintIdentifierBase}.brokenitem")) { return; }
            }

+            // Don't display other item-related hints if the repair interface is displayed
+            if (item.Repairables.Any(r => r.ShouldDrawHUD(character))) { return; }
+
            // onstartedinteracting.lootingisstealing
            if (item.Submarine?.Info?.Type == SubmarineType.Outpost &&
                item.ContainedItems.Any(i => !i.AllowStealing))
@@ -183,7 +183,8 @@ namespace Barotrauma

            //reputation panel -------------------------------------------------------------------------------

-            if (gameMode is CampaignMode campaignMode)
+            var campaignMode = gameMode as CampaignMode;
+            if (campaignMode != null)
            {
                GUIFrame reputationframe = new GUIFrame(new RectTransform(crewFrame.RectTransform.RelativeSize, background.RectTransform, Anchor.TopCenter, minSize: crewFrame.RectTransform.MinSize));
                rightPanels.Add(reputationframe);
@@ -217,7 +218,14 @@ namespace Barotrauma
            };

            List<Mission> missionsToDisplay = new List<Mission>(selectedMissions);
-            if (!selectedMissions.Any() && startLocation?.SelectedMission != null) { missionsToDisplay.Add(startLocation.SelectedMission); }
+            if (!selectedMissions.Any() && startLocation?.SelectedMission != null) 
+            { 
+                if (startLocation.SelectedMission.Locations[0] == startLocation.SelectedMission.Locations[1] ||
+                    startLocation.SelectedMission.Locations.Contains(campaignMode?.Map.SelectedLocation))
+                {
+                    missionsToDisplay.Add(startLocation.SelectedMission);
+                }
+            }

            if (missionsToDisplay.Any())
            {
@@ -461,6 +469,7 @@ namespace Barotrauma
                                new string[] { Reputation.GetFormattedReputationText(normalizedUnlockReputation, unlockEvent.UnlockPathReputation, addColorTags: true), $"‖color:gui.orange‖{connection.LevelData.Biome.DisplayName}‖end‖" });
                            var unlockInfoPanel = new GUITextBlock(new RectTransform(new Vector2(0.8f, 0.0f), reputationFrame.RectTransform, Anchor.BottomCenter) { MinSize = new Point(0, GUI.IntScale(30)), AbsoluteOffset = new Point(0, GUI.IntScale(3)) },
                                unlockText, style: "GUIButtonRound", textAlignment: Alignment.Center, textColor: GUI.Style.TextColor, parseRichText: true);
+                            unlockInfoPanel.Color = Color.Lerp(unlockInfoPanel.Color, Color.Black, 0.8f);
                            if (unlockInfoPanel.TextSize.X > unlockInfoPanel.Rect.Width * 0.7f)
                            {
                                unlockInfoPanel.Font = GUI.SmallFont;
@@ -1334,6 +1334,11 @@ namespace Barotrauma
                OnSelected = (tickBox) =>
                {
                    DisableInGameHints = tickBox.Selected;
+                    if (!DisableInGameHints && GameMain.Config?.IgnoredHints != null)
+                    {
+                        // Reset the ignored hints when the hints are re-enabled (to-be-replaced by a separate button)
+                        GameMain.Config.IgnoredHints.Clear();
+                    }
                    UnsavedSettings = true;
                    return true;
                }
@@ -705,11 +705,12 @@ namespace Barotrauma.Items.Components
                    if (c.Params.HideInSonar) { continue; }

                    if (!c.IsUnconscious && c.Params.DistantSonarRange > 0.0f &&
-                        c.AIController is EnemyAIController enemyAI && enemyAI.IsTargetingPlayerTeam &&
                        ((c.WorldPosition - transducerCenter) * displayScale).LengthSquared() > DisplayRadius * DisplayRadius)
                    {
-                        float dist = Vector2.Distance(c.WorldPosition, transducerCenter);
-                        Vector2 targetDir = (c.WorldPosition - transducerCenter) / dist;
+                        Vector2 targetVector = c.WorldPosition - transducerCenter;
+                        if (targetVector.LengthSquared() > MathUtils.Pow2(c.Params.DistantSonarRange)) { continue; }
+                        float dist = targetVector.Length();
+                        Vector2 targetDir = targetVector / dist;
                        int blipCount = (int)MathHelper.Clamp(c.Mass, 50, 200);
                        for (int i = 0; i < blipCount; i++)
                        {
@@ -70,6 +70,8 @@ namespace Barotrauma
        private List<RichTextData> tooltipRichTextData;
        private string prevTooltip;

+        private (SubmarineInfo pendingSub, float realWorldCrushDepth) pendingSubInfo;
+
        /*private (Rectangle targetArea, string tip)? connectionTooltip;
        private string sanitizedConnectionTooltip;
        private List<RichTextData> connectionTooltipRichTextData;
@@ -855,7 +857,21 @@ namespace Barotrauma
                if (connection.LevelData.HasHuntingGrounds) { iconCount++; }
                if (connection.Locked) { iconCount++; }
                string tooltip = null;
-                var subCrushDepth = Submarine.MainSub?.RealWorldCrushDepth ?? Level.DefaultRealWorldCrushDepth;
+                float subCrushDepth = Level.DefaultRealWorldCrushDepth;
+                var currentOrPendingSub = SubmarineSelection.CurrentOrPendingSubmarine();
+                if (Submarine.MainSub != null && Submarine.MainSub.Info == currentOrPendingSub)
+                {
+                    subCrushDepth = Submarine.MainSub.RealWorldCrushDepth;
+                }
+                else if (currentOrPendingSub != null)
+                {
+                    if (pendingSubInfo.pendingSub != currentOrPendingSub)
+                    {
+                        // Store the real world crush depth for the pending sub so that we don't have to calculate it again every time
+                        pendingSubInfo = (currentOrPendingSub, currentOrPendingSub.GetRealWorldCrushDepth());
+                    }
+                    subCrushDepth = pendingSubInfo.realWorldCrushDepth;
+                }
                if (GameMain.GameSession?.Campaign?.UpgradeManager != null)
                {
                    var hullUpgradePrefab =  UpgradePrefab.Find("increasewallhealth");
@@ -6,7 +6,7 @@
    <RootNamespace>Barotrauma</RootNamespace>
    <Authors>FakeFish, Undertow Games</Authors>
    <Product>Barotrauma</Product>
-    <Version>0.1300.0.8</Version>
+    <Version>0.1300.0.9</Version>
    <Copyright>Copyright © FakeFish 2018-2020</Copyright>
    <Platforms>AnyCPU;x64</Platforms>
    <AssemblyName>Barotrauma</AssemblyName>
@@ -6,7 +6,7 @@
    <RootNamespace>Barotrauma</RootNamespace>
    <Authors>FakeFish, Undertow Games</Authors>
    <Product>Barotrauma</Product>
-    <Version>0.1300.0.8</Version>
+    <Version>0.1300.0.9</Version>
    <Copyright>Copyright © FakeFish 2018-2020</Copyright>
    <Platforms>AnyCPU;x64</Platforms>
    <AssemblyName>Barotrauma</AssemblyName>
@@ -6,7 +6,7 @@
    <RootNamespace>Barotrauma</RootNamespace>
    <Authors>FakeFish, Undertow Games</Authors>
    <Product>Barotrauma</Product>
-    <Version>0.1300.0.8</Version>
+    <Version>0.1300.0.9</Version>
    <Copyright>Copyright © FakeFish 2018-2020</Copyright>
    <Platforms>AnyCPU;x64</Platforms>
    <AssemblyName>Barotrauma</AssemblyName>