(f2e516dfe) v0.9.3.2

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

@@ -199,6 +199,7 @@ namespace Barotrauma.Tutorials
             SetHighlight(captain_navConsole.Item, true);
             SetHighlight(captain_sonar.Item, true);
             SetHighlight(captain_statusMonitor, true);
+            captain_navConsole.UseAutoDocking = false;
             do
             {
                 //captain_navConsoleCustomInterface.HighlightElement(0, uiHighlightColor, duration: 1.0f, pulsateAmount: 0.0f);
@@ -221,6 +222,7 @@ namespace Barotrauma.Tutorials
             } while (captain_sonar.CurrentMode != Sonar.Mode.Active);
             do { yield return null; } while (Vector2.Distance(Submarine.MainSub.WorldPosition, Level.Loaded.EndPosition) > 4000f);
             RemoveCompletedObjective(segments[5]);
+            captain_navConsole.UseAutoDocking = true;
             yield return new WaitForSeconds(4f, false);
             TriggerTutorialSegment(6); // Docking
             do

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

@@ -256,6 +256,7 @@ namespace Barotrauma.Tutorials
             GameMain.GameSession.CrewManager.AddCharacter(doctor);
             GameMain.GameSession.CrewManager.AddCharacter(patient1);
             GameMain.GameSession.CrewManager.ToggleCrewAreaOpen = true;
+            patient1.CharacterHealth.UseHealthWindow = false;
 
             yield return new WaitForSeconds(3.0f, false);
             patient1.AIController.Enabled = true;
@@ -277,6 +278,7 @@ namespace Barotrauma.Tutorials
             RemoveCompletedObjective(segments[3]);
             SetHighlight(doctor_medBayCabinet.Item, true);
             SetDoorAccess(doctor_thirdDoor, doctor_thirdDoorLight, true);
+            patient1.CharacterHealth.UseHealthWindow = true;
 
             yield return new WaitForSeconds(2.0f, false);
 

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

@@ -169,7 +169,9 @@ namespace Barotrauma.Tutorials
             }
 
             engineer_wire_1 = Item.ItemList.Find(i => i.HasTag("engineer_wire_1"));
+            engineer_wire_1.SpriteColor = Color.Transparent;
             engineer_wire_2 = Item.ItemList.Find(i => i.HasTag("engineer_wire_2"));
+            engineer_wire_2.SpriteColor = Color.Transparent;
             engineer_lamp_1 = Item.ItemList.Find(i => i.HasTag("engineer_lamp_1")).GetComponent<Powered>();
             engineer_lamp_2 = Item.ItemList.Find(i => i.HasTag("engineer_lamp_2")).GetComponent<Powered>();
             engineer_fourthDoor = Item.ItemList.Find(i => i.HasTag("engineer_fourthdoor")).GetComponent<Door>();
@@ -416,6 +418,8 @@ namespace Barotrauma.Tutorials
             do { CheckJunctionBoxHighlights(); yield return null; } while (!engineer_submarineJunctionBox_1.IsFullCondition || !engineer_submarineJunctionBox_2.IsFullCondition || !engineer_submarineJunctionBox_3.IsFullCondition);
             CheckJunctionBoxHighlights();
             RemoveCompletedObjective(segments[4]);
+            yield return new WaitForSeconds(2f, false);
+
             TriggerTutorialSegment(5); // Powerup reactor
             SetHighlight(engineer_submarineReactor.Item, true);
             engineer.AddActiveObjectiveEntity(engineer_submarineReactor.Item, engineer_reactorIcon, engineer_reactorIconColor);
@@ -425,6 +429,8 @@ namespace Barotrauma.Tutorials
             RemoveCompletedObjective(segments[5]);
             GameMain.GameSession.CrewManager.AddSinglePlayerChatMessage(radioSpeakerName, TextManager.Get("Engineer.Radio.Complete"), ChatMessageType.Radio, null);
 
+            yield return new WaitForSeconds(4f, false);
+
             CoroutineManager.StartCoroutine(TutorialCompleted());
         }
 
@@ -472,17 +478,31 @@ namespace Barotrauma.Tutorials
 
         private void CheckGhostWires()
         {
-            if (engineer_wire_1 != null && engineer_lamp_1.Voltage > engineer_lamp_1.MinVoltage)
+            Color wireColor = 
+                Color.Orange *
+                    MathHelper.Lerp(0.25f, 0.75f, (float)(Math.Sin((Timing.TotalTime * 4.0f)) + 1.0f) / 2.0f);
+
+            if (engineer_wire_1 != null)
             {
-                engineer_wire_1.Remove();
-                engineer_wire_1 = null;
+                engineer_wire_1.SpriteColor = wireColor;
+                if (engineer_lamp_1.Voltage > engineer_lamp_1.MinVoltage)
+                {
+                    engineer_wire_1.Remove();
+                    engineer_wire_1 = null;
+                }
             }
 
-            if (engineer_wire_2 != null && engineer_lamp_2.Voltage > engineer_lamp_2.MinVoltage)
+
+            if (engineer_wire_2 != null)
             {
-                engineer_wire_2.Remove();
-                engineer_wire_2 = null;
+                engineer_wire_2.SpriteColor = wireColor;
+                if (engineer_lamp_2.Voltage > engineer_lamp_2.MinVoltage)
+                {
+                    engineer_wire_2.Remove();
+                    engineer_wire_2 = null;
+                }
             }
+
         }
 
         private void HandleJunctionBoxWiringHighlights()

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

@@ -526,6 +526,8 @@ namespace Barotrauma.Tutorials
             mechanic.AddActiveObjectiveEntity(mechanic_brokenWall_2, mechanic_weldIcon, mechanic_repairIconColor);
             do { yield return null; } while (WallHasDamagedSections(mechanic_brokenWall_2));
             mechanic.RemoveActiveObjectiveEntity(mechanic_brokenWall_2);
+            yield return new WaitForSeconds(2f, false);
+
             TriggerTutorialSegment(9, GameMain.Config.KeyBind(InputType.Use)); // Repairing machinery (pump)
             SetHighlight(mechanic_brokenPump.Item, true);
             mechanic_brokenPump.CanBeSelected = true;

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

@@ -373,7 +373,7 @@ namespace Barotrauma.Tutorials
                     HighlightInventorySlot(officer.Inventory, "harpoongun", highlightColor, 0.5f, 0.5f, 0f);
                 }
                 yield return null;
-            } while (!harpoonGunChamber.Inventory.IsFull()); // Wait until all five harpons loaded
+            } while (!harpoonGunChamber.Inventory.IsFull()); // Wait until all six harpoons loaded
             RemoveCompletedObjective(segments[5]);
             SetHighlight(officer_rangedWeaponCabinet.Item, false);
             SetDoorAccess(officer_fourthDoor, officer_fourthDoorLight, true);