(f0d812055) v0.9.9.0

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

@@ -134,7 +134,7 @@ namespace Barotrauma
             foreach (PurchasedItem pi in CargoManager.PurchasedItems)
             {
                 msg.Write(pi.ItemPrefab.Identifier);
-                msg.Write((UInt16)pi.Quantity);
+                msg.WriteRangedInteger(pi.Quantity, 0, 100);
             }
         }
 
@@ -162,7 +162,7 @@ namespace Barotrauma
             for (int i = 0; i < purchasedItemCount; i++)
             {
                 string itemPrefabIdentifier = msg.ReadString();
-                UInt16 itemQuantity = msg.ReadUInt16();
+                int itemQuantity = msg.ReadRangedInteger(0, CargoManager.MaxQuantity);
                 purchasedItems.Add(new PurchasedItem(ItemPrefab.Prefabs[itemPrefabIdentifier], itemQuantity));
             }
 

Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/SinglePlayerCampaign.cs

@@ -276,7 +276,11 @@ namespace Barotrauma
                     c.SaveInventory(c.Inventory, inventoryElement);
                     c.Info.InventoryData = inventoryElement;
                     c.Inventory?.DeleteAllItems();
+                    c.ResetCurrentOrder();
                 }
+
+                GameMain.GameSession.SubmarineInfo = new SubmarineInfo(GameMain.GameSession.Submarine);
+
                 SaveUtil.SaveGame(GameMain.GameSession.SavePath);
             }
 

Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/SubTestMode.cs

@@ -0,0 +1,80 @@
+using Barotrauma.Tutorials;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Barotrauma
+{
+    class SubTestMode : GameMode
+    {
+        public SubTestMode(GameModePreset preset, object param)
+            : base(preset, param)
+        {
+            foreach (JobPrefab jobPrefab in JobPrefab.Prefabs)
+            {
+                for (int i = 0; i < jobPrefab.InitialCount; i++)
+                {
+                    var variant = Rand.Range(0, jobPrefab.Variants);
+                    CrewManager.AddCharacterInfo(new CharacterInfo(CharacterPrefab.HumanSpeciesName, jobPrefab: jobPrefab, variant: variant));
+                }
+            }
+        }
+
+        public override void Start()
+        {
+            base.Start();
+            
+            isRunning = true;
+            CrewManager.InitSinglePlayerRound();
+
+            Submarine.MainSub.SetPosition(Vector2.Zero);
+        }
+
+        public override void Draw(SpriteBatch spriteBatch)
+        {
+            if (!isRunning|| GUI.DisableHUD || GUI.DisableUpperHUD) return;
+            
+            if (Submarine.MainSub == null) return;
+        }
+
+        public override void AddToGUIUpdateList()
+        {
+            if (!isRunning) return;
+
+            base.AddToGUIUpdateList();
+            CrewManager.AddToGUIUpdateList();
+        }
+
+        public override void Update(float deltaTime)
+        {
+            if (!isRunning) { return; }
+
+            base.Update(deltaTime);
+        }
+
+        public override void End(string endMessage = "")
+        {
+            isRunning = false;
+
+            GameMain.GameSession.EndRound("");
+
+            CrewManager.EndRound();
+
+            Submarine.Unload();
+            
+            GameMain.SubEditorScreen.Select();
+        }
+
+        private bool EndRound(Submarine leavingSub)
+        {
+            isRunning = false;
+
+            End("");
+            
+            return true;
+        }
+    }
+}

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

@@ -246,7 +246,7 @@ namespace Barotrauma.Tutorials
             {
                 //captain_navConsoleCustomInterface.HighlightElement(0, uiHighlightColor, duration: 1.0f, pulsateAmount: 0.0f);
                 yield return new WaitForSeconds(1.0f, false);
-            } while (!Submarine.MainSub.AtEndPosition || Submarine.MainSub.DockedTo.Any());
+            } while (!Submarine.MainSub.AtEndPosition || !Submarine.MainSub.DockedTo.Any());
             RemoveCompletedObjective(segments[6]);
             yield return new WaitForSeconds(3f, false);
             GameMain.GameSession?.CrewManager.AddSinglePlayerChatMessage(radioSpeakerName, TextManager.GetWithVariable("Captain.Radio.Complete", "[OUTPOSTNAME]", GameMain.GameSession.EndLocation.Name), ChatMessageType.Radio, null);
@@ -284,7 +284,9 @@ namespace Barotrauma.Tutorials
 
         private bool IsSelectedItem(Item item)
         {
-            return captain?.SelectedConstruction == item;
+            return 
+                captain?.SelectedConstruction == item || 
+                (captain?.SelectedConstruction?.linkedTo?.Contains(item) ?? false);
         }
     }
 }

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

@@ -156,7 +156,7 @@ namespace Barotrauma.Tutorials
             //yield return new WaitForSeconds(2.5f);
 
             doctor.SetStun(1.5f);
-            var explosion = new Explosion(range: 100, force: 10, damage: 0, structureDamage: 0);
+            var explosion = new Explosion(range: 100, force: 10, damage: 0, structureDamage: 0, itemDamage: 0);
             explosion.DisableParticles();
             GameMain.GameScreen.Cam.Shake = shakeAmount;
             explosion.Explode(Character.Controlled.WorldPosition - Vector2.UnitX * 25, null);

Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/Tutorials/ScenarioTutorial.cs

@@ -21,8 +21,8 @@ namespace Barotrauma.Tutorials
         private string levelSeed;
         private string levelParams;
 
-        private Submarine startOutpost = null;
-        private Submarine endOutpost = null;
+        private SubmarineInfo startOutpost = null;
+        private SubmarineInfo endOutpost = null;
         private bool currentTutorialCompleted = false;
         private float fadeOutTime = 3f;
         protected float waitBeforeFade = 4f;
@@ -56,13 +56,13 @@ namespace Barotrauma.Tutorials
 
         private IEnumerable<object> Loading()
         {
-            Submarine.MainSub = Submarine.Load(submarinePath, "", true);
+            SubmarineInfo subInfo = new SubmarineInfo(submarinePath);
 
             LevelGenerationParams generationParams = LevelGenerationParams.LevelParams.Find(p => p.Name == levelParams);
 
             yield return CoroutineStatus.Running;
 
-            GameMain.GameSession = new GameSession(Submarine.MainSub, "",
+            GameMain.GameSession = new GameSession(subInfo, "",
                 GameModePreset.List.Find(g => g.Identifier == "tutorial"));
             (GameMain.GameSession.GameMode as TutorialMode).Tutorial = this;
 
@@ -72,12 +72,12 @@ namespace Barotrauma.Tutorials
 
                 if (startOutpostPath != string.Empty)
                 {
-                    startOutpost = Submarine.Load(startOutpostPath, "", false);
+                    startOutpost = new SubmarineInfo(startOutpostPath);
                 }
 
                 if (endOutpostPath != string.Empty)
                 {
-                    endOutpost = Submarine.Load(endOutpostPath, "", false);
+                    endOutpost = new SubmarineInfo(endOutpostPath);
                 }
 
                 Level tutorialLevel = new Level(levelSeed, 0, 0, generationParams, biome, startOutpost, endOutpost);
@@ -160,11 +160,11 @@ namespace Barotrauma.Tutorials
                 switch (this.spawnSub)
                 {
                     case "startoutpost":
-                        spawnSub = startOutpost;
+                        spawnSub = Level.Loaded.StartOutpost;
                         break;
 
                     case "endoutpost":
-                        spawnSub = endOutpost;
+                        spawnSub = Level.Loaded.EndOutpost;
                         break;
 
                     default:

Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/Tutorials/Tutorial.cs

@@ -533,15 +533,15 @@ namespace Barotrauma.Tutorials
                 titleBlock.RectTransform.IsFixedSize = true;
             }
 
-            List<ColorData> colorData = ColorData.GetColorData(text, out text);
+            List<RichTextData> richTextData = RichTextData.GetRichTextData(text, out text);
             GUITextBlock textBlock;
-            if (colorData == null)
+            if (richTextData == null)
             {
                 textBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoContent.RectTransform), " " + text, wrap: true);
             }
             else
             {
-                textBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoContent.RectTransform), colorData, " " + text, wrap: true);
+                textBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoContent.RectTransform), richTextData, " " + text, wrap: true);
             }
 
             textBlock.RectTransform.IsFixedSize = true;