(d9829ac) v0.9.4.0

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

@@ -13,7 +13,7 @@ namespace Barotrauma
         public bool CheatsEnabled;
 
         const int InitialMoney = 8700;
-        public const int HullRepairCost = 500, ItemRepairCost = 500;
+        public const int HullRepairCost = 500, ItemRepairCost = 500, ShuttleReplaceCost = 1000;
 
         protected bool watchmenSpawned;
         protected Character startWatchman, endWatchman;
@@ -21,7 +21,7 @@ namespace Barotrauma
         //key = dialog flag, double = Timing.TotalTime when the line was last said
         private Dictionary<string, double> dialogLastSpoken = new Dictionary<string, double>();
 
-        public bool PurchasedHullRepairs, PurchasedItemRepairs;
+        public bool PurchasedHullRepairs, PurchasedLostShuttles, PurchasedItemRepairs;
 
         protected Map map;
         public Map Map
@@ -83,7 +83,7 @@ namespace Barotrauma
                     {
                         for (int i = 0; i < wall.SectionCount; i++)
                         {
-                            wall.AddDamage(i, -100000.0f);
+                            wall.AddDamage(i, -wall.Prefab.Health);
                         }
                     }
                 }
@@ -104,6 +104,7 @@ namespace Barotrauma
                 }
                 PurchasedItemRepairs = false;
             }
+            PurchasedLostShuttles = false;
         }
 
         public override void Update(float deltaTime)
@@ -169,8 +170,8 @@ namespace Barotrauma
             string seed = outpost == Level.Loaded.StartOutpost ? map.SelectedLocation.Name : map.CurrentLocation.Name;
             Rand.SetSyncedSeed(ToolBox.StringToInt(seed));
 
-            JobPrefab watchmanJob = JobPrefab.List.Find(jp => jp.Identifier == "watchman");
-            CharacterInfo characterInfo = new CharacterInfo(Character.HumanConfigFile, jobPrefab: watchmanJob);
+            JobPrefab watchmanJob = JobPrefab.Get("watchman");
+            CharacterInfo characterInfo = new CharacterInfo(Character.HumanSpeciesName, jobPrefab: watchmanJob);
             var spawnedCharacter = Character.Create(characterInfo, watchmanSpawnpoint.WorldPosition,
                 Level.Loaded.Seed + (outpost == Level.Loaded.StartOutpost ? "start" : "end"));
             InitializeWatchman(spawnedCharacter);

Barotrauma/BarotraumaShared/Source/GameSession/GameModes/GameModePreset.cs

@@ -7,48 +7,23 @@ namespace Barotrauma
     class GameModePreset
     {
         public static List<GameModePreset> List = new List<GameModePreset>();
-        
-        public ConstructorInfo Constructor
-        {
-            get;
-            private set;
-        }
 
-        public string Name
-        {
-            get;
-            private set;
-        }
+        public readonly ConstructorInfo Constructor;
 
-        public string Identifier
-        {
-            get;
-            private set;
-        }
+        public readonly string Name;
+        public readonly string Description;
 
-        public bool IsSinglePlayer
-        {
-            get;
-            private set;
-        }
+        public readonly string Identifier;
+
+        public readonly bool IsSinglePlayer;
 
         //are clients allowed to vote for this gamemode
-        public bool Votable
-        {
-            get;
-            private set;
-        }
-
-        //TODO: translate mission descriptions
-        public string Description
-        {
-            get;
-            private set;
-        }
+        public readonly bool Votable;
 
         public GameModePreset(string identifier, Type type, bool isSinglePlayer = false, bool votable = true)
         {
             Name = TextManager.Get("GameMode." + identifier);
+            Description = TextManager.Get("GameModeDescription." + identifier, returnNull: true) ?? "";
             Identifier = identifier;
 
             Constructor = type.GetConstructor(new Type[] { typeof(GameModePreset), typeof(object) });
@@ -70,23 +45,10 @@ namespace Barotrauma
 #if CLIENT
             new GameModePreset("singleplayercampaign", typeof(SinglePlayerCampaign), true);
             new GameModePreset("tutorial", typeof(TutorialMode), true);
-            new GameModePreset("devsandbox", typeof(GameMode), true)
-            {
-                Description = "Single player sandbox mode for debugging."
-            };
+            new GameModePreset("devsandbox", typeof(GameMode), true);
 #endif
-            new GameModePreset("sandbox", typeof(GameMode), false)
-            {
-                Description = "A game mode with no specific objectives."
-            };
-
-            new GameModePreset("mission", typeof(MissionMode), false)
-            {
-                Description = "The crew must work together to complete a specific task, such as retrieving "
-                + "an alien artifact or killing a creature that's terrorizing nearby outposts. The game ends "
-                + "when the task is completed or everyone in the crew has died."
-            };
-
+            new GameModePreset("sandbox", typeof(GameMode), false);
+            new GameModePreset("mission", typeof(MissionMode), false);
             new GameModePreset("multiplayercampaign", typeof(MultiPlayerCampaign), false, false);
         }
     }