don't reset balance on Randomize Everything (#820)

* don't reset balance on Randomize Everything * fix typo
new-frontiers-14 · Jan 6, 2024 · 9fbf4e0 · 9fbf4e0
1 parent a3e6322
commit 9fbf4e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.Random.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.Random.cs
@@ -9,7 +9,7 @@ public sealed partial class HumanoidProfileEditor
 
         private void RandomizeEverything()
         {
-            Profile = HumanoidCharacterProfile.Random();
+            Profile = HumanoidCharacterProfile.Random(balance : Profile?.BankBalance ?? HumanoidCharacterProfile.DefaultBalance);
             UpdateControls();
             IsDirty = true;
         }

diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -27,6 +27,8 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile
         public const int MaxNameLength = 32;
         public const int MaxDescLength = 512;
 
+        public const int DefaultBalance = 25000;
+
         private readonly Dictionary<string, JobPriority> _jobPriorities;
         private readonly List<string> _antagPreferences;
         private readonly List<string> _traitPreferences;
@@ -112,7 +114,7 @@ public HumanoidCharacterProfile() : this(
                 18,
                 Sex.Male,
                 Gender.Male,
-                25000,
+                DefaultBalance,
                 new HumanoidCharacterAppearance(),
                 ClothingPreference.Jumpsuit,
                 BackpackPreference.Backpack,
@@ -140,7 +142,7 @@ public static HumanoidCharacterProfile DefaultWithSpecies(string species = Share
                 18,
                 Sex.Male,
                 Gender.Male,
-                25000,
+                DefaultBalance,
                 HumanoidCharacterAppearance.DefaultWithSpecies(species),
                 ClothingPreference.Jumpsuit,
                 BackpackPreference.Backpack,
@@ -154,7 +156,7 @@ public static HumanoidCharacterProfile DefaultWithSpecies(string species = Share
         }
 
         // TODO: This should eventually not be a visual change only.
-        public static HumanoidCharacterProfile Random(HashSet<string>? ignoredSpecies = null)
+        public static HumanoidCharacterProfile Random(HashSet<string>? ignoredSpecies = null, int balance = DefaultBalance)
         {
             var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
             var random = IoCManager.Resolve<IRobustRandom>();
@@ -165,17 +167,16 @@ public static HumanoidCharacterProfile Random(HashSet<string>? ignoredSpecies =
                 .ToArray()
             ).ID;
 
-            return RandomWithSpecies(species);
+            return RandomWithSpecies(species: species, balance: balance);
         }
 
-        public static HumanoidCharacterProfile RandomWithSpecies(string species = SharedHumanoidAppearanceSystem.DefaultSpecies)
+        public static HumanoidCharacterProfile RandomWithSpecies(string species = SharedHumanoidAppearanceSystem.DefaultSpecies, int balance = DefaultBalance)
         {
             var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
             var random = IoCManager.Resolve<IRobustRandom>();
 
             var sex = Sex.Unsexed;
             var age = 18;
-            var balance = 25000;
             if (prototypeManager.TryIndex<SpeciesPrototype>(species, out var speciesPrototype))
             {
                 sex = random.Pick(speciesPrototype.Sexes);