Merge pull request #10 from CommanderMark/master

Job preferences are now saved in config.xml.

Barotrauma/Source/GameMain.cs

@@ -217,6 +217,11 @@ namespace Barotrauma
         yield return CoroutineStatus.Running;
 
             JobPrefab.LoadAll(SelectedPackage.GetFilesOfType(ContentType.Jobs));
+            // Add any missing jobs from the prefab into Config.JobNamePreferences.
+            foreach (JobPrefab job in JobPrefab.List)
+            {
+                if (!Config.JobNamePreferences.Contains(job.Name)) { Config.JobNamePreferences.Add(job.Name); }
+            }
             StructurePrefab.LoadAll(SelectedPackage.GetFilesOfType(ContentType.Structure));
             TitleScreen.LoadState = 20.0f;
         yield return CoroutineStatus.Running;

Barotrauma/Source/GameSettings.cs

@@ -23,6 +23,8 @@ namespace Barotrauma
 
         private WindowMode windowMode;
 
+        public List<string> jobNamePreferences;
+
         private KeyOrMouse[] keyMapping;
 
         private bool unsavedSettings;
@@ -56,6 +58,19 @@ namespace Barotrauma
 
         public ContentPackage SelectedContentPackage { get; set; }
 
+        public List<string> JobNamePreferences
+        {
+            get { return jobNamePreferences; }
+            set
+            {
+                // Begin saving coroutine. Remove any existing save coroutines if one is running.
+                if (CoroutineManager.IsCoroutineRunning("saveCoroutine")) { CoroutineManager.StopCoroutines("saveCoroutine"); }
+                CoroutineManager.StartCoroutine(ApplyUnsavedChanges(), "saveCoroutine");
+
+                jobNamePreferences = value;
+            }
+        }
+
         public string   MasterServerUrl { get; set; }
         public bool     AutoCheckUpdates { get; set; }
         public bool     WasGameUpdated { get; set; }
@@ -73,6 +88,7 @@ namespace Barotrauma
             private set
             {
                 unsavedSettings = value;
+
                 if (applyButton != null)
                 {
                     //applyButton.Selected = unsavedSettings;
@@ -124,6 +140,12 @@ namespace Barotrauma
                 
                 SelectedContentPackage = ContentPackage.list.Any() ? ContentPackage.list[0] : new ContentPackage("");
 
+                JobNamePreferences = new List<string>();
+                foreach (JobPrefab job in JobPrefab.List)
+                {
+                    JobNamePreferences.Add(job.Name);
+                }
+
                 return;
             }
             
@@ -208,6 +230,13 @@ namespace Barotrauma
                             }
                         }
                         break;
+                    case "gameplay":
+                        JobNamePreferences = new List<string>();
+                        foreach (XElement ele in subElement.Element("jobpreferences").Elements("job"))
+                        {
+                            JobNamePreferences.Add(ToolBox.GetAttributeString(ele, "name", ""));
+                        }
+                        break;
                 }
             }
 
@@ -291,6 +320,17 @@ namespace Barotrauma
 
             }
 
+            var gameplay = new XElement("gameplay");
+
+            var jobPreferences = new XElement("jobpreferences");
+            foreach (string jobName in JobNamePreferences)
+            {
+                jobPreferences.Add(new XElement("job", new XAttribute("name", jobName)));
+            }
+
+            gameplay.Add(jobPreferences);
+            doc.Root.Add(gameplay);
+
             doc.Save(filePath);
         }
 
@@ -500,6 +540,13 @@ namespace Barotrauma
             yield return CoroutineStatus.Success;
         }
 
+        private IEnumerable<object> ApplyUnsavedChanges()
+        {
+            yield return new WaitForSeconds(10.0f);
+
+            Save("config.xml");
+        }
+
         private bool ApplyClicked(GUIButton button, object userData)
         {
             Save("config.xml");

Barotrauma/Source/Screens/NetLobbyScreen.cs

@@ -540,10 +540,13 @@ namespace Barotrauma
 
 
                 int i = 1;
-                foreach (JobPrefab job in JobPrefab.List)
+                foreach (string jobName in GameMain.Config.JobNamePreferences)
                 {
-                    GUITextBlock jobText = new GUITextBlock(new Rectangle(0, 0, 0, 20),  i + ". " + job.Name+"    ", 
-                        "",Alignment.Left, Alignment.Right, jobList, false,
+                    JobPrefab job = JobPrefab.List.First(x => x.Name == jobName); 
+                    if (job == null) { continue; }
+
+                    GUITextBlock jobText = new GUITextBlock(new Rectangle(0, 0, 0, 20),  i + ". " + job.Name + "    ", 
+                        "", Alignment.Left, Alignment.Right, jobList, false,
                         GameMain.GraphicsWidth<1000 ? GUI.SmallFont : GUI.Font);
                     jobText.UserData = job;
 
@@ -1199,6 +1202,8 @@ namespace Barotrauma
         private void UpdateJobPreferences(GUIListBox listBox)
         {
             listBox.Deselect();
+            List<string> jobNamePreferences = new List<string>();
+
             for (int i = 0; i < listBox.children.Count; i++)
             {
                 float a = (float)(i - 1) / 3.0f;
@@ -1210,8 +1215,11 @@ namespace Barotrauma
                 listBox.children[i].SelectedColor = color;
 
                 (listBox.children[i] as GUITextBlock).Text = (i+1) + ". " + (listBox.children[i].UserData as JobPrefab).Name;
+
+                jobNamePreferences.Add((listBox.children[i].UserData as JobPrefab).Name);
             }
-            
+
+            GameMain.Config.JobNamePreferences = jobNamePreferences;
         }
 
         public bool TrySelectSub(string subName, string md5Hash, GUIListBox subList)