Unstable 0.15.15.0 (and the one before it I forgor)

Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/Job.cs

@@ -9,7 +9,7 @@ namespace Barotrauma
     {
         private readonly JobPrefab prefab;
 
-        private Dictionary<string, Skill> skills;
+        private readonly Dictionary<string, Skill> skills;
 
         public string Name
         {

Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/JobPrefab.cs

@@ -282,7 +282,7 @@ namespace Barotrauma
 
             Variants = variant;
 
-            Skills.Sort((x,y) => y.LevelRange.X.CompareTo(x.LevelRange.X));
+            Skills.Sort((x,y) => y.LevelRange.Start.CompareTo(x.LevelRange.Start));
 
             // Disabled on purpose, TODO: remove all references?
             //ClothingElement = element.GetChildElement("PortraitClothing");

Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/Skill.cs

@@ -34,14 +34,14 @@ namespace Barotrauma
             }
         }
 
-        internal SkillPrefab Prefab { get; private set; }
+        public readonly float PriceMultiplier = 1.0f;
 
         public Skill(SkillPrefab prefab)
         {
-            this.Prefab = prefab;
             Identifier = prefab.Identifier;
-            level = Rand.Range(prefab.LevelRange.X, prefab.LevelRange.Y, Rand.RandSync.Server);
+            level = Rand.Range(prefab.LevelRange.Start, prefab.LevelRange.End, Rand.RandSync.Server);
             icon = GetIcon();
+            PriceMultiplier = prefab.PriceMultiplier;
         }
 
         public Skill(string identifier, float level)

Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/SkillPrefab.cs

@@ -7,7 +7,7 @@ namespace Barotrauma
     {
         public readonly string Identifier;
 
-        public Vector2 LevelRange { get; private set; }
+        public Range<float> LevelRange { get; private set; }
 
         /// <summary>
         /// How much this skill affects characters' hiring cost
@@ -23,12 +23,13 @@ namespace Barotrauma
             var levelString = element.GetAttributeString("level", "");
             if (levelString.Contains(","))
             {
-                LevelRange = XMLExtensions.ParseVector2(levelString, false);
+                var rangeVector2 = XMLExtensions.ParseVector2(levelString, false);
+                LevelRange = new Range<float>(rangeVector2.X, rangeVector2.Y);
             }
             else
             {
                 float skillLevel = float.Parse(levelString, System.Globalization.CultureInfo.InvariantCulture);
-                LevelRange = new Vector2(skillLevel, skillLevel);
+                LevelRange = new Range<float>(skillLevel, skillLevel);
             }
 
             IsPrimarySkill = element.GetAttributeBool("primary", false);