(a00338777) v0.9.2.1

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/CampaignMode.cs

@@ -0,0 +1,18 @@
+using Microsoft.Xna.Framework;
+using Barotrauma.Networking;
+
+namespace Barotrauma
+{
+    abstract partial class CampaignMode : GameMode
+    {
+        public override void ShowStartMessage()
+        {
+            if (Mission == null) return;
+
+            new GUIMessageBox(Mission.Name, Mission.Description, new Vector2(0.25f, 0.0f), new Point(400, 200))
+            {
+                UserData = "missionstartmessage"
+            };
+        }
+    }
+}

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -1,5 +1,4 @@
 using Barotrauma.Networking;
-using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -10,6 +9,8 @@ namespace Barotrauma
 {
     partial class MultiPlayerCampaign : CampaignMode
     {
+        public bool SuppressStateSending = false;
+
         private UInt16 startWatchmanID, endWatchmanID;
 
         public static GUIComponent StartCampaignSetup( IEnumerable<Submarine> submarines, IEnumerable<string> saveFiles)
@@ -129,7 +130,7 @@ namespace Barotrauma
             }
         }
 
-        public void ClientWrite(NetBuffer msg)
+        public void ClientWrite(IWriteMessage msg)
         {
             System.Diagnostics.Debug.Assert(map.Locations.Count < UInt16.MaxValue);
 
@@ -147,7 +148,7 @@ namespace Barotrauma
         }
 
         //static because we may need to instantiate the campaign if it hasn't been done yet
-        public static void ClientRead(NetBuffer msg)
+        public static void ClientRead(IReadMessage msg)
         {
             byte campaignID = msg.ReadByte();
             UInt16 updateID = msg.ReadUInt16();
@@ -213,6 +214,8 @@ namespace Barotrauma
             
             if (NetIdUtils.IdMoreRecent(updateID, campaign.lastUpdateID))
             {
+                campaign.SuppressStateSending = true;
+
                 campaign.Map.SetLocation(currentLocIndex == UInt16.MaxValue ? -1 : currentLocIndex);
                 campaign.Map.SelectLocation(selectedLocIndex == UInt16.MaxValue ? -1 : selectedLocIndex);
                 campaign.Map.SelectMission(selectedMissionIndex);
@@ -236,6 +239,8 @@ namespace Barotrauma
                 }
 
                 campaign.lastUpdateID = updateID;
+
+                campaign.SuppressStateSending = false;
             }
         }
 

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

@@ -218,7 +218,7 @@ namespace Barotrauma.Tutorials
                     }
                 }
                 yield return null;
-            } while (!captain_sonar.IsActive);
+            } while (captain_sonar.CurrentMode != Sonar.Mode.Active);
             do { yield return null; } while (Vector2.Distance(Submarine.MainSub.WorldPosition, Level.Loaded.EndPosition) > 4000f);
             RemoveCompletedObjective(segments[5]);
             yield return new WaitForSeconds(4f, false);

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

@@ -73,6 +73,7 @@ namespace Barotrauma.Tutorials
         private Character mechanic;
         private Sprite mechanic_repairIcon;
         private Color mechanic_repairIconColor;
+        private Sprite mechanic_weldIcon;
 
         public MechanicTutorial(XElement element) : base(element)
         {
@@ -97,6 +98,7 @@ namespace Barotrauma.Tutorials
             var repairOrder = Order.PrefabList.Find(order => order.AITag == "repairsystems");
             mechanic_repairIcon = repairOrder.SymbolSprite;
             mechanic_repairIconColor = repairOrder.Color;
+            mechanic_weldIcon = new Sprite("Content/UI/IconAtlas.png", new Rectangle(1, 256, 127, 127), new Vector2(0.5f, 0.5f));
 
             // Other tutorial items
             tutorial_securityFinalDoorLight = Item.ItemList.Find(i => i.HasTag("tutorial_securityfinaldoorlight")).GetComponent<LightComponent>();
@@ -309,7 +311,7 @@ namespace Barotrauma.Tutorials
                 yield return null;
             } while (!mechanic.HasEquippedItem("divingmask") || !mechanic.HasEquippedItem("weldingtool")); // Wait until equipped
             SetDoorAccess(mechanic_secondDoor, mechanic_secondDoorLight, true);
-            mechanic.AddActiveObjectiveEntity(mechanic_brokenWall_1, mechanic_repairIcon, mechanic_repairIconColor);
+            mechanic.AddActiveObjectiveEntity(mechanic_brokenWall_1, mechanic_weldIcon, mechanic_repairIconColor);
             do { yield return null; } while (WallHasDamagedSections(mechanic_brokenWall_1)); // Highlight until repaired
             mechanic.RemoveActiveObjectiveEntity(mechanic_brokenWall_1);
             RemoveCompletedObjective(segments[2]);
@@ -443,10 +445,10 @@ namespace Barotrauma.Tutorials
                         {
                             HighlightInventorySlot(mechanic_fabricator.OutputContainer.Inventory, "extinguisher", highlightColor, .5f, .5f, 0f);
 
-                            for (int i = 0; i < mechanic.Inventory.slots.Length; i++)
+                            /*for (int i = 0; i < mechanic.Inventory.slots.Length; i++)
                             {
                                 if (mechanic.Inventory.Items[i] == null) HighlightInventorySlot(mechanic.Inventory, i, highlightColor, .5f, .5f, 0f);
-                            }
+                            }*/
                         }
                         else if (mechanic_fabricator.InputContainer.Inventory.FindItemByIdentifier("aluminium") != null && mechanic_fabricator.InputContainer.Inventory.FindItemByIdentifier("sodium") != null && !mechanic_fabricator.IsActive)
                         {
@@ -521,7 +523,7 @@ namespace Barotrauma.Tutorials
             SetDoorAccess(tutorial_mechanicFinalDoor, tutorial_mechanicFinalDoorLight, true);
 
             // Room 7
-            mechanic.AddActiveObjectiveEntity(mechanic_brokenWall_2, mechanic_repairIcon, mechanic_repairIconColor);
+            mechanic.AddActiveObjectiveEntity(mechanic_brokenWall_2, mechanic_weldIcon, mechanic_repairIconColor);
             do { yield return null; } while (WallHasDamagedSections(mechanic_brokenWall_2));
             mechanic.RemoveActiveObjectiveEntity(mechanic_brokenWall_2);
             TriggerTutorialSegment(9, GameMain.Config.KeyBind(InputType.Use)); // Repairing machinery (pump)

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

@@ -305,10 +305,17 @@ namespace Barotrauma.Tutorials
             do
             {
                 float distance = Vector2.Distance(officer_coilgunPeriscope.WorldPosition, officer_hammerhead.WorldPosition);
+                if (distance > originalDistance * 1.5f)
+                {
+                    // Don't let the Hammerhead go too far.
+                    officer_hammerhead.TeleportTo(officer_hammerheadSpawnPos + new Vector2(0, -1000));
+                }
                 if (distance > originalDistance)
                 {
-                    // Don't let the Hammerhead go too far from the periscope.
-                    officer_hammerhead.TeleportTo(officer_hammerheadSpawnPos);
+                    // Ensure that the Hammerhead targets the player
+                    officer_hammerhead.AIController.SelectTarget(officer.AiTarget);
+                    var ai = officer_hammerhead.AIController as EnemyAIController;
+                    ai.sight = 2.0f;
                 }
                 yield return null;
             }