(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);