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
@@ -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;