aeafa16...4d3cf73

2019-03-18 22:57:05 +02:00
parent 3301bed442
commit 23687fbf2f
77 changed files with 2275 additions and 717 deletions
@@ -35,7 +35,7 @@ namespace Barotrauma
            float damagePriority = MathHelper.Lerp(1, 0, (Item.Condition + 10) / Item.MaxCondition);
            float successFactor = MathHelper.Lerp(0, 1, Item.Repairables.Average(r => r.DegreeOfSuccess(character)));
            float isSelected = character.SelectedConstruction == Item ? 50 : 0;
-            float baseLevel = Math.Max(priority + isSelected, 1);
+            float baseLevel = Math.Max(Priority + isSelected, 1);
            return MathHelper.Clamp(baseLevel * damagePriority * distanceFactor * successFactor, 0, 100);
        }

@@ -84,6 +84,7 @@ namespace Barotrauma
            }
            if (character.CanInteractWith(Item))
            {
+                OperateRepairTool(deltaTime);
                foreach (Repairable repairable in Item.Repairables)
                {
                    if (repairable.CurrentFixer != null && repairable.CurrentFixer != character)
@@ -123,5 +124,33 @@ namespace Barotrauma
                AddSubObjective(goToObjective);
            }
        }
+
+        private void OperateRepairTool(float deltaTime)
+        {
+            // Operate repair tool, if required.
+            foreach (Repairable repairable in Item.Repairables)
+            {
+                foreach (var kvp in repairable.requiredItems)
+                {
+                    foreach (RelatedItem requiredItem in kvp.Value)
+                    {
+                        foreach (var item in character.Inventory.Items)
+                        {
+                            if (requiredItem.MatchesItem(item))
+                            {
+                                var repairTool = item.GetComponent<RepairTool>();
+                                if (repairTool != null)
+                                {
+                                    character.CursorPosition = Item.Position;
+                                    character.SetInput(InputType.Aim, false, true);
+                                    repairTool.Use(deltaTime, character);
+                                    return;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
    }
 }