From 268389a128c2dd5fc9a9058e19f6bf6b111f56b2 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Thu, 16 May 2019 05:26:09 +0300 Subject: [PATCH] (c5e44ed94) Take access into account before accepting a path. Fixes bots trying to reach places where they have no access to (#1351). --- .../Source/Characters/Animation/Ragdoll.cs | 26 + .../Source/GameSession/CrewManager.cs | 247 +------ .../Source/Screens/CampaignSetupUI.cs | 2 + .../Characters/AI/IndoorsSteeringManager.cs | 33 + .../Objectives/AIObjectiveExtinguishFire.cs | 7 +- .../AI/Objectives/AIObjectiveFindSafety.cs | 1 + .../AI/Objectives/AIObjectiveGoTo.cs | 37 +- .../AI/Objectives/AIObjectiveIdle.cs | 6 +- .../Components/Machines/Deconstructor.cs | 19 + .../Items/Components/Machines/Steering.cs | 27 + .../BarotraumaShared/Source/Items/Item.cs | 4 + .../BarotraumaShared/Source/Map/Hull.cs | 614 +----------------- .../BarotraumaShared/Source/PlayerInput.cs | 15 + 13 files changed, 190 insertions(+), 848 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs index 8f9276859..bcf133b30 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs @@ -152,6 +152,32 @@ namespace Barotrauma } + if (character.MemLocalState.Count > 120) character.MemLocalState.RemoveRange(0, character.MemLocalState.Count - 120); + character.MemState.Clear(); + } + } + + partial void ImpactProjSpecific(float impact, Body body) + { + float volume = MathHelper.Clamp(impact - 3.0f, 0.5f, 1.0f); + + if (body.UserData is Limb limb && character.Stun <= 0f) + { + if (impact > 3.0f) { PlayImpactSound(limb); } + } + else if (body.UserData is Limb || body == Collider.FarseerBody) + { + if (!character.IsRemotePlayer && impact > ImpactTolerance) + { + SoundPlayer.PlayDamageSound("LimbBlunt", strongestImpact, Collider); + } + } + if (Character.Controlled == character) + { + GameMain.GameScreen.Cam.Shake = Math.Min(Math.Max(strongestImpact, GameMain.GameScreen.Cam.Shake), 3.0f); + } + } + if (character.MemState.Count < 1) return; overrideTargetMovement = Vector2.Zero; diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs index c888d06cd..5300dbd54 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs @@ -74,17 +74,12 @@ namespace Barotrauma public CrewManager(XElement element, bool isSinglePlayer) : this(isSinglePlayer) { - if (GameMain.Client != null) + if (!isSinglePlayer) { - //let the server create random conversations in MP + DebugConsole.ThrowError("Cannot add messages to single player chat box in multiplayer mode!\n" + Environment.StackTrace); return; } - List availableSpeakers = Character.CharacterList.FindAll(c => - c.AIController is HumanAIController && - !c.IsDead && - c.SpeechImpediment <= 100.0f); - pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers)); - } + if (string.IsNullOrEmpty(text)) { return; } var characterInfo = new CharacterInfo(subElement); characterInfos.Add(characterInfo); @@ -95,6 +90,7 @@ namespace Barotrauma break; } } + ChatBox.AddMessage(ChatMessage.Create(senderName, text, messageType, sender)); } partial void InitProjectSpecific() @@ -242,24 +238,27 @@ namespace Barotrauma public IEnumerable GetCharacters() { - if (characterInfos.Contains(characterInfo)) - { - DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace); - return; - } + if (character?.Inventory == null) return null; - characterInfos.Add(characterInfo); + var radioItem = character.Inventory.Items.FirstOrDefault(it => it != null && it.GetComponent() != null); + if (radioItem == null) return null; + if (requireEquipped && !character.HasEquippedItem(radioItem)) return null; + + return radioItem.GetComponent(); } public IEnumerable GetCharacterInfos() { - if (character == null) + if (GameMain.Client != null) { - DebugConsole.ThrowError("Tried to remove a null character from CrewManager.\n" + Environment.StackTrace); + //let the server create random conversations in MP return; } - characters.Remove(character); - if (removeInfo) characterInfos.Remove(character.Info); + List availableSpeakers = Character.CharacterList.FindAll(c => + c.AIController is HumanAIController && + !c.IsDead && + c.SpeechImpediment <= 100.0f); + pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers)); } public void AddCharacter(Character character) @@ -633,183 +632,9 @@ namespace Barotrauma { characterListBox.BarScroll = roundedPos; } - var characterArea = new GUIButton(new RectTransform(new Point(characterInfoWidth, frame.Rect.Height), frame.RectTransform, Anchor.CenterLeft), style: "GUITextBox") - { - UserData = character, - Color = frame.Color, - SelectedColor = frame.SelectedColor, - HoverColor = frame.HoverColor, - ToolTip = characterToolTip - }; - - var soundIcon = new GUIImage(new RectTransform(new Point((int)(characterArea.Rect.Height * 0.5f)), characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(5, 0) }, - "GUISoundIcon") - { - UserData = "soundicon", - CanBeFocused = false, - Visible = true - }; - soundIcon.Color = new Color(soundIcon.Color, 0.0f); - new GUIImage(new RectTransform(new Point((int)(characterArea.Rect.Height * 0.5f)), characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(5, 0) }, - "GUISoundIconDisabled") - { - UserData = "soundicondisabled", - CanBeFocused = true, - Visible = false - }; - - if (isSinglePlayer) - { - characterArea.OnClicked = CharacterClicked; - } - else - { - characterArea.CanBeFocused = false; - characterArea.CanBeSelected = false; - } - - var characterImage = new GUICustomComponent(new RectTransform(new Point(characterArea.Rect.Height), characterArea.RectTransform, Anchor.CenterLeft), - onDraw: (sb, component) => character.Info.DrawIcon(sb, component.Rect.Center.ToVector2(), targetAreaSize: component.Rect.Size.ToVector2())) - { - CanBeFocused = false, - HoverColor = Color.White, - SelectedColor = Color.White, - ToolTip = characterToolTip - }; - - var characterName = new GUITextBlock(new RectTransform(new Point(characterArea.Rect.Width - characterImage.Rect.Width - soundIcon.Rect.Width - 10, characterArea.Rect.Height), - characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(soundIcon.Rect.Width + 10, 0) }, - character.Name, textColor: frame.Color, font: GUI.SmallFont, wrap: true) - { - Color = frame.Color, - HoverColor = Color.Transparent, - SelectedColor = Color.Transparent, - CanBeFocused = false, - ToolTip = characterToolTip, - AutoScale = true - }; - - //---------------- order buttons ---------------- - - var orderButtonFrame = new GUILayoutGroup(new RectTransform(new Point(100, frame.Rect.Height), frame.RectTransform) - { AbsoluteOffset = new Point(characterInfoWidth + spacing, 0) }, - isHorizontal: true, childAnchor: Anchor.CenterLeft) - { - AbsoluteSpacing = (int)(10 * GUI.Scale), - UserData = "orderbuttons", - CanBeFocused = false - }; - - //listbox for holding the orders inappropriate for this character - //(so we can easily toggle their visibility) - var wrongOrderList = new GUIListBox(new RectTransform(new Point(50, orderButtonFrame.Rect.Height), orderButtonFrame.RectTransform), isHorizontal: true, style: null) - { - ScrollBarEnabled = false, - ScrollBarVisible = false, - Enabled = false, - Spacing = spacing, - ClampMouseRectToParent = false - }; - wrongOrderList.Content.ClampMouseRectToParent = false; - - for (int i = 0; i < orders.Count; i++) - { - var order = orders[i]; - if (order.TargetAllCharacters) continue; - - RectTransform btnParent = (i >= correctOrderCount + neutralOrderCount) ? - wrongOrderList.Content.RectTransform : - orderButtonFrame.RectTransform; - - var btn = new GUIButton(new RectTransform(new Point(iconSize, iconSize), btnParent, Anchor.CenterLeft), - style: null) - { - UserData = order - }; - - new GUIFrame(new RectTransform(new Vector2(1.5f), btn.RectTransform, Anchor.Center), "OuterGlow") - { - Color = Color.Lerp(order.Color, frame.Color, 0.5f) * 0.8f, - HoverColor = Color.Lerp(order.Color, frame.Color, 0.5f) * 1.0f, - PressedColor = Color.Lerp(order.Color, frame.Color, 0.5f) * 0.6f, - UserData = "selected", - CanBeFocused = false, - Visible = false - }; - - var img = new GUIImage(new RectTransform(Vector2.One, btn.RectTransform), order.Prefab.SymbolSprite); - img.Scale = iconSize / (float)img.SourceRect.Width; - img.Color = Color.Lerp(order.Color, frame.Color, 0.5f); - img.ToolTip = order.Name; - img.HoverColor = Color.Lerp(img.Color, Color.White, 0.5f); - - btn.OnClicked += (GUIButton button, object userData) => - { - if (Character.Controlled == null || Character.Controlled.SpeechImpediment >= 100.0f) return false; - - if (btn.GetChildByUserData("selected").Visible) - { - SetCharacterOrder(character, Order.PrefabList.Find(o => o.AITag == "dismissed"), null, Character.Controlled); - } - else - { - if (order.ItemComponentType != null || order.ItemIdentifiers.Length > 0 || order.Options.Length > 1) - { - CreateOrderTargetFrame(button, character, order); - } - else - { - SetCharacterOrder(character, order, null, Character.Controlled); - } - } - return true; - }; - btn.UserData = order; - btn.ToolTip = order.Name; - - //divider between different groups of orders - if (i == correctOrderCount - 1 || i == correctOrderCount + neutralOrderCount - 1) - { - //TODO: divider sprite - new GUIFrame(new RectTransform(new Point(8, iconSize), orderButtonFrame.RectTransform), style: "GUIButton"); - } - } - - var toggleWrongOrderBtn = new GUIButton(new RectTransform(new Point((int)(30 * GUI.Scale), wrongOrderList.Rect.Height), wrongOrderList.Content.RectTransform), - "", style: "UIToggleButton") - { - UserData = "togglewrongorder", - CanBeFocused = false - }; - - wrongOrderList.RectTransform.NonScaledSize = new Point( - wrongOrderList.Content.Children.Sum(c => c.Rect.Width + wrongOrderList.Spacing), - wrongOrderList.RectTransform.NonScaledSize.Y); - wrongOrderList.RectTransform.SetAsLastChild(); - - new GUIFrame(new RectTransform(new Point( - wrongOrderList.Rect.Width - toggleWrongOrderBtn.Rect.Width - wrongOrderList.Spacing * 2, - wrongOrderList.Rect.Height), wrongOrderList.Content.RectTransform), - style: null) - { - CanBeFocused = false - }; - - //scale to fit the content - orderButtonFrame.RectTransform.NonScaledSize = new Point( - orderButtonFrame.Children.Sum(c => c.Rect.Width + orderButtonFrame.AbsoluteSpacing), - orderButtonFrame.RectTransform.NonScaledSize.Y); - - frame.RectTransform.NonScaledSize = new Point( - characterInfoWidth + spacing + (orderButtonFrame.Rect.Width - wrongOrderList.Rect.Width), - frame.RectTransform.NonScaledSize.Y); - - characterListBox.RectTransform.NonScaledSize = new Point( - characterListBox.Content.Children.Max(c => c.Rect.Width) + wrongOrderList.Rect.Width, - characterListBox.RectTransform.NonScaledSize.Y); - characterListBox.Content.RectTransform.NonScaledSize = characterListBox.RectTransform.NonScaledSize; - characterListBox.UpdateScrollBarSize(); - return frame; + soundIcon.Visible = !muted && !mutedLocally; + soundIconDisabled.Visible = muted || mutedLocally; + soundIconDisabled.ToolTip = TextManager.Get(mutedLocally ? "MutedLocally" : "MutedGlobally"); } private IEnumerable KillCharacterAnim(GUIComponent component) @@ -953,12 +778,6 @@ namespace Barotrauma } return; } - List availableSpeakers = Character.CharacterList.FindAll(c => - c.AIController is HumanAIController && - !c.IsDead && - c.SpeechImpediment <= 100.0f); - pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers)); - } character.SetOrder(order, option, orderGiver, speak: orderGiver != character); if (IsSinglePlayer) @@ -1016,23 +835,19 @@ namespace Barotrauma } } } - - character.SetOrder(order, option, orderGiver, speak: orderGiver != character); - if (IsSinglePlayer) + //only one target (or an order with no particular targets), just show options + else { - orderGiver?.Speak( - order.GetChatMessage(character.Name, orderGiver.CurrentHull?.DisplayName, givingOrderToSelf: character == orderGiver, orderOption: option), null); - } - else if (orderGiver != null) - { - OrderChatMessage msg = new OrderChatMessage(order, option, order.TargetItemComponent?.Item, character, orderGiver); - if (GameMain.Client != null) + orderTargetFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.2f + order.Options.Length * 0.1f, 0.18f), GUI.Canvas) + { AbsoluteOffset = new Point(orderButton.Rect.Center.X, orderButton.Rect.Bottom) }, + isHorizontal: true, childAnchor: Anchor.BottomLeft) { - GameMain.Client.SendChatMessage(msg); - } - } - DisplayCharacterOrder(character, order); - } + UserData = character, + Stretch = true + }; + //line connecting the order button to the option buttons + //TODO: sprite + new GUIFrame(new RectTransform(new Vector2(0.5f, 1.0f), orderTargetFrame.RectTransform), style: null); /// /// Create the UI panel that's used to select the target and options for a given order diff --git a/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs b/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs index 84c23f4b5..4a745d87f 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs @@ -102,6 +102,8 @@ namespace Barotrauma private GUILayoutGroup subPreviewContainer; + private GUILayoutGroup subPreviewContainer; + private GUIButton loadGameButton; public Action StartNewGame; diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs index d81e83955..4c9b9b074 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs @@ -313,6 +313,39 @@ namespace Barotrauma return currentPath.CurrentNode.SimPosition - pos; } + public bool HasAccessToPath(SteeringPath path) + { + foreach (var node in path.Nodes) + { + var door = node.ConnectedDoor; + if (door != null) + { + if (door.HasIntegratedButtons) + { + if (!door.HasRequiredItems(character, false)) + { + return false; + } + else + { + foreach (var button in door.Item.GetConnectedComponents(true)) + { + if (!button.HasRequiredItems(character, false)) + { + return false; + } + else if (Vector2.DistanceSquared(button.Item.WorldPosition, door.Item.WorldPosition) > button.Item.InteractDistance * button.Item.InteractDistance) + { + return false; + } + } + } + } + } + } + return true; + } + private void CheckDoorsInPath() { for (int i = 0; i < 2; i++) diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveExtinguishFire.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveExtinguishFire.cs index 8962439d9..1d4ef4f42 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveExtinguishFire.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveExtinguishFire.cs @@ -51,10 +51,9 @@ namespace Barotrauma return otherExtinguishFire != null && otherExtinguishFire.targetHull == targetHull; } - public override bool CanBeCompleted - { - get { return getExtinguisherObjective == null || getExtinguisherObjective.IsCompleted() || getExtinguisherObjective.CanBeCompleted; } - } + public override bool CanBeCompleted => + (getExtinguisherObjective == null || getExtinguisherObjective.IsCompleted() || getExtinguisherObjective.CanBeCompleted) && + (gotoObjective == null || gotoObjective.IsCompleted() || gotoObjective.CanBeCompleted); protected override void Act(float deltaTime) { diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs index 1e65a6805..494e8a9e3 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs @@ -204,6 +204,7 @@ namespace Barotrauma unreachable.Add(hull); continue; } + if (!PathSteering.HasAccessToPath(path)) { continue; } int unsafeNodes = path.Nodes.Count(n => n.CurrentHull != character.CurrentHull && HumanAIController.UnsafeHulls.Contains(n.CurrentHull)); hullSafety /= 1 + unsafeNodes; // If the target is not inside a friendly submarine, considerably reduce the hull safety. diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs index 2795ff97f..f408294f9 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs @@ -161,31 +161,34 @@ namespace Barotrauma else { bool isInside = character.CurrentHull != null; - bool insideSteering = SteeringManager == PathSteering && PathSteering.CurrentPath != null; + bool insideSteering = SteeringManager == PathSteering && PathSteering.CurrentPath != null && !PathSteering.IsPathDirty; bool targetIsOutside = (Target != null && Target.Submarine == null) || (insideSteering && PathSteering.CurrentPath.HasOutdoorsNodes); if (isInside && targetIsOutside && !AllowGoingOutside) { cannotReach = true; + return; } - else + if (insideSteering && !PathSteering.HasAccessToPath(PathSteering.CurrentPath)) { - character.AIController.SteeringManager.SteeringSeek(currTargetPos); - if (getDivingGearIfNeeded) + cannotReach = true; + return; + } + character.AIController.SteeringManager.SteeringSeek(currTargetPos); + if (getDivingGearIfNeeded) + { + if (targetIsOutside || + Target is Hull h && HumanAIController.NeedsDivingGear(h) || + Target is Item i && HumanAIController.NeedsDivingGear(i.CurrentHull) || + Target is Character c && HumanAIController.NeedsDivingGear(c.CurrentHull)) { - if (targetIsOutside || - Target is Hull h && HumanAIController.NeedsDivingGear(h) || - Target is Item i && HumanAIController.NeedsDivingGear(i.CurrentHull) || - Target is Character c && HumanAIController.NeedsDivingGear(c.CurrentHull)) + if (findDivingGear == null) { - if (findDivingGear == null) - { - findDivingGear = new AIObjectiveFindDivingGear(character, true, objectiveManager); - AddSubObjective(findDivingGear); - } - else if (!findDivingGear.CanBeCompleted) - { - abandon = true; - } + findDivingGear = new AIObjectiveFindDivingGear(character, true, objectiveManager); + AddSubObjective(findDivingGear); + } + else if (!findDivingGear.CanBeCompleted) + { + abandon = true; } } } diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs index 5db487ff5..40aae6e37 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs @@ -111,8 +111,10 @@ namespace Barotrauma // Check that there is no unsafe or forbidden hulls on the way to the target // Only do this when the current hull is ok, because otherwise would block all paths from the current hull to the target hull. var path = PathSteering.PathFinder.FindPath(character.SimPosition, randomHull.SimPosition); - if (path.Unreachable || - path.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull) || IsForbidden(n.CurrentHull))) + if (path.Unreachable || + path.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull) || + IsForbidden(n.CurrentHull)) || + !PathSteering.HasAccessToPath(path)) { //can't go to this room, remove it from the list and try another room next frame int index = targetHulls.IndexOf(randomHull); diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs index 94a123622..eb3b0c43d 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs @@ -886,6 +886,25 @@ namespace Barotrauma.Items.Components } } + if (targetItem.Prefab.DeconstructItems.Any()) + { + inputContainer.Inventory.RemoveItem(targetItem); + Entity.Spawner.AddToRemoveQueue(targetItem); + MoveInputQueue(); + PutItemsToLinkedContainer(); + } + else + { + if (outputContainer.Inventory.Items.All(i => i != null)) + { + targetItem.Drop(dropper: null); + } + else + { + outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true); + } + } + if (targetItem.Prefab.DeconstructItems.Any()) { inputContainer.Inventory.RemoveItem(targetItem); diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs index 2aafee648..a251165ce 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs @@ -212,6 +212,33 @@ namespace Barotrauma.Items.Components } } + public Vector2? PosToMaintain + { + get { return posToMaintain; } + set { posToMaintain = value; } + } + + struct ObstacleDebugInfo + { + public Vector2 Point1; + public Vector2 Point2; + + public Vector2? Intersection; + + public float Dot; + + public Vector2 AvoidStrength; + + public ObstacleDebugInfo(GraphEdge edge, Vector2? intersection, float dot, Vector2 avoidStrength) + { + Point1 = edge.Point1; + Point2 = edge.Point2; + Intersection = intersection; + Dot = dot; + AvoidStrength = avoidStrength; + } + } + //edge point 1, edge point 2, avoid strength private List debugDrawObstacles = new List(); diff --git a/Barotrauma/BarotraumaShared/Source/Items/Item.cs b/Barotrauma/BarotraumaShared/Source/Items/Item.cs index 7ecb3adba..0f591b6e1 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Item.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Item.cs @@ -1364,6 +1364,10 @@ namespace Barotrauma { ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime); } + if (!broken) + { + ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime); + } ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime); if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; } diff --git a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs index 74eb90828..9ede4d403 100644 --- a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs +++ b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs @@ -15,7 +15,11 @@ namespace Barotrauma public static List hullList = new List(); public static List EntityGrids { get; } = new List(); - public static bool ShowHulls = true; + public string DisplayName + { + get; + private set; + } public static bool EditWater, EditFire; public const float OxygenDistributionSpeed = 500.0f; @@ -189,614 +193,6 @@ namespace Barotrauma } } - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - - public string DisplayName - { - get; - private set; - } - - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName - { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } - } - public override Rectangle Rect { get diff --git a/Barotrauma/BarotraumaShared/Source/PlayerInput.cs b/Barotrauma/BarotraumaShared/Source/PlayerInput.cs index e13028523..8ad826eea 100644 --- a/Barotrauma/BarotraumaShared/Source/PlayerInput.cs +++ b/Barotrauma/BarotraumaShared/Source/PlayerInput.cs @@ -162,6 +162,21 @@ namespace Barotrauma get { return binding; } } + public void SetState() + { + hit = binding.IsHit(); + if (hit) hitQueue = true; + + held = binding.IsDown(); + if (held) heldQueue = true; + } +#endif + + public KeyOrMouse State + { + get { return binding; } + } + public void SetState() { hit = binding.IsHit();