v1.2.6.0 (Winter Update)

Barotrauma/BarotraumaShared/SharedSource/Characters/CharacterInfo.cs

@@ -767,7 +767,7 @@ namespace Barotrauma
         }
 
         // Used for loading the data
-        public CharacterInfo(XElement infoElement, Identifier npcIdentifier = default)
+        public CharacterInfo(ContentXElement infoElement, Identifier npcIdentifier = default)
         {
             ID = idCounter;
             idCounter++;
@@ -1214,6 +1214,21 @@ namespace Barotrauma
             return (int)(salary * Job.Prefab.PriceMultiplier);
         }
 
+        /// <summary>
+        /// Increases the characters skill at a rate proportional to their current skill. 
+        /// If you want to increase the skill level by a specific amount instead, use <see cref="IncreaseSkillLevel"/>
+        /// </summary>
+        public void ApplySkillGain(Identifier skillIdentifier, float baseGain, bool gainedFromAbility = false, float maxGain = 2f)
+        {
+            float skillLevel = Job.GetSkillLevel(skillIdentifier);
+            // The formula is too generous on low skill levels, hence the minimum divider.
+            float skillDivider = MathF.Pow(Math.Max(skillLevel, 15f), SkillSettings.Current.SkillIncreaseExponent);
+            IncreaseSkillLevel(skillIdentifier, Math.Min(baseGain / skillDivider, maxGain), gainedFromAbility);
+        }
+
+        /// <summary>
+        /// Increase the skill by a specific amount. Talents may affect the actual, final skill increase.
+        /// </summary>
         public void IncreaseSkillLevel(Identifier skillIdentifier, float increase, bool gainedFromAbility = false)
         {
             if (Job == null || (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) || Character == null) { return; }
@@ -1222,9 +1237,7 @@ namespace Barotrauma
             {
                 increase *= SkillSettings.Current.AssistantSkillIncreaseMultiplier;
             }
-
             increase *= 1f + Character.GetStatValue(StatTypes.SkillGainSpeed);
-
             increase = GetSkillSpecificGain(increase, skillIdentifier);
 
             float prevLevel = Job.GetSkillLevel(skillIdentifier);
@@ -1311,12 +1324,12 @@ namespace Barotrauma
             OnExperienceChanged(prevAmount, ExperiencePoints);
         }
 
-        const int BaseExperienceRequired = -50;
+        const int BaseExperienceRequired = 450;
         const int AddedExperienceRequiredPerLevel = 500;
 
         public int GetTotalTalentPoints()
         {
-            return GetCurrentLevel() + AdditionalTalentPoints - 1;
+            return GetCurrentLevel() + AdditionalTalentPoints;
         }
 
         public int GetAvailableTalentPoints()
@@ -1342,16 +1355,19 @@ namespace Barotrauma
             return experienceRequired + ExperienceRequiredPerLevel(level);
         }
 
+        /// <summary>
+        /// How much more experience does the character need to reach the specified level?
+        /// </summary>
         public int GetExperienceRequiredForLevel(int level)
         {
-            int currentLevel = GetCurrentLevel(out int experienceRequired);
+            int currentLevel = GetCurrentLevel();
             if (currentLevel >= level) { return 0; }
-            int required = experienceRequired;
-            for (int i = currentLevel + 1; i <= level; i++)
+            int required = 0;
+            for (int i = 0; i < level; i++)
             {
                 required += ExperienceRequiredPerLevel(i);
             }
-            return required;
+            return required - ExperiencePoints;
         }
 
         public int GetCurrentLevel()
@@ -1361,7 +1377,7 @@ namespace Barotrauma
 
         private int GetCurrentLevel(out int experienceRequired)
         {
-            int level = 1;
+            int level = 0;
             experienceRequired = 0;
             while (experienceRequired + ExperienceRequiredPerLevel(level) <= ExperiencePoints)
             {
@@ -1899,13 +1915,30 @@ namespace Barotrauma
             }
         }
 
+        /// <summary>
+        /// Get the combined stat value of the identifier "all" and the specified identifier.
+        /// </summary>
+        /// <remarks>
+        /// The "all" identifier works like the "any" identifier in outpost modules where it doesn't literally mean everything but
+        /// is an unique identifier that indicates that it should target everything. For example if we wanted to make a talent
+        /// that increases the fabrication quality of every single item we could use something like:
+        /// <CharacterAbilityGivePermanentStat stattype="IncreaseFabricationQuality" statidentifier="all" />
+        /// (Granted IncreaseFabricationQuality doesn't support the "all" identifier so if we need this in vanilla it needs to be implemented in code)
+        /// </remarks>
+        public float GetSavedStatValueWithAll(StatTypes statType, Identifier statIdentifier)
+            => GetSavedStatValue(statType, Tags.StatIdentifierTargetAll) +
+               GetSavedStatValue(statType, statIdentifier);
+
         public float GetSavedStatValueWithBotsInMp(StatTypes statType, Identifier statIdentifier)
+            => GetSavedStatValueWithBotsInMp(statType, statIdentifier, GameSession.GetSessionCrewCharacters(CharacterType.Bot));
+
+        public float GetSavedStatValueWithBotsInMp(StatTypes statType, Identifier statIdentifier, IReadOnlyCollection<Character> bots)
         {
             float statValue = GetSavedStatValue(statType, statIdentifier);
 
             if (GameMain.NetworkMember is null) { return statValue; }
 
-            foreach (Character bot in GameSession.GetSessionCrewCharacters(CharacterType.Bot))
+            foreach (Character bot in bots)
             {
                 int botStatValue = (int)bot.Info.GetSavedStatValue(statType, statIdentifier);
                 statValue = Math.Max(statValue, botStatValue);