(683b11c00) High-res shuttle preview images + merge fix

2019-05-16 07:05:08 +03:00
parent 5438a65852
commit f605651966
43 changed files with 34 additions and 3476 deletions
@@ -149,7 +149,6 @@ namespace Barotrauma
                            character.MemLocalState[i].TransformOutToInside(currentHull.Submarine);
                        }
                    }
-
                }

                if (character.MemState.Count < 1) return;
@@ -164,14 +164,8 @@ namespace Barotrauma
                        break;
                }
            }
-        }

-        partial void UpdateLimbLightSource(Limb limb)
-        {
-            if (limb.LightSource != null)
-            {
-                limb.LightSource.Enabled = enabled;
-            }
+            hudProgressBars = new Dictionary<object, HUDProgressBar>();
        }

        partial void UpdateLimbLightSource(Limb limb)
@@ -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)
            {
@@ -292,7 +292,6 @@ namespace Barotrauma
                    if (!string.IsNullOrWhiteSpace(damageModifier.DamageSound))
                    {
                        damageSoundType = damageModifier.DamageSound;
-                        SoundPlayer.PlayDamageSound(damageSoundType, Math.Max(damage, bleedingDamage), WorldPosition);
                        break;
                    }
                }
@@ -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)
        {
@@ -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);
@@ -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<Character> GetCharacters()
        {
-            return characterListBox.Rect;
+            return characters;
        }

        public IEnumerable<CharacterInfo> 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<object> KillCharacterAnim(GUIComponent component)
@@ -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;
                }
            }

@@ -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)))
@@ -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)
        {
@@ -271,7 +271,7 @@ namespace Barotrauma.Items.Components
                        }
                    }
                }
-            }            
+            }

            if (highlighted != null)
            {
@@ -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
@@ -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)
                    {
@@ -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<Submarine, string, string> StartNewGame;
        public Action<string> LoadGame;
-        public bool TutorialSelected
-        {
-            get
-            {
-                if (contextualTutorialBox == null) return false;
-                return contextualTutorialBox.Selected;
-            }
-        }

        private readonly bool isMultiplayer;

@@ -131,9 +131,6 @@ namespace Barotrauma
            {
                GameMain.Instance.ShowEditorDisclaimer();
            }
-            OpenDoors();
-            GameMain.Instance.OnResolutionChanged += OnResolutionChanged;
-            instance = this;
        }

        private void ResetVariables()
@@ -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();
        }

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