Mind Role Entities

Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Body.Components;
 using Content.Server.GameTicking;
@@ -120,8 +121,8 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         Assert.That(roleSys.MindHasRole<NukeopsRoleComponent>(mind));
         Assert.That(factionSys.IsMember(player, "Syndicate"), Is.True);
         Assert.That(factionSys.IsMember(player, "NanoTrasen"), Is.False);
-        var roles = roleSys.MindGetAllRoles(mind);
-        var cmdRoles = roles.Where(x => x.Prototype == "NukeopsCommander" && x.Component is NukeopsRoleComponent);
+        var roles = roleSys.MindGetAllRoleInfo(mind);
+        var cmdRoles = roles.Where(x => x.Prototype == "NukeopsCommander");
         Assert.That(cmdRoles.Count(), Is.EqualTo(1));
 
         // The second dummy player should be a medic
@@ -131,8 +132,8 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         Assert.That(roleSys.MindHasRole<NukeopsRoleComponent>(dummyMind));
         Assert.That(factionSys.IsMember(dummyEnts[1], "Syndicate"), Is.True);
         Assert.That(factionSys.IsMember(dummyEnts[1], "NanoTrasen"), Is.False);
-        roles = roleSys.MindGetAllRoles(dummyMind);
-        cmdRoles = roles.Where(x => x.Prototype == "NukeopsMedic" && x.Component is NukeopsRoleComponent);
+        roles = roleSys.MindGetAllRoleInfo(dummyMind);
+        cmdRoles = roles.Where(x => x.Prototype == "NukeopsMedic");
         Assert.That(cmdRoles.Count(), Is.EqualTo(1));
 
         // The other two players should have just spawned in as normal.
@@ -141,13 +142,14 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         void CheckDummy(int i)
         {
             var ent = dummyEnts[i];
-            var mind = mindSys.GetMind(ent)!.Value;
+            var mindCrew = mindSys.GetMind(ent)!.Value;
             Assert.That(entMan.HasComponent<NukeOperativeComponent>(ent), Is.False);
-            Assert.That(roleSys.MindIsAntagonist(mind), Is.False);
-            Assert.That(roleSys.MindHasRole<NukeopsRoleComponent>(mind), Is.False);
+            Assert.That(roleSys.MindIsAntagonist(mindCrew), Is.False);
+            Assert.That(roleSys.MindHasRole<NukeopsRoleComponent>(mindCrew), Is.False);
             Assert.That(factionSys.IsMember(ent, "Syndicate"), Is.False);
             Assert.That(factionSys.IsMember(ent, "NanoTrasen"), Is.True);
-            Assert.That(roleSys.MindGetAllRoles(mind).Any(x => x.Component is NukeopsRoleComponent), Is.False);
+            var nukeroles = new List<string>() { "Nukeops", "NukeopsMedic", "NukeopsCommander" };
+            Assert.That(roleSys.MindGetAllRoleInfo(mindCrew).Any(x => nukeroles.Contains(x.Prototype)), Is.False);
         }
 
         // The game rule exists, and all the stations/shuttles/maps are properly initialized
@@ -238,7 +240,8 @@ await server.WaitAssertion(() =>
             for (var i = 0; i < nukies.Length - 1; i++)
             {
                 entMan.DeleteEntity(nukies[i]);
-                Assert.That(roundEndSys.IsRoundEndRequested, Is.False,
+                Assert.That(roundEndSys.IsRoundEndRequested,
+                    Is.False,
                     $"The round ended, but {nukies.Length - i - 1} nukies are still alive!");
             }
             // Delete the last nukie and make sure the round ends.

Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs

@@ -2,7 +2,6 @@
 using Content.Server.Body.Systems;
 using Content.Server.Station.Systems;
 using Content.Shared.Preferences;
-using Content.Shared.Roles.Jobs;
 
 namespace Content.IntegrationTests.Tests.Internals;
 
@@ -25,10 +24,7 @@ public async Task TestInternalsAutoActivateInSpaceForStationSpawn()
         await server.WaitAssertion(() =>
         {
             var profile = new HumanoidCharacterProfile();
-            var dummy = stationSpawning.SpawnPlayerMob(testMap.GridCoords, new JobComponent()
-            {
-                Prototype = "TestInternalsDummy"
-            }, profile, station: null);
+            var dummy = stationSpawning.SpawnPlayerMob(testMap.GridCoords, "TestInternalsDummy", profile, station: null);
 
             Assert.That(atmos.HasAtmosphere(testMap.Grid), Is.False, "Test map has atmosphere - test needs adjustment!");
             Assert.That(internals.AreInternalsWorking(dummy), "Internals did not automatically connect!");

Content.IntegrationTests/Tests/Minds/MindTests.cs

@@ -1,10 +1,8 @@
 #nullable enable
 using System.Linq;
-using Content.Server.Ghost;
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Mind.Commands;
-using Content.Server.Players;
 using Content.Server.Roles;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
@@ -18,7 +16,6 @@
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
@@ -287,43 +284,43 @@ await server.WaitAssertion(() =>
             Assert.Multiple(() =>
             {
                 Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId), Is.False);
-                Assert.That(roleSystem.MindHasRole<JobComponent>(mindId), Is.False);
+                Assert.That(roleSystem.MindHasRole<JobRoleComponent>(mindId), Is.False);
             });
 
-            var traitorRole = new TraitorRoleComponent();
+            var traitorRole = "MindRoleTraitor";
 
             roleSystem.MindAddRole(mindId, traitorRole);
 
             Assert.Multiple(() =>
             {
                 Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId));
-                Assert.That(roleSystem.MindHasRole<JobComponent>(mindId), Is.False);
+                Assert.That(roleSystem.MindHasRole<JobRoleComponent>(mindId), Is.False);
             });
 
-            var jobRole = new JobComponent();
+            var jobRole = "";
 
-            roleSystem.MindAddRole(mindId, jobRole);
+            roleSystem.MindAddJobRole(mindId, jobPrototype:jobRole);
 
             Assert.Multiple(() =>
             {
                 Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId));
-                Assert.That(roleSystem.MindHasRole<JobComponent>(mindId));
+                Assert.That(roleSystem.MindHasRole<JobRoleComponent>(mindId));
             });
 
             roleSystem.MindRemoveRole<TraitorRoleComponent>(mindId);
 
             Assert.Multiple(() =>
             {
                 Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId), Is.False);
-                Assert.That(roleSystem.MindHasRole<JobComponent>(mindId));
+                Assert.That(roleSystem.MindHasRole<JobRoleComponent>(mindId));
             });
 
-            roleSystem.MindRemoveRole<JobComponent>(mindId);
+            roleSystem.MindRemoveRole<JobRoleComponent>(mindId);
 
             Assert.Multiple(() =>
             {
                 Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId), Is.False);
-                Assert.That(roleSystem.MindHasRole<JobComponent>(mindId), Is.False);
+                Assert.That(roleSystem.MindHasRole<JobRoleComponent>(mindId), Is.False);
             });
         });
 

Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs

@@ -3,7 +3,6 @@
 using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
-using Content.Shared.Roles.Jobs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
@@ -68,10 +67,7 @@ await server.WaitAssertion(() =>
 
             profile.SetLoadout(new RoleLoadout("LoadoutTester"));
 
-            var tester = stationSystem.SpawnPlayerMob(testMap.GridCoords, job: new JobComponent()
-            {
-                Prototype = "LoadoutTester"
-            }, profile, station: null);
+            var tester = stationSystem.SpawnPlayerMob(testMap.GridCoords, job: "LoadoutTester", profile, station: null);
 
             var slotQuery = inventorySystem.GetSlotEnumerator(tester);
             var checkedCount = 0;

Content.Server/Antag/AntagSelectionSystem.cs

@@ -11,7 +11,6 @@
 using Content.Server.Roles;
 using Content.Server.Roles.Jobs;
 using Content.Server.Shuttles.Components;
-using Content.Server.Station.Systems;
 using Content.Shared.Antag;
 using Content.Shared.Clothing;
 using Content.Shared.GameTicking;
@@ -20,7 +19,6 @@
 using Content.Shared.Humanoid;
 using Content.Shared.Mind;
 using Content.Shared.Players;
-using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
 using Content.Shared.Whitelist;
 using Robust.Server.Audio;
@@ -37,18 +35,15 @@ namespace Content.Server.Antag;
 
 public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelectionComponent>
 {
-    [Dependency] private readonly IChatManager _chat = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
-    [Dependency] private readonly IServerPreferencesManager _pref = default!;
-    [Dependency] private readonly ActorSystem _actors = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly GhostRoleSystem _ghostRole = default!;
     [Dependency] private readonly JobSystem _jobs = default!;
     [Dependency] private readonly LoadoutSystem _loadout = default!;
     [Dependency] private readonly MindSystem _mind = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IServerPreferencesManager _pref = default!;
     [Dependency] private readonly RoleSystem _role = default!;
-    [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
 
@@ -196,6 +191,9 @@ protected override void Started(EntityUid uid, AntagSelectionComponent component
     /// <summary>
     /// Chooses antagonists from the given selection of players
     /// </summary>
+    /// <param name="ent">The antagonist rule entity</param>
+    /// <param name="pool">The players to choose from</param>
+    /// <param name="midround">Disable picking players for pre-spawn antags in the middle of a round</param>
     public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool, bool midround = false)
     {
         if (ent.Comp.SelectionsComplete)
@@ -212,8 +210,14 @@ public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSessi
     /// <summary>
     /// Chooses antagonists from the given selection of players for the given antag definition.
     /// </summary>
+    /// <param name="ent">The antagonist rule entity</param>
+    /// <param name="pool">The players to choose from</param>
+    /// <param name="def">The antagonist selection parameters and criteria</param>
     /// <param name="midround">Disable picking players for pre-spawn antags in the middle of a round</param>
-    public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool, AntagSelectionDefinition def, bool midround = false)
+    public void ChooseAntags(Entity<AntagSelectionComponent> ent,
+        IList<ICommonSession> pool,
+        AntagSelectionDefinition def,
+        bool midround = false)
     {
         var playerPool = GetPlayerPool(ent, pool, def);
         var count = GetTargetAntagCount(ent, GetTotalPlayerCount(pool), def);
@@ -334,7 +338,7 @@ public void MakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? sessi
         EntityManager.AddComponents(player, def.Components);
 
         // Equip the entity's RoleLoadout and LoadoutGroup
-        List<ProtoId<StartingGearPrototype>>? gear = new();
+        List<ProtoId<StartingGearPrototype>> gear = new();
         if (def.StartingGear is not null)
             gear.Add(def.StartingGear.Value);
 
@@ -343,8 +347,8 @@ public void MakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? sessi
         if (session != null)
         {
             var curMind = session.GetMind();
-            
-            if (curMind == null || 
+
+            if (curMind == null ||
                 !TryComp<MindComponent>(curMind.Value, out var mindComp) ||
                 mindComp.OwnedEntity != antagEnt)
             {
@@ -353,7 +357,7 @@ public void MakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? sessi
             }
 
             _mind.TransferTo(curMind.Value, antagEnt, ghostCheckOverride: true);
-            _role.MindAddRoles(curMind.Value, def.MindComponents, null, true);
+            _role.MindAddRoles(curMind.Value, def.MindRoles, null, true);
             ent.Comp.SelectedMinds.Add((curMind.Value, Name(player)));
             SendBriefing(session, def.Briefing);
         }

Content.Server/Antag/Components/AntagSelectionComponent.cs

@@ -3,7 +3,6 @@
 using Content.Shared.Destructible.Thresholds;
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
-using Content.Shared.Storage;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
@@ -145,10 +144,17 @@ public partial struct AntagSelectionDefinition()
 
     /// <summary>
     /// Components added to the player's mind.
+    /// Do NOT use this to add role-type components. Add those as MindRoles instead
     /// </summary>
     [DataField]
     public ComponentRegistry MindComponents = new();
 
+    /// <summary>
+    /// List of Mind Role Prototypes to be added to the player's mind.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<EntityPrototype>>? MindRoles;
+
     /// <summary>
     /// A set of starting gear that's equipped to the player.
     /// </summary>

Content.Server/Cloning/CloningSystem.cs

@@ -231,7 +231,7 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
 
             // TODO: Ideally, components like this should be components on the mind entity so this isn't necessary.
             // Add on special job components to the mob.
-            if (_jobs.MindTryGetJob(mindEnt, out _, out var prototype))
+            if (_jobs.MindTryGetJob(mindEnt, out var prototype))
             {
                 foreach (var special in prototype.Special)
                 {

Content.Server/EntityEffects/EffectConditions/JobCondition.cs

@@ -1,49 +1,45 @@
 using System.Linq;
 using Content.Shared.EntityEffects;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
 using Content.Shared.Localizations;
-using Robust.Shared.Prototypes;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
-using Content.Shared.Station;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.EntityEffects.EffectConditions;
 
 public sealed partial class JobCondition : EntityEffectCondition
 {
     [DataField(required: true)] public List<ProtoId<JobPrototype>> Job;
-                
+
     public override bool Condition(EntityEffectBaseArgs args)
-    {   
+    {
         args.EntityManager.TryGetComponent<MindContainerComponent>(args.TargetEntity, out var mindContainer);
-        if (mindContainer != null && mindContainer.Mind != null)
+
+        if ( mindContainer is null
+             || !args.EntityManager.TryGetComponent<MindComponent>(mindContainer.Mind, out var mind))
+            return false;
+
+        foreach (var roleId in mind.MindRoles)
         {
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            if (args.EntityManager.TryGetComponent<JobComponent>(mindContainer?.Mind, out var comp) && prototypeManager.TryIndex(comp.Prototype, out var prototype))
-            {
-                foreach (var jobId in Job)
-                {
-                    if (prototype.ID == jobId)
-                    {
-                        return true;
-                    }
-                }
-            }
+            if(!args.EntityManager.HasComponent<JobRoleComponent>(roleId))
+                continue;
+
+            if(!args.EntityManager.TryGetComponent<MindRoleComponent>(roleId, out var mindRole)
+               || mindRole.JobPrototype is null)
+                continue;
+
+            if (Job.Contains(mindRole.JobPrototype.Value))
+                return true;
         }
-            
+
         return false;
     }
-        
+
     public override string GuidebookExplanation(IPrototypeManager prototype)
     {
         var localizedNames = Job.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
         return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
     }
 }
-
-