v1.7.7.0 (Winter Update 2024)

2024-12-11 13:26:13 +02:00
parent 7d5b7a310a
commit f6349b2175
256 changed files with 4794 additions and 1653 deletions
@@ -33,6 +33,12 @@ namespace Barotrauma
        [Serialize(0, IsPropertySaveable.No)]
        public int ExperiencePoints { get; private set; }

+        [Serialize(0, IsPropertySaveable.No)]
+        public int BaseSalary { get; private set; }
+
+        [Serialize(1f, IsPropertySaveable.No)]
+        public float SalaryMultiplier { get; private set; }
+
        private readonly HashSet<Identifier> tags = new HashSet<Identifier>();

        [Serialize("", IsPropertySaveable.Yes)]
@@ -247,8 +253,8 @@ namespace Barotrauma
                    float newSkill = skill.Level * SkillMultiplier;
                    skill.IncreaseSkill(newSkill - skill.Level, increasePastMax: false);
                }
-                characterInfo.Salary = characterInfo.CalculateSalary();
            }
+            characterInfo.Salary = characterInfo.CalculateSalary(BaseSalary, SalaryMultiplier);
            characterInfo.HumanPrefabIds = (NpcSetIdentifier, Identifier);
            characterInfo.GiveExperience(ExperiencePoints);
            return characterInfo;