diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs index fa30d8a82..2e11c7af2 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs @@ -108,61 +108,6 @@ namespace Barotrauma } } - //unconscious/dead characters can't correct their position using AnimController movement - // -> we need to correct it manually - if (!character.AllowInput) - { - float mainLimbDistSqrd = Vector2.DistanceSquared(MainLimb.PullJointWorldAnchorA, Collider.SimPosition); - float mainLimbErrorTolerance = 0.1f; - //if the main limb is roughly at the correct position and the collider isn't moving (much at least), - //don't attempt to correct the position. - if (mainLimbDistSqrd > mainLimbErrorTolerance || Collider.LinearVelocity.LengthSquared() > 0.05f) - { - MainLimb.PullJointWorldAnchorB = Collider.SimPosition; - MainLimb.PullJointEnabled = true; - } - character.SelectedConstruction = character.MemState[0].SelectedItem; - } - - if (character.MemState[0].Animation == AnimController.Animation.CPR) - { - character.AnimController.Anim = AnimController.Animation.CPR; - } - else if (character.AnimController.Anim == AnimController.Animation.CPR) - { - character.AnimController.Anim = AnimController.Animation.None; - } - - Vector2 newVelocity = Collider.LinearVelocity; - Vector2 newPosition = Collider.SimPosition; - float newRotation = Collider.Rotation; - float newAngularVelocity = Collider.AngularVelocity; - Collider.CorrectPosition(character.MemState, out newPosition, out newVelocity, out newRotation, out newAngularVelocity); - - newVelocity = newVelocity.ClampLength(100.0f); - if (!MathUtils.IsValid(newVelocity)) { newVelocity = Vector2.Zero; } - overrideTargetMovement = newVelocity.LengthSquared() > 0.01f ? newVelocity : Vector2.Zero; - - Collider.LinearVelocity = newVelocity; - Collider.AngularVelocity = newAngularVelocity; - - float distSqrd = Vector2.DistanceSquared(newPosition, Collider.SimPosition); - float errorTolerance = character.AllowInput ? 0.01f : 0.2f; - if (distSqrd > errorTolerance) - { - if (distSqrd > 10.0f || !character.AllowInput) - { - Collider.TargetRotation = newRotation; - SetPosition(newPosition, lerp: distSqrd < 5.0f, ignorePlatforms: false); - } - else - { - Collider.TargetRotation = newRotation; - Collider.TargetPosition = newPosition; - Collider.MoveToTargetPosition(true); - } - } - //unconscious/dead characters can't correct their position using AnimController movement // -> we need to correct it manually if (!character.AllowInput) @@ -204,35 +149,6 @@ namespace Barotrauma character.MemLocalState[i].TransformOutToInside(currentHull.Submarine); } } - - } - character.MemLocalState.Clear(); - } - else - { - //remove states with a timestamp (there may still timestamp-based states - //in the list if the controlled character switches from timestamp-based interpolation to ID-based) - character.MemState.RemoveAll(m => m.Timestamp > 0.0f); - - for (int i = 0; i < character.MemLocalState.Count; i++) - { - if (character.Submarine == null) - { - //transform in-sub coordinates to outside coordinates - if (character.MemLocalState[i].Position.Y > lowestSubPos) - { - character.MemLocalState[i].TransformInToOutside(); - } - } - else if (currentHull?.Submarine != null) - { - //transform outside coordinates to in-sub coordinates - if (character.MemLocalState[i].Position.Y < lowestSubPos) - { - 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/GUI/GUIComponent.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs index 295fb6e1d..4dd255888 100644 --- a/Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs +++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs @@ -484,7 +484,6 @@ namespace Barotrauma toolTipBlock.WrappedText.Split('\n').Length * 18 + 7); toolTipBlock.userData = toolTip; } - toolTipBlock.SetTextPos(); toolTipBlock.RectTransform.AbsoluteOffset = new Point(targetElement.Center.X, targetElement.Bottom); if (toolTipBlock.Rect.Right > GameMain.GraphicsWidth - 10) @@ -565,7 +564,6 @@ namespace Barotrauma RectTransform.LocalScale = startScale; yield return CoroutineStatus.Success; } - #endregion public virtual void ApplyStyle(GUIComponentStyle style) { diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs index 8ec9ebd84..5d3ed8c05 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs @@ -74,17 +74,9 @@ namespace Barotrauma public CrewManager(XElement element, bool isSinglePlayer) : this(isSinglePlayer) { - if (GameMain.Client != null) + foreach (XElement subElement in element.Elements()) { - //let the server create random conversations in MP - return; - } - List availableSpeakers = Character.CharacterList.FindAll(c => - c.AIController is HumanAIController && - !c.IsDead && - c.SpeechImpediment <= 100.0f); - pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers)); - } + if (subElement.Name.ToString().ToLowerInvariant() != "character") continue; var characterInfo = new CharacterInfo(subElement); characterInfos.Add(characterInfo); @@ -242,24 +234,12 @@ namespace Barotrauma public IEnumerable GetCharacters() { - if (characterInfos.Contains(characterInfo)) - { - DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace); - return; - } - - characterInfos.Add(characterInfo); + return characters; } public IEnumerable GetCharacterInfos() { - if (character == null) - { - DebugConsole.ThrowError("Tried to remove a null character from CrewManager.\n" + Environment.StackTrace); - return; - } - characters.Remove(character); - if (removeInfo) characterInfos.Remove(character.Info); + return characterInfos; } public void AddCharacter(Character character) @@ -633,183 +613,8 @@ namespace Barotrauma { characterListBox.BarScroll = roundedPos; } - var characterArea = new GUIButton(new RectTransform(new Point(characterInfoWidth, frame.Rect.Height), frame.RectTransform, Anchor.CenterLeft), style: "GUITextBox") - { - UserData = character, - Color = frame.Color, - SelectedColor = frame.SelectedColor, - HoverColor = frame.HoverColor, - ToolTip = characterToolTip - }; - var soundIcon = new GUIImage(new RectTransform(new Point((int)(characterArea.Rect.Height * 0.5f)), characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(5, 0) }, - "GUISoundIcon") - { - UserData = "soundicon", - CanBeFocused = false, - Visible = true - }; - soundIcon.Color = new Color(soundIcon.Color, 0.0f); - new GUIImage(new RectTransform(new Point((int)(characterArea.Rect.Height * 0.5f)), characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(5, 0) }, - "GUISoundIconDisabled") - { - UserData = "soundicondisabled", - CanBeFocused = true, - Visible = false - }; - - if (isSinglePlayer) - { - characterArea.OnClicked = CharacterClicked; - } - else - { - characterArea.CanBeFocused = false; - characterArea.CanBeSelected = false; - } - - var characterImage = new GUICustomComponent(new RectTransform(new Point(characterArea.Rect.Height), characterArea.RectTransform, Anchor.CenterLeft), - onDraw: (sb, component) => character.Info.DrawIcon(sb, component.Rect.Center.ToVector2(), targetAreaSize: component.Rect.Size.ToVector2())) - { - CanBeFocused = false, - HoverColor = Color.White, - SelectedColor = Color.White, - ToolTip = characterToolTip - }; - - var characterName = new GUITextBlock(new RectTransform(new Point(characterArea.Rect.Width - characterImage.Rect.Width - soundIcon.Rect.Width - 10, characterArea.Rect.Height), - characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(soundIcon.Rect.Width + 10, 0) }, - character.Name, textColor: frame.Color, font: GUI.SmallFont, wrap: true) - { - Color = frame.Color, - HoverColor = Color.Transparent, - SelectedColor = Color.Transparent, - CanBeFocused = false, - ToolTip = characterToolTip, - AutoScale = true - }; - - //---------------- order buttons ---------------- - - var orderButtonFrame = new GUILayoutGroup(new RectTransform(new Point(100, frame.Rect.Height), frame.RectTransform) - { AbsoluteOffset = new Point(characterInfoWidth + spacing, 0) }, - isHorizontal: true, childAnchor: Anchor.CenterLeft) - { - AbsoluteSpacing = (int)(10 * GUI.Scale), - UserData = "orderbuttons", - CanBeFocused = false - }; - - //listbox for holding the orders inappropriate for this character - //(so we can easily toggle their visibility) - var wrongOrderList = new GUIListBox(new RectTransform(new Point(50, orderButtonFrame.Rect.Height), orderButtonFrame.RectTransform), isHorizontal: true, style: null) - { - ScrollBarEnabled = false, - ScrollBarVisible = false, - Enabled = false, - Spacing = spacing, - ClampMouseRectToParent = false - }; - wrongOrderList.Content.ClampMouseRectToParent = false; - - for (int i = 0; i < orders.Count; i++) - { - var order = orders[i]; - if (order.TargetAllCharacters) continue; - - RectTransform btnParent = (i >= correctOrderCount + neutralOrderCount) ? - wrongOrderList.Content.RectTransform : - orderButtonFrame.RectTransform; - - var btn = new GUIButton(new RectTransform(new Point(iconSize, iconSize), btnParent, Anchor.CenterLeft), - style: null) - { - UserData = order - }; - - new GUIFrame(new RectTransform(new Vector2(1.5f), btn.RectTransform, Anchor.Center), "OuterGlow") - { - Color = Color.Lerp(order.Color, frame.Color, 0.5f) * 0.8f, - HoverColor = Color.Lerp(order.Color, frame.Color, 0.5f) * 1.0f, - PressedColor = Color.Lerp(order.Color, frame.Color, 0.5f) * 0.6f, - UserData = "selected", - CanBeFocused = false, - Visible = false - }; - - var img = new GUIImage(new RectTransform(Vector2.One, btn.RectTransform), order.Prefab.SymbolSprite); - img.Scale = iconSize / (float)img.SourceRect.Width; - img.Color = Color.Lerp(order.Color, frame.Color, 0.5f); - img.ToolTip = order.Name; - img.HoverColor = Color.Lerp(img.Color, Color.White, 0.5f); - - btn.OnClicked += (GUIButton button, object userData) => - { - if (Character.Controlled == null || Character.Controlled.SpeechImpediment >= 100.0f) return false; - - if (btn.GetChildByUserData("selected").Visible) - { - SetCharacterOrder(character, Order.PrefabList.Find(o => o.AITag == "dismissed"), null, Character.Controlled); - } - else - { - if (order.ItemComponentType != null || order.ItemIdentifiers.Length > 0 || order.Options.Length > 1) - { - CreateOrderTargetFrame(button, character, order); - } - else - { - SetCharacterOrder(character, order, null, Character.Controlled); - } - } - return true; - }; - btn.UserData = order; - btn.ToolTip = order.Name; - - //divider between different groups of orders - if (i == correctOrderCount - 1 || i == correctOrderCount + neutralOrderCount - 1) - { - //TODO: divider sprite - new GUIFrame(new RectTransform(new Point(8, iconSize), orderButtonFrame.RectTransform), style: "GUIButton"); - } - } - - var toggleWrongOrderBtn = new GUIButton(new RectTransform(new Point((int)(30 * GUI.Scale), wrongOrderList.Rect.Height), wrongOrderList.Content.RectTransform), - "", style: "UIToggleButton") - { - UserData = "togglewrongorder", - CanBeFocused = false - }; - - wrongOrderList.RectTransform.NonScaledSize = new Point( - wrongOrderList.Content.Children.Sum(c => c.Rect.Width + wrongOrderList.Spacing), - wrongOrderList.RectTransform.NonScaledSize.Y); - wrongOrderList.RectTransform.SetAsLastChild(); - - new GUIFrame(new RectTransform(new Point( - wrongOrderList.Rect.Width - toggleWrongOrderBtn.Rect.Width - wrongOrderList.Spacing * 2, - wrongOrderList.Rect.Height), wrongOrderList.Content.RectTransform), - style: null) - { - CanBeFocused = false - }; - - //scale to fit the content - orderButtonFrame.RectTransform.NonScaledSize = new Point( - orderButtonFrame.Children.Sum(c => c.Rect.Width + orderButtonFrame.AbsoluteSpacing), - orderButtonFrame.RectTransform.NonScaledSize.Y); - - frame.RectTransform.NonScaledSize = new Point( - characterInfoWidth + spacing + (orderButtonFrame.Rect.Width - wrongOrderList.Rect.Width), - frame.RectTransform.NonScaledSize.Y); - - characterListBox.RectTransform.NonScaledSize = new Point( - characterListBox.Content.Children.Max(c => c.Rect.Width) + wrongOrderList.Rect.Width, - characterListBox.RectTransform.NonScaledSize.Y); - characterListBox.Content.RectTransform.NonScaledSize = characterListBox.RectTransform.NonScaledSize; - characterListBox.UpdateScrollBarSize(); - return frame; + return false; } private IEnumerable KillCharacterAnim(GUIComponent component) @@ -953,12 +758,6 @@ namespace Barotrauma } return; } - List availableSpeakers = Character.CharacterList.FindAll(c => - c.AIController is HumanAIController && - !c.IsDead && - c.SpeechImpediment <= 100.0f); - pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers)); - } character.SetOrder(order, option, orderGiver, speak: orderGiver != character); if (IsSinglePlayer) @@ -1016,22 +815,6 @@ namespace Barotrauma } } } - - character.SetOrder(order, option, orderGiver, speak: orderGiver != character); - if (IsSinglePlayer) - { - orderGiver?.Speak( - order.GetChatMessage(character.Name, orderGiver.CurrentHull?.DisplayName, givingOrderToSelf: character == orderGiver, orderOption: option), null); - } - else if (orderGiver != null) - { - OrderChatMessage msg = new OrderChatMessage(order, option, order.TargetItemComponent?.Item, character, orderGiver); - if (GameMain.Client != null) - { - GameMain.Client.SendChatMessage(msg); - } - } - DisplayCharacterOrder(character, order); } /// 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/GameSettings.cs b/Barotrauma/BarotraumaClient/Source/GameSettings.cs index 958f79b67..017a3e7e9 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSettings.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSettings.cs @@ -714,7 +714,10 @@ namespace Barotrauma } }; - GUITextBlock.AutoScaleAndNormalize(defaultBindingsButton.TextBlock, legacyBindingsButton.TextBlock); + legacyBindingsButton.TextBlock.RectTransform.SizeChanged += () => + { + GUITextBlock.AutoScaleAndNormalize(defaultBindingsButton.TextBlock, legacyBindingsButton.TextBlock); + }; //spacing new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), generalLayoutGroup.RectTransform), style: null); diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs index 3891c990c..d6958531c 100644 --- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs +++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs @@ -385,7 +385,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; @@ -531,6 +531,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/Item.cs b/Barotrauma/BarotraumaClient/Source/Items/Item.cs index 2c5e3b5cc..a155700b2 100644 --- a/Barotrauma/BarotraumaClient/Source/Items/Item.cs +++ b/Barotrauma/BarotraumaClient/Source/Items/Item.cs @@ -562,6 +562,7 @@ namespace Barotrauma } }; itemEditor.AddCustomContent(buttonContainer, itemEditor.ContentCount); + GUITextBlock.AutoScaleAndNormalize(buttonContainer.Children.Select(b => ((GUIButton)b).TextBlock)); } foreach (ItemComponent ic in components) diff --git a/Barotrauma/BarotraumaClient/Source/Map/Map/Map.cs b/Barotrauma/BarotraumaClient/Source/Map/Map/Map.cs index 45a0a836b..60b8d1c41 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 405b37b66..9cd0d9ac0 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs @@ -16,233 +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; @@ -250,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/MainMenuScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs index 5f2ceaa59..0f4afe59a 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; @@ -765,8 +764,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 @@ -842,7 +839,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/ServerListScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs index f4212dc18..cbbdff396 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs @@ -60,7 +60,10 @@ namespace Barotrauma var infoHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), leftColumn.RectTransform)) { RelativeSpacing = 0.05f }; new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), infoHolder.RectTransform, Anchor.Center), TextManager.Get("JoinServer"), font: GUI.LargeFont) - { ForceUpperCase = true }; + { + ForceUpperCase = true, + AutoScale = true + }; new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoHolder.RectTransform), TextManager.Get("YourName")); clientNameBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.13f), infoHolder.RectTransform), "") diff --git a/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs index dbccf83db..02f1af9fc 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs @@ -257,12 +257,12 @@ namespace Barotrauma saveAssemblyFrame = new GUIFrame(new RectTransform(new Vector2(0.08f, 0.5f), TopPanel.RectTransform, Anchor.BottomLeft, Pivot.TopLeft) - { MinSize = new Point(180, 40), AbsoluteOffset = new Point(LeftPanel.Rect.Width + hullVolumeFrame.Rect.Width, 0) }, "InnerFrame") + { MinSize = new Point(200, 40), AbsoluteOffset = new Point(LeftPanel.Rect.Width + hullVolumeFrame.Rect.Width, 0) }, "InnerFrame") { Visible = false }; var saveAssemblyButton = new GUIButton(new RectTransform(new Vector2(0.9f, 0.8f), saveAssemblyFrame.RectTransform, Anchor.Center), TextManager.Get("SaveItemAssembly")); - saveAssemblyFrame.Font = GUI.SmallFont; + saveAssemblyButton.TextBlock.AutoScale = true; saveAssemblyButton.OnClicked += (btn, userdata) => { CreateSaveAssemblyScreen(); 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/IndoorsSteeringManager.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs index 85ab3c1e3..277a8b54c 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs @@ -2,7 +2,6 @@ using Microsoft.Xna.Framework; using System; using System.Linq; -using Barotrauma.Extensions; namespace Barotrauma { @@ -368,11 +367,7 @@ namespace Barotrauma //toggle the door if it's the previous node and open, or if it's current node and closed if (door.IsOpen != shouldBeOpen) { - var buttons = door.Item.GetComponents(); - if (buttons.None()) - { - buttons = door.Item.GetConnectedComponents(true); - } + var buttons = door.Item.GetConnectedComponents(true); Controller closestButton = null; float closestDist = 0.0f; diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs index faaf2cf72..9a443557d 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs @@ -2,7 +2,6 @@ using Microsoft.Xna.Framework; using System.Collections.Generic; using System.Linq; -using Barotrauma.Extensions; namespace Barotrauma { diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Order.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Order.cs index 7389aefbe..5557df830 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Order.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Order.cs @@ -4,8 +4,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Xml.Linq; -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/Map/Submarine.cs b/Barotrauma/BarotraumaShared/Source/Map/Submarine.cs index 0cb0320ed..b8ccb1b25 100644 --- a/Barotrauma/BarotraumaShared/Source/Map/Submarine.cs +++ b/Barotrauma/BarotraumaShared/Source/Map/Submarine.cs @@ -1432,7 +1432,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