diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs index 8f9276859..2e11c7af2 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs @@ -149,7 +149,6 @@ namespace Barotrauma character.MemLocalState[i].TransformOutToInside(currentHull.Submarine); } } - } if (character.MemState.Count < 1) return; diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Character.cs b/Barotrauma/BarotraumaClient/Source/Characters/Character.cs index 385bac977..4c029c726 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/Character.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/Character.cs @@ -164,14 +164,8 @@ namespace Barotrauma break; } } - } - partial void UpdateLimbLightSource(Limb limb) - { - if (limb.LightSource != null) - { - limb.LightSource.Enabled = enabled; - } + hudProgressBars = new Dictionary(); } partial void UpdateLimbLightSource(Limb limb) diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs index d8976be22..acdfb33ab 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs @@ -174,13 +174,6 @@ namespace Barotrauma { DrawObjectiveIndicator(spriteBatch, cam, character, objectiveEntity, 1.0f); } - } - - public static void Draw(SpriteBatch spriteBatch, Character character, Camera cam) - { - if (GUI.DisableHUD) return; - - character.CharacterHealth.Alignment = Alignment.Right; foreach (Item brokenItem in brokenItems) { diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs b/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs index 5e2696495..63beecb56 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs @@ -292,7 +292,6 @@ namespace Barotrauma if (!string.IsNullOrWhiteSpace(damageModifier.DamageSound)) { damageSoundType = damageModifier.DamageSound; - SoundPlayer.PlayDamageSound(damageSoundType, Math.Max(damage, bleedingDamage), WorldPosition); break; } } diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs index d54b47a5f..3b7e4022e 100644 --- a/Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs +++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs @@ -483,7 +483,6 @@ namespace Barotrauma (int)(GUI.SmallFont.MeasureString(toolTipBlock.WrappedText).Y + padding.Y)); toolTipBlock.userData = toolTip; } - toolTipBlock.SetTextPos(); toolTipBlock.RectTransform.AbsoluteOffset = new Point(targetElement.Center.X, targetElement.Bottom); if (toolTipBlock.Rect.Right > GameMain.GraphicsWidth - 10) @@ -564,7 +563,6 @@ namespace Barotrauma RectTransform.LocalScale = startScale; yield return CoroutineStatus.Success; } - #endregion public virtual void ApplyStyle(GUIComponentStyle style) { diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUIMessageBox.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIMessageBox.cs index 4aa7f60c8..39f531931 100644 --- a/Barotrauma/BarotraumaClient/Source/GUI/GUIMessageBox.cs +++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIMessageBox.cs @@ -60,7 +60,7 @@ namespace Barotrauma GUI.Style.Apply(Header, "", this); Header.RectTransform.MinSize = new Point(0, Header.Rect.Height); - if (height == 0) + if (!string.IsNullOrWhiteSpace(text)) { Text = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), text, textAlignment: textAlignment, wrap: true); diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs index f74756f96..c3871b3d1 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs @@ -75,82 +75,9 @@ namespace Barotrauma public CrewManager(XElement element, bool isSinglePlayer) : this(isSinglePlayer) { - guiFrame = new GUIFrame(new RectTransform(Vector2.One, GUICanvas.Instance), null, Color.Transparent) + foreach (XElement subElement in element.Elements()) { - CanBeFocused = false - }; - - Point scrollButtonSize = new Point((int)(200 * GUI.Scale), (int)(30 * GUI.Scale)); - - crewArea = new GUIFrame(HUDLayoutSettings.ToRectTransform(HUDLayoutSettings.CrewArea, guiFrame.RectTransform), "", Color.Transparent) - { - CanBeFocused = false - }; - toggleCrewButton = new GUIButton(new RectTransform(new Point((int)(30 * GUI.Scale), HUDLayoutSettings.CrewArea.Height), guiFrame.RectTransform) - { AbsoluteOffset = HUDLayoutSettings.CrewArea.Location }, - "", style: "UIToggleButton"); - toggleCrewButton.OnClicked += (GUIButton btn, object userdata) => - { - ToggleCrewAreaOpen = !ToggleCrewAreaOpen; - return true; - }; - - characterListBox = new GUIListBox(new RectTransform(new Point(100, (int)(crewArea.Rect.Height - scrollButtonSize.Y * 1.6f)), crewArea.RectTransform, Anchor.CenterLeft), false, Color.Transparent, null) - { - //Spacing = (int)(3 * GUI.Scale), - ScrollBarEnabled = false, - ScrollBarVisible = false, - CanBeFocused = false - }; - - scrollButtonUp = new GUIButton(new RectTransform(scrollButtonSize, crewArea.RectTransform, Anchor.TopLeft, Pivot.TopLeft), "", Alignment.Center, "GUIButtonVerticalArrow") - { - Visible = false, - UserData = -1, - OnClicked = ScrollCharacterList - }; - scrollButtonDown = new GUIButton(new RectTransform(scrollButtonSize, crewArea.RectTransform, Anchor.BottomLeft, Pivot.BottomLeft), "", Alignment.Center, "GUIButtonVerticalArrow") - { - Visible = false, - UserData = 1, - OnClicked = ScrollCharacterList - }; - scrollButtonDown.Children.ForEach(c => c.SpriteEffects = SpriteEffects.FlipVertically); - - if (isSinglePlayer) - { - ChatBox = new ChatBox(guiFrame, isSinglePlayer: true) - { - OnEnterMessage = (textbox, text) => - { - if (Character.Controlled?.Info == null) - { - textbox.Deselect(); - textbox.Text = ""; - return true; - } - - textbox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Default]; - - if (!string.IsNullOrWhiteSpace(text)) - { - string msgCommand = ChatMessage.GetChatMessageCommand(text, out string msg); - AddSinglePlayerChatMessage( - Character.Controlled.Info.Name, - msg, - ((msgCommand == "r" || msgCommand == "radio") && ChatMessage.CanUseRadio(Character.Controlled)) ? ChatMessageType.Radio : ChatMessageType.Default, - Character.Controlled); - var headset = GetHeadset(Character.Controlled, true); - if (headset != null && headset.CanTransmit()) - { - headset.TransmitSignal(stepsTaken: 0, signal: msg, source: headset.Item, sender: Character.Controlled, sendToChat: false); - } - } - textbox.Deselect(); - textbox.Text = ""; - return true; - } - }; + if (subElement.Name.ToString().ToLowerInvariant() != "character") continue; var characterInfo = new CharacterInfo(subElement); characterInfos.Add(characterInfo); @@ -312,12 +239,12 @@ namespace Barotrauma public IEnumerable GetCharacters() { - return characterListBox.Rect; + return characters; } public IEnumerable GetCharacterInfos() { - return characterListBox.Rect; + return characterInfos; } public void AddCharacter(Character character) @@ -692,19 +619,7 @@ namespace Barotrauma characterListBox.BarScroll = roundedPos; } - CreateCharacterFrame(character, characterListBox.Content); - characterListBox.Content.RectTransform.SortChildren((c1, c2) => { return c2.NonScaledSize.X - c1.NonScaledSize.X; }); - - if (character is AICharacter) - { - var ai = character.AIController as HumanAIController; - if (ai == null) - { - DebugConsole.ThrowError("Error in crewmanager - attempted to give orders to a character with no HumanAIController"); - return; - } - character.SetOrder(ai.CurrentOrder, "", null, false); - } + return false; } private IEnumerable KillCharacterAnim(GUIComponent component) diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerCampaign.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerCampaign.cs index 474502f1a..b0463872e 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerCampaign.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerCampaign.cs @@ -9,8 +9,6 @@ namespace Barotrauma { class SinglePlayerCampaign : CampaignMode { - public ContextualTutorial ContextualTutorial; - private GUIButton endRoundButton; private bool crewDead; @@ -41,13 +39,6 @@ namespace Barotrauma CrewManager.AddCharacterInfo(new CharacterInfo(Character.HumanConfigFile, "", jobPrefab)); } } - - ContextualTutorial = Tutorial.Tutorials.Find(t => t is ContextualTutorial) as ContextualTutorial; - - if (ContextualTutorial.Selected) // Selected when starting a new game -> initialize - { - ContextualTutorial.Initialize(); - } } public override void Start() @@ -157,11 +148,6 @@ namespace Barotrauma base.AddToGUIUpdateList(); CrewManager.AddToGUIUpdateList(); endRoundButton.AddToGUIUpdateList(); - - if (ContextualTutorial.Initialized) - { - ContextualTutorial.AddToGUIUpdateList(); - } } public override void Update(float deltaTime) @@ -306,7 +292,6 @@ namespace Barotrauma TextManager.Get("QuitButton")); quitButton.OnClicked += GameMain.LobbyScreen.QuitToMainMenu; quitButton.OnClicked += (GUIButton button, object obj) => { GUIMessageBox.MessageBoxes.Remove(GUIMessageBox.VisibleBox); return true; }; - quitButton.OnClicked += (GUIButton button, object obj) => { if (ContextualTutorial.Initialized) ContextualTutorial.Stop(); return true; }; } } @@ -391,10 +376,6 @@ namespace Barotrauma case "map": campaign.map = Map.LoadNew(subElement); break; - case "contextualtutorial": - campaign.ContextualTutorial.Initialize(); // Initialize when saved element found - campaign.ContextualTutorial.LoadPartiallyComplete(subElement); - break; } } diff --git a/Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs b/Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs index 9da0010c3..b304ac33e 100644 --- a/Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs +++ b/Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs @@ -439,7 +439,6 @@ namespace Barotrauma QuickUseItem(Items[i], true, false, true); } } - } //force personal slots open if an item is running out of battery/fuel/oxygen/etc if (hidePersonalSlots) @@ -465,7 +464,6 @@ namespace Barotrauma { UpdateSubInventory(deltaTime, highlightedSubInventorySlot.SlotIndex, cam); } - } Rectangle hoverArea = GetSubInventoryHoverArea(highlightedSubInventorySlot); if (highlightedSubInventorySlot.Inventory?.slots == null || (!hoverArea.Contains(PlayerInput.MousePosition))) diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs index 0ed657623..404829e26 100644 --- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs +++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs @@ -403,7 +403,7 @@ namespace Barotrauma.Items.Components int x = rect.X; int y = rect.Y; - GUI.DrawRectangle(spriteBatch, new Rectangle((int)pos.X - 3 / 2, (int)pos.Y - 3, 6, 6), (SteeringPath.CurrentNode == wp) ? Color.LightGreen : Color.Green, false); + if (voltage < minVoltage && currPowerConsumption > 0.0f) return; Rectangle velRect = new Rectangle(x + 20, y + 20, width - 40, height - 40); Vector2 displaySubPos = (-sonar.DisplayOffset * sonar.Zoom) / sonar.Range * sonar.DisplayRadius * sonar.Zoom; @@ -549,6 +549,7 @@ namespace Barotrauma.Items.Components Color.Lerp(Color.Green, Color.Orange, obstacle.Dot), width: 2); } } + } public override void UpdateHUD(Character character, float deltaTime, Camera cam) { diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs index 9daa403e8..61d5bcc62 100644 --- a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs +++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs @@ -271,7 +271,7 @@ namespace Barotrauma.Items.Components } } } - } + } if (highlighted != null) { diff --git a/Barotrauma/BarotraumaClient/Source/Items/Item.cs b/Barotrauma/BarotraumaClient/Source/Items/Item.cs index af43bf85c..bd3248c1a 100644 --- a/Barotrauma/BarotraumaClient/Source/Items/Item.cs +++ b/Barotrauma/BarotraumaClient/Source/Items/Item.cs @@ -41,33 +41,6 @@ namespace Barotrauma { get { return activeSprite; } } - - public float SpriteRotation; - - private GUITextBlock itemInUseWarning; - private GUITextBlock ItemInUseWarning - { - get - { - if (itemInUseWarning == null) - { - itemInUseWarning = new GUITextBlock(new RectTransform(new Point(10), GUI.Canvas), "", - textColor: Color.Orange, color: Color.Black, - textAlignment:Alignment.Center, style: "OuterGlow"); - } - return itemInUseWarning; - } - } - - public override bool SelectableInEditor - { - get - { - return parentInventory == null && (body == null || body.Enabled) && ShowItems; - } - } - - public float SpriteRotation; private GUITextBlock itemInUseWarning; private GUITextBlock ItemInUseWarning diff --git a/Barotrauma/BarotraumaClient/Source/Map/Map/Map.cs b/Barotrauma/BarotraumaClient/Source/Map/Map/Map.cs index a38db424c..8bb06d630 100644 --- a/Barotrauma/BarotraumaClient/Source/Map/Map/Map.cs +++ b/Barotrauma/BarotraumaClient/Source/Map/Map/Map.cs @@ -562,20 +562,6 @@ namespace Barotrauma null, connectionColor * MathHelper.Clamp(a, 0.1f, 0.5f), MathUtils.VectorToAngle(end - start), new Vector2(0, 16), SpriteEffects.None, 0.01f); } - } - - rect.Inflate(8, 8); - GUI.DrawRectangle(spriteBatch, rect, Color.Black, false, 0.0f, 8); - GUI.DrawRectangle(spriteBatch, rect, Color.LightGray); - - for (int i = 0; i < Locations.Count; i++) - { - Location location = Locations[i]; - Vector2 pos = rectCenter + (location.MapPosition + viewOffset) * zoom; - - Rectangle drawRect = location.Type.Sprite.SourceRect; - drawRect.X = (int)pos.X - drawRect.Width / 2; - drawRect.Y = (int)pos.Y - drawRect.Width / 2; if (GameMain.DebugDraw && zoom > 1.0f && generationParams.ShowLevelTypeNames) { diff --git a/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs b/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs index acf573e73..7b006435b 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs @@ -16,779 +16,6 @@ namespace Barotrauma private GUIListBox saveList; private GUITextBox saveNameBox, seedBox; - private GUITickBox contextualTutorialBox; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; - - private GUILayoutGroup subPreviewContainer; private GUILayoutGroup subPreviewContainer; @@ -796,14 +23,6 @@ namespace Barotrauma public Action StartNewGame; public Action LoadGame; - public bool TutorialSelected - { - get - { - if (contextualTutorialBox == null) return false; - return contextualTutorialBox.Selected; - } - } private readonly bool isMultiplayer; diff --git a/Barotrauma/BarotraumaClient/Source/Screens/CharacterEditorScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/CharacterEditorScreen.cs index 32d12fc66..36bda70df 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/CharacterEditorScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/CharacterEditorScreen.cs @@ -131,9 +131,6 @@ namespace Barotrauma { GameMain.Instance.ShowEditorDisclaimer(); } - OpenDoors(); - GameMain.Instance.OnResolutionChanged += OnResolutionChanged; - instance = this; } private void ResetVariables() diff --git a/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs index 02724cf6e..17e83757c 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs @@ -4,7 +4,6 @@ using Barotrauma.Tutorials; using Lidgren.Network; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using Microsoft.Xna.Framework.Input; using System; using System.Diagnostics; using System.IO; @@ -779,8 +778,6 @@ namespace Barotrauma GUI.Draw(Cam, spriteBatch); - GUI.Draw(Cam, spriteBatch); - #if DEBUG GUI.Font.DrawString(spriteBatch, "Barotrauma v" + GameMain.Version + " (debug build)", new Vector2(10, GameMain.GraphicsHeight - 20), Color.White); #else @@ -859,7 +856,6 @@ namespace Barotrauma GameModePreset.List.Find(g => g.Identifier == "singleplayercampaign")); (GameMain.GameSession.GameMode as CampaignMode).GenerateMap(mapSeed); - GameMain.LobbyScreen.Select(); } diff --git a/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs index 1bf605e1d..c45c37df1 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs @@ -1205,7 +1205,6 @@ namespace Barotrauma AbsoluteSpacing = 5, Stretch = true }; -#endif new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedSaveFrame.RectTransform), TextManager.Get("SaveItemAssemblyDialogHeader"), font: GUI.LargeFont); diff --git a/Barotrauma/BarotraumaServer/Source/GameMain.cs b/Barotrauma/BarotraumaServer/Source/GameMain.cs index ec81b52c3..6515b87c6 100644 --- a/Barotrauma/BarotraumaServer/Source/GameMain.cs +++ b/Barotrauma/BarotraumaServer/Source/GameMain.cs @@ -162,31 +162,6 @@ namespace Barotrauma } } - /// - /// Returns the file paths of all files of the given type in the content packages. - /// - /// - /// If true, also returns files in content packages that are installed but not currently selected. - public IEnumerable GetFilesOfType(ContentType type, bool searchAllContentPackages = false) - { - if (searchAllContentPackages) - { - return ContentPackage.GetFilesOfType(ContentPackage.List, type); - } - else - { - return ContentPackage.GetFilesOfType(SelectedPackages, type); - } - } - - /// - /// Returns the file paths of all files of the given type in the currently selected content packages. - /// - public IEnumerable GetFilesOfType(ContentType type) - { - return ContentPackage.GetFilesOfType(SelectedPackages, type); - } - public void StartServer() { string name = "Server"; diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs index 2a57337db..bd8df818d 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs @@ -797,7 +797,6 @@ namespace Barotrauma { UpdateLimbAttack(deltaTime, AttackingLimb, attackSimPos, distance); } - return false; } public bool IsSteeringThroughGap { get; private set; } diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs index 9213ee490..593e5a714 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs @@ -277,11 +277,6 @@ namespace Barotrauma { Character.AnimController.TargetDir = Character.AnimController.TargetMovement.X > 0.0f ? Direction.Right : Direction.Left; } - - if (Character.CurrentHull != null) - { - Character.GetVisibleHulls().ForEach(h => PropagateHullSafety(Character.Controlled, h)); - } } protected void ReportProblems() diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs index c51f69382..471628b8a 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs @@ -304,24 +304,7 @@ namespace Barotrauma float targetDistance = collider.radius * margin; if (horizontalDistance < targetDistance && isAboveFeet && isNotTooHigh) { - float multiplierX = MathHelper.Lerp(1, 10, MathHelper.Clamp(Math.Abs(velocity.X) / 10, 0, 1)); - float multiplierY = MathHelper.Lerp(1, 10, MathHelper.Clamp(Math.Abs(velocity.Y) / 10, 0, 1)); - float verticalDistance = Math.Abs(colliderBottom.Y - currentPath.CurrentNode.SimPosition.Y); - float targetDistX = collider.radius * multiplierX; - float targetDistY = collider.radius * multiplierY; - if (horizontalDistance < targetDistX && verticalDistance < targetDistY && isAboveFeet && isNotTooHigh) - { - currentPath.SkipToNextNode(); - } - } - else - { - float margin = MathHelper.Lerp(1, 10, MathHelper.Clamp(Math.Abs(velocity.X) / 10, 0, 1)); - float targetDistance = collider.radius * margin; - if (horizontalDistance < targetDistance && isAboveFeet && isNotTooHigh) - { - currentPath.SkipToNextNode(); - } + currentPath.SkipToNextNode(); } } diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjective.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjective.cs index 3fc4a3380..0a1ae5f75 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjective.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjective.cs @@ -92,7 +92,6 @@ namespace Barotrauma } } - bool wasCompleted = IsCompleted(); Act(deltaTime); if (IsCompleted()) { diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs index 1c8d8a22a..98a3c2af4 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs @@ -279,7 +279,6 @@ namespace Barotrauma Weapon.Drop(character); } } - return true; } private bool Equip() diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs index d03be14b9..73c1614c7 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs @@ -20,7 +20,6 @@ namespace Barotrauma public readonly string[] itemIdentifiers; public readonly ItemContainer container; - private bool isCompleted; private AIObjectiveGetItem getItemObjective; private AIObjectiveGoTo goToObjective; diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs index ec88cd1f3..33b62d9d0 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs @@ -49,9 +49,7 @@ namespace Barotrauma return new AIObjectiveGetItem(character, gearTag, objectiveManager, equip: true); }); } - if (getDivingGear != null) { return; } - var containedItems = item.ContainedItems; - if (containedItems == null) + else { var containedItems = item.ContainedItems; if (containedItems == null) diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs index 69a45abab..b7b1e13c4 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Barotrauma.Extensions; namespace Barotrauma { diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs index ba9f811d7..9f152637d 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs @@ -89,11 +89,6 @@ namespace Barotrauma TryAddSubObjective(ref refuelObjective, () => new AIObjectiveContainItem(character, "weldingfueltank", weldingTool.GetComponent(), objectiveManager)); return; } - else if (character.Inventory.IsInLimbSlot(repairTool.Item, InvSlotType.LeftHand)) - { - sightLimb = character.AnimController.GetLimb(LimbType.LeftHand); - } - canReach = character.CanSeeTarget(leak, sightLimb); } if (subObjectives.Any()) { return; } var repairTool = weldingTool.GetComponent(); diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs index 88881b170..95a7972a0 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs @@ -74,44 +74,6 @@ namespace Barotrauma } } - public override void Update(float deltaTime) - { - if (objectiveManager.CurrentObjective == this) - { - if (randomTimer > 0) - { - randomTimer -= deltaTime; - } - else - { - SetRandom(); - } - } - } - - public override void Update(float deltaTime) - { - if (objectiveManager.CurrentObjective == this) - { - if (randomTimer > 0) - { - randomTimer -= deltaTime; - } - else - { - SetRandom(); - } - } - } - - public override bool IsCompleted() => false; - public override bool CanBeCompleted => true; - - public override bool IsLoop { get => true; set => throw new System.Exception("Trying to set the value for IsLoop from: " + System.Environment.StackTrace); } - - // TODO: take the initiative into account - public override float GetPriority() => 1; - protected override void Act(float deltaTime) { if (PathSteering == null) { return; } diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs index 9f08aa113..455392e05 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs @@ -3,7 +3,6 @@ using Microsoft.Xna.Framework; using System; using System.Collections.Generic; using System.Linq; -using Barotrauma.Extensions; namespace Barotrauma { @@ -71,915 +70,7 @@ namespace Barotrauma { if (character.SelectedConstruction != target.Item) { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; - } - if (component.AIOperate(deltaTime, character, this)) - { - isCompleted = true; + target.Item.TryInteract(character, false, true); } if (component.AIOperate(deltaTime, character, this)) { diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescueAll.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescueAll.cs index 4167f8e72..11d22f454 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescueAll.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescueAll.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Linq; -using Barotrauma.Extensions; namespace Barotrauma { diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs b/Barotrauma/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs index 029fa5a7a..1d7ac3ecb 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs @@ -733,8 +733,6 @@ namespace Barotrauma limb.body.ApplyForce(diff * (float)(Math.Sin(WalkPos) * Math.Sqrt(limb.Mass)) * 30.0f * animStrength, maxVelocity: 10.0f); } - - limb?.body.SmoothRotate(angle, torque, wrapAngle: false); } private void SmoothRotateWithoutWrapping(Limb limb, float angle, Limb referenceLimb, float torque) diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs index cc2e7af08..e524c3bbc 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs @@ -1147,7 +1147,7 @@ namespace Barotrauma if (!(this is AICharacter) || Controlled == this || IsRemotePlayer) { - if (speedMultipliers.Count == 0) return 1f; + Vector2 targetMovement = GetTargetMovement(); AnimController.TargetMovement = targetMovement; AnimController.IgnorePlatforms = AnimController.TargetMovement.Y < -0.1f; diff --git a/Barotrauma/BarotraumaShared/Source/Events/Missions/MonsterMission.cs b/Barotrauma/BarotraumaShared/Source/Events/Missions/MonsterMission.cs index 01905d2cf..e37aeed7d 100644 --- a/Barotrauma/BarotraumaShared/Source/Events/Missions/MonsterMission.cs +++ b/Barotrauma/BarotraumaShared/Source/Events/Missions/MonsterMission.cs @@ -29,7 +29,7 @@ namespace Barotrauma monsterFile = prefab.ConfigElement.GetAttributeString("monsterfile", ""); monsterCount = prefab.ConfigElement.GetAttributeInt("monstercount", 1); } - + public override void Start(Level level) { Level.Loaded.TryGetInterestingPosition(true, Level.PositionType.MainPath, Level.Loaded.Size.X * 0.3f, out Vector2 spawnPos); diff --git a/Barotrauma/BarotraumaShared/Source/GameSettings.cs b/Barotrauma/BarotraumaShared/Source/GameSettings.cs index 469a636b6..0da9e2eee 100644 --- a/Barotrauma/BarotraumaShared/Source/GameSettings.cs +++ b/Barotrauma/BarotraumaShared/Source/GameSettings.cs @@ -922,83 +922,6 @@ namespace Barotrauma foreach (XElement subElement in doc.Root.Elements()) { switch (subElement.Name.ToString().ToLowerInvariant()) - { - case "keymapping": - foreach (XAttribute attribute in subElement.Attributes()) - { - if (Enum.TryParse(attribute.Name.ToString(), true, out InputType inputType)) - { - if (int.TryParse(attribute.Value.ToString(), out int mouseButton)) - { - keyMapping[(int)inputType] = new KeyOrMouse(mouseButton); - } - else - { - if (Enum.TryParse(attribute.Value.ToString(), true, out Keys key)) - { - keyMapping[(int)inputType] = new KeyOrMouse(key); - } - } - } - } - break; - case "gameplay": - jobPreferences = new List(); - foreach (XElement ele in subElement.Element("jobpreferences").Elements("job")) - { - string jobIdentifier = ele.GetAttributeString("identifier", ""); - if (string.IsNullOrEmpty(jobIdentifier)) continue; - jobPreferences.Add(jobIdentifier); - } - break; - case "player": - defaultPlayerName = subElement.GetAttributeString("name", defaultPlayerName); - CharacterHeadIndex = subElement.GetAttributeInt("headindex", CharacterHeadIndex); - if (Enum.TryParse(subElement.GetAttributeString("gender", "none"), true, out Gender g)) - { - CharacterGender = g; - } - if (Enum.TryParse(subElement.GetAttributeString("race", "white"), true, out Race r)) - { - CharacterRace = r; - } - else - { - CharacterRace = Race.White; - } - CharacterHairIndex = subElement.GetAttributeInt("hairindex", CharacterHairIndex); - CharacterBeardIndex = subElement.GetAttributeInt("beardindex", CharacterBeardIndex); - CharacterMoustacheIndex = subElement.GetAttributeInt("moustacheindex", CharacterMoustacheIndex); - CharacterFaceAttachmentIndex = subElement.GetAttributeInt("faceattachmentindex", CharacterFaceAttachmentIndex); - break; - case "tutorials": - foreach (XElement tutorialElement in subElement.Elements()) - { - CompletedTutorialNames.Add(tutorialElement.GetAttributeString("name", "")); - } - break; - } - } - - UnsavedSettings = false; - - selectedContentPackagePaths = new HashSet(); - - foreach (XElement subElement in doc.Root.Elements()) - { - DebugConsole.ThrowError(TextManager.Get("ContentPackageNotFound").Replace("[packagepath]", missingPackagePath)); - } - foreach (ContentPackage incompatiblePackage in incompatiblePackages) - { - DebugConsole.ThrowError(TextManager.Get(incompatiblePackage.GameVersion <= new Version(0, 0, 0, 0) ? "IncompatibleContentPackageUnknownVersion" : "IncompatibleContentPackage") - .Replace("[packagename]", incompatiblePackage.Name) - .Replace("[packageversion]", incompatiblePackage.GameVersion.ToString()) - .Replace("[gameversion]", GameMain.Version.ToString())); - } - foreach (ContentPackage contentPackage in SelectedContentPackages) - { - bool packageOk = contentPackage.VerifyFiles(out List errorMessages); - if (!packageOk) { case "contentpackage": string path = System.IO.Path.GetFullPath(subElement.GetAttributeString("path", "")); @@ -1112,7 +1035,6 @@ namespace Barotrauma new XAttribute("autocheckupdates", AutoCheckUpdates), new XAttribute("musicvolume", musicVolume), new XAttribute("soundvolume", soundVolume), - new XAttribute("voicechatvolume", voiceChatVolume), new XAttribute("verboselogging", VerboseLogging), new XAttribute("savedebugconsolelogs", SaveDebugConsoleLogs), new XAttribute("enablesplashscreen", EnableSplashScreen), @@ -1139,6 +1061,7 @@ namespace Barotrauma gMode = new XElement("graphicsmode"); doc.Root.Add(gMode); } + if (GraphicsWidth == 0 || GraphicsHeight == 0) { gMode.ReplaceAttributes(new XAttribute("displaymode", windowMode)); diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs index 69e06880e..fb4392e3c 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs @@ -125,945 +125,6 @@ namespace Barotrauma.Items.Components outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true); } } - - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - Entity.Spawner.AddToRemoveQueue(targetItem); - MoveInputQueue(); - PutItemsToLinkedContainer(); - } if (inputContainer.Inventory.Items.Any(i => i != null)) { diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs index f6d19e87b..4250a83ab 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs @@ -79,39 +79,10 @@ namespace Barotrauma.Items.Components +" Can be used to compensate if the ballast tanks are too large/small relative to the size of the submarine."), Serialize(0.5f, true)] public float NeutralBallastLevel { - if (!CanBeSelected) return false; - - user = character; - return true; - } - - [Serialize(1000.0f, true)] - public float DockingAssistThreshold - { - get; - set; - } - - [Serialize(1000.0f, true)] - public float DockingAssistThreshold - { - get; - set; - } - - public Vector2 TargetVelocity - { - sonar = item.GetComponent(); - } - - public Vector2 SteeringInput - { - get { return steeringInput; } + get { return neutralBallastLevel; } set { - if (!MathUtils.IsValid(value)) return; - steeringInput.X = MathHelper.Clamp(value.X, -100.0f, 100.0f); - steeringInput.Y = MathHelper.Clamp(value.Y, -100.0f, 100.0f); + neutralBallastLevel = MathHelper.Clamp(value, 0.0f, 1.0f); } } @@ -124,12 +95,12 @@ namespace Barotrauma.Items.Components public Vector2 TargetVelocity { - get { return steeringInput; } - set + get { return targetVelocity;} + set { if (!MathUtils.IsValid(value)) return; - steeringInput.X = MathHelper.Clamp(value.X, -100.0f, 100.0f); - steeringInput.Y = MathHelper.Clamp(value.Y, -100.0f, 100.0f); + targetVelocity.X = MathHelper.Clamp(value.X, -100.0f, 100.0f); + targetVelocity.Y = MathHelper.Clamp(value.Y, -100.0f, 100.0f); } } @@ -146,22 +117,7 @@ namespace Barotrauma.Items.Components public SteeringPath SteeringPath { - if (!CanBeSelected) return false; - - user = character; - return true; - } - - public Vector2? PosToMaintain - { - get { return posToMaintain; } - set { posToMaintain = value; } - } - - public Vector2? PosToMaintain - { - get { return posToMaintain; } - set { posToMaintain = value; } + get { return steeringPath; } } public Vector2? PosToMaintain diff --git a/Barotrauma/BarotraumaShared/Source/Items/Item.cs b/Barotrauma/BarotraumaShared/Source/Items/Item.cs index badc65546..f3e5de9d9 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Item.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Item.cs @@ -1130,13 +1130,8 @@ namespace Barotrauma if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; } - if (Math.Abs(body.LinearVelocity.X) > NetConfig.MaxPhysicsBodyVelocity || - Math.Abs(body.LinearVelocity.Y) > NetConfig.MaxPhysicsBodyVelocity) - { - body.LinearVelocity = new Vector2( - MathHelper.Clamp(body.LinearVelocity.X, -NetConfig.MaxPhysicsBodyVelocity, NetConfig.MaxPhysicsBodyVelocity), - MathHelper.Clamp(body.LinearVelocity.Y, -NetConfig.MaxPhysicsBodyVelocity, NetConfig.MaxPhysicsBodyVelocity)); - } + ApplyWaterForces(); + CurrentHull?.ApplyFlowForces(deltaTime, this); } public void UpdateTransform() diff --git a/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs b/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs index 9877d9044..15f3074a6 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs @@ -131,7 +131,7 @@ namespace Barotrauma //default size protected Vector2 size; - private List fabricationRecipeElements = new List(); + private float impactTolerance; private bool canSpriteFlipX, canSpriteFlipY; @@ -474,12 +474,6 @@ namespace Barotrauma DeconstructItems = new List(); FabricationRecipes = new List(); DeconstructTime = 1.0f; - - Tags = element.GetAttributeStringArray("tags", new string[0], convertToLowerInvariant: true).ToHashSet(); - if (Tags.None()) - { - Tags = element.GetAttributeStringArray("Tags", new string[0], convertToLowerInvariant: true).ToHashSet(); - } Tags = new HashSet(element.GetAttributeStringArray("tags", new string[0], convertToLowerInvariant: true)); if (!Tags.Any()) diff --git a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs index ecaea3ee0..c93d78e98 100644 --- a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs +++ b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs @@ -33,43 +33,18 @@ namespace Barotrauma public readonly Dictionary properties; public Dictionary SerializableProperties { - get { return roomName; } - set - { - if (roomName == value) { return; } - roomName = value; - DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName; - } + get { return properties; } } - public string DisplayName - { - get; - private set; - } + private float lethalPressure; private float surface, drawSurface; private float waterVolume; private float pressure; - public string DisplayName - { - get; - private set; - } + private float oxygen; - 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; - } - } + private bool update; public bool Visible = true; @@ -81,396 +56,11 @@ namespace Barotrauma public readonly List ConnectedGaps = new List(); - private string roomName; - [Editable, Serialize("", true, translationTextTag: "RoomName.")] - public string RoomName + public override string Name { - get { return roomName; } - set + get { - 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; + return "Hull"; } } diff --git a/Barotrauma/BarotraumaShared/Source/Map/Submarine.cs b/Barotrauma/BarotraumaShared/Source/Map/Submarine.cs index 715d9bb5f..f9620770f 100644 --- a/Barotrauma/BarotraumaShared/Source/Map/Submarine.cs +++ b/Barotrauma/BarotraumaShared/Source/Map/Submarine.cs @@ -1433,7 +1433,7 @@ namespace Barotrauma doc.Root.Add(new XAttribute("md5hash", hash.Hash)); if (previewImage != null) { - //doc.Root.Add(new XAttribute("previewimage", Convert.ToBase64String(previewImage.ToArray()))); + doc.Root.Add(new XAttribute("previewimage", Convert.ToBase64String(previewImage.ToArray()))); } try diff --git a/Barotrauma/BarotraumaShared/Submarines/Bunyip.sub b/Barotrauma/BarotraumaShared/Submarines/Bunyip.sub index 901bbfdcc..f2ad8f576 100644 Binary files a/Barotrauma/BarotraumaShared/Submarines/Bunyip.sub and b/Barotrauma/BarotraumaShared/Submarines/Bunyip.sub differ diff --git a/Barotrauma/BarotraumaShared/Submarines/Selkie.sub b/Barotrauma/BarotraumaShared/Submarines/Selkie.sub index 3252dd755..1c30b9a86 100644 Binary files a/Barotrauma/BarotraumaShared/Submarines/Selkie.sub and b/Barotrauma/BarotraumaShared/Submarines/Selkie.sub differ diff --git a/Barotrauma/BarotraumaShared/Submarines/Venture.sub b/Barotrauma/BarotraumaShared/Submarines/Venture.sub index 0ef1743bf..4e7eafc2c 100644 Binary files a/Barotrauma/BarotraumaShared/Submarines/Venture.sub and b/Barotrauma/BarotraumaShared/Submarines/Venture.sub differ