[IMP Port] Visitor Specific Species

Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs

@@ -40,7 +40,7 @@ public EntityUid SpawnRandomHumanoid(string prototypeId, EntityCoordinates coord
         if (!_prototypeManager.TryIndex<RandomHumanoidSettingsPrototype>(prototypeId, out var prototype))
             throw new ArgumentException("Could not get random humanoid settings");
 
-        var profile = HumanoidCharacterProfile.Random(prototype.SpeciesBlacklist);
+        var profile = HumanoidCharacterProfile.Random(prototype.SpeciesBlacklist, false); // MACRO
         var speciesProto = _prototypeManager.Index<SpeciesPrototype>(profile.Species);
         var humanoid = EntityManager.CreateEntityUninitialized(speciesProto.Prototype, coordinates);
 

Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs

@@ -105,6 +105,21 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// </summary>
     [DataField]
     public int MaxAge = 120;
+
+    // MACRO start
+    /// <summary>
+    /// Whether or not the species is available for randomization.
+    /// </summary>
+    [DataField]
+    public bool RandomViable { get; private set; }
+
+    /// <summary>
+    /// When a random species is picked, verify random float is lower than this number
+    /// if not, don't pick the species
+    /// </summary>
+    [DataField]
+    public float RandomChance { get; private set; } = 1f;
+    // MACRO end
 }
 
 public enum SpeciesNaming : byte

Content.Shared/Preferences/HumanoidCharacterProfile.cs

@@ -214,20 +214,31 @@ public static HumanoidCharacterProfile DefaultWithSpecies(ProtoId<SpeciesPrototy
         }
 
         // TODO: This should eventually not be a visual change only.
-        public static HumanoidCharacterProfile Random(HashSet<string>? ignoredSpecies = null)
+        // MACRO start. this function is fairly different from upstream now.
+        // But upstreaming this would take so long that the species will be fully merged by then
+        // Therefore: bear with my changes
+        public static HumanoidCharacterProfile Random(HashSet<string>? speciesBlacklist = null, bool? characterCreation = true)
         {
             var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
             var random = IoCManager.Resolve<IRobustRandom>();
 
             var species = random.Pick(prototypeManager
                 .EnumeratePrototypes<SpeciesPrototype>()
-                .Where(x => ignoredSpecies == null ? x.RoundStart : x.RoundStart && !ignoredSpecies.Contains(x.ID))
+                .Where(x =>
+                {
+                    if (speciesBlacklist != null && speciesBlacklist.Contains(x.ID))
+                        return false;
+                    if (characterCreation == true)
+                        return x.RoundStart;
+                    return random.NextFloat() < x.RandomChance && x.RandomViable;
+                })
                 .ToArray()
-            ).ID;
+            )
+            .ID;
 
             return RandomWithSpecies(species);
         }
-
+        // MACRO end
         public static HumanoidCharacterProfile RandomWithSpecies(string? species = null)
         {
             species ??= HumanoidCharacterProfile.DefaultSpecies;

Resources/Prototypes/Species/arachnid.yml

@@ -2,6 +2,7 @@
   id: Arachnid
   name: species-name-arachnid
   roundStart: true
+  randomViable: true # MACRO
   prototype: MobArachnid
   defaultSkinTone: "#385878"
   dollPrototype: AppearanceArachnid

Resources/Prototypes/Species/diona.yml

@@ -2,6 +2,7 @@
   id: Diona
   name: species-name-diona
   roundStart: true
+  randomViable: true # MACRO
   prototype: MobDiona
   defaultSkinTone: "#cdb369"
   dollPrototype: AppearanceDiona

Resources/Prototypes/Species/dwarf.yml

@@ -2,6 +2,7 @@
   id: Dwarf
   name: species-name-dwarf
   roundStart: true
+  randomViable: true # MACRO
   prototype: MobDwarf
   dollPrototype: AppearanceDwarf
   skinColoration: HumanToned

Resources/Prototypes/Species/human.yml

@@ -2,6 +2,7 @@
   id: Human
   name: species-name-human
   roundStart: true
+  randomViable: true # MACRO
   prototype: MobHuman
   dollPrototype: AppearanceHuman
   skinColoration: HumanToned

Resources/Prototypes/Species/moth.yml

@@ -2,6 +2,7 @@
   id: Moth
   name: species-name-moth
   roundStart: true
+  randomViable: true # MACRO
   prototype: MobMoth
   defaultSkinTone: "#ffda93"
   dollPrototype: AppearanceMoth

Resources/Prototypes/Species/reptilian.yml

@@ -2,6 +2,7 @@
   id: Reptilian
   name: species-name-reptilian
   roundStart: true
+  randomViable: true # MACRO
   prototype: MobReptilian
   defaultSkinTone: "#34a223"
   dollPrototype: AppearanceReptilian

Resources/Prototypes/Species/slime.yml

@@ -2,6 +2,7 @@
   id: SlimePerson
   name: species-name-slime
   roundStart: true
+  randomViable: true # MACRO
   prototype: MobSlimePerson
   defaultSkinTone: "#b8b8b8"
   dollPrototype: AppearanceSlimePerson

Resources/Prototypes/Species/vox.yml

@@ -1,7 +1,8 @@
 - type: species
   id: Vox
   name: species-name-vox
-  roundStart: true
+  roundStart: true # MACRO
+  randomViable: true
   prototype: MobVox
   dollPrototype: AppearanceVox
   skinColoration: VoxFeathers