(9edcbf86d) Added: More prominent graphics for when a tutorial objective is completed

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs

@@ -392,10 +392,18 @@ namespace Barotrauma.Tutorials
         {
             objective.IsTriggered = true;
 
-            RectTransform rectT = new RectTransform(new Point((int)GUI.CheckmarkIcon.size.X, (int)GUI.CheckmarkIcon.size.Y), objective.ReplayButton.RectTransform, Anchor.BottomLeft, Pivot.BottomLeft);
+            int checkMarkHeight = (int)(objective.ReplayButton.Rect.Height * 1.2f);
-            rectT.AbsoluteOffset = new Point(-rectT.Rect.Width - 5, 0);
+            int checkMarkWidth = (int)(checkMarkHeight * 0.93f);
-            GUIImage checkmark = new GUIImage(rectT, GUI.CheckmarkIcon);
+
-            checkmark.Color = Color.Green;
+            Color color = new Color(4, 180, 108);
+            RectTransform rectTA = new RectTransform(new Point(checkMarkWidth, checkMarkHeight), objective.ReplayButton.RectTransform, Anchor.BottomLeft, Pivot.BottomLeft);
+            rectTA.AbsoluteOffset = new Point(-rectTA.Rect.Width - 5, 0);
+            GUIImage checkmark = new GUIImage(rectTA, "CheckMark");
+            checkmark.Color = color;
+
+            RectTransform rectTB = new RectTransform(new Vector2(1.1f, .8f), objective.LinkedText.RectTransform, Anchor.Center, Pivot.Center);
+            GUIImage stroke = new GUIImage(rectTB, "Stroke");
+            stroke.Color = color;
 
             CoroutineManager.StartCoroutine(WaitForObjectiveEnd(objective));
         }

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs

@@ -107,10 +107,7 @@ namespace Barotrauma.Items.Components
             {
                 var warningBtn = new GUIButton(new RectTransform(new Point(buttonWidth, buttonHeight), columnLeft.RectTransform)
                 { AbsoluteOffset = new Point((i % buttonsPerRow) * (buttonWidth + spacing), (int)Math.Floor(i / (float)buttonsPerRow) * (buttonHeight + spacing)) },
-                    TextManager.Get(warningTexts[i]), style: "IndicatorButton")
+                    TextManager.Get(warningTexts[i]), style: "IndicatorButton");
-                {
-                    CanBeFocused = false
-                };
 
                 var btnText = warningBtn.GetChild<GUITextBlock>();
                 btnText.Font = GUI.SmallFont;

Barotrauma/BarotraumaShared/SharedContent.projitems

@@ -381,6 +381,9 @@
     <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\8_Approach1\BaroTutorial_Approach.mp4">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Content\UI\tutorialAtlas.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="$(MSBuildThisFileDirectory)Content\Fonts\BebasNeue-Regular.otf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs

@@ -155,7 +155,7 @@ namespace Barotrauma.Items.Components
         {
             if (item.Container != null) { return false; }
 
-            if (AutoInteractWithContained && character.SelectedConstruction == null)
+            if (AutoInteractWithContained)
             {
                 foreach (Item contained in Inventory.Items)
                 {

Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs

@@ -686,6 +686,39 @@ namespace Barotrauma
 
             AllowedLinks = element.GetAttributeStringArray("allowedlinks", new string[0], convertToLowerInvariant: true).ToList();
 
+            if (sprite == null)
+            {
+                DebugConsole.ThrowError("Item \"" + Name + "\" has no sprite!");
+#if SERVER
+                sprite = new Sprite("", Vector2.Zero);
+                sprite.SourceRect = new Rectangle(0, 0, 32, 32);
+#else
+                sprite = new Sprite(TextureLoader.PlaceHolderTexture, null, null)
+                {
+                    Origin = TextureLoader.PlaceHolderTexture.Bounds.Size.ToVector2() / 2
+                };
+#endif
+                size = sprite.size;
+                sprite.EntityID = identifier;
+            }
+            
+            if (!category.HasFlag(MapEntityCategory.Legacy) && string.IsNullOrEmpty(identifier))
+            {
+                DebugConsole.ThrowError(
+                    "Item prefab \"" + name + "\" has no identifier. All item prefabs have a unique identifier string that's used to differentiate between items during saving and loading.");
+            }
+            if (!string.IsNullOrEmpty(identifier))
+            {
+                MapEntityPrefab existingPrefab = List.Find(e => e.Identifier == identifier);
+                if (existingPrefab != null)
+                {
+                    DebugConsole.ThrowError(
+                        "Map entity prefabs \"" + name + "\" and \"" + existingPrefab.Name + "\" have the same identifier!");
+                }
+            }
+
+            AllowedLinks = element.GetAttributeStringArray("allowedlinks", new string[0], convertToLowerInvariant: true).ToList();
+
             List.Add(this);
         }