Antag preferences and antag prototype (#1264)

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>

Content.Shared/Preferences/HumanoidCharacterProfile.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Content.Shared.Antags;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Preferences
@@ -9,6 +12,7 @@ namespace Content.Shared.Preferences
     public class HumanoidCharacterProfile : ICharacterProfile
     {
         private readonly Dictionary<string, JobPriority> _jobPriorities;
+        private readonly List<string> _antagPreferences;
         public static int MinimumAge = 18;
         public static int MaximumAge = 90;
 
@@ -18,7 +22,8 @@ namespace Content.Shared.Preferences
             Sex sex,
             HumanoidCharacterAppearance appearance,
             Dictionary<string, JobPriority> jobPriorities,
-            PreferenceUnavailableMode preferenceUnavailable)
+            PreferenceUnavailableMode preferenceUnavailable,
+            List<string> antagPreferences)
         {
             Name = name;
             Age = age;
@@ -26,6 +31,7 @@ namespace Content.Shared.Preferences
             Appearance = appearance;
             _jobPriorities = jobPriorities;
             PreferenceUnavailable = preferenceUnavailable;
+            _antagPreferences = antagPreferences;
         }
 
         public HumanoidCharacterProfile(
@@ -34,9 +40,10 @@ namespace Content.Shared.Preferences
             Sex sex,
             HumanoidCharacterAppearance appearance,
             IReadOnlyDictionary<string, JobPriority> jobPriorities,
-            PreferenceUnavailableMode preferenceUnavailable)
+            PreferenceUnavailableMode preferenceUnavailable,
+            IReadOnlyList<string> antagPreferences)
             : this(name, age, sex, appearance, new Dictionary<string, JobPriority>(jobPriorities),
-                preferenceUnavailable)
+                preferenceUnavailable, new List<string>(antagPreferences))
         {
         }
 
@@ -46,7 +53,7 @@ namespace Content.Shared.Preferences
                 new Dictionary<string, JobPriority>
                 {
                     {SharedGameTicker.OverflowJob, JobPriority.High}
-                }, PreferenceUnavailableMode.StayInLobby);
+                }, PreferenceUnavailableMode.StayInLobby, new List<string>());
         }
 
         public string Name { get; }
@@ -55,26 +62,27 @@ namespace Content.Shared.Preferences
         public ICharacterAppearance CharacterAppearance => Appearance;
         public HumanoidCharacterAppearance Appearance { get; }
         public IReadOnlyDictionary<string, JobPriority> JobPriorities => _jobPriorities;
+        public IReadOnlyList<string> AntagPreferences => _antagPreferences;
         public PreferenceUnavailableMode PreferenceUnavailable { get; }
 
         public HumanoidCharacterProfile WithName(string name)
         {
-            return new HumanoidCharacterProfile(name, Age, Sex, Appearance, _jobPriorities, PreferenceUnavailable);
+            return new HumanoidCharacterProfile(name, Age, Sex, Appearance, _jobPriorities, PreferenceUnavailable, _antagPreferences);
         }
 
         public HumanoidCharacterProfile WithAge(int age)
         {
-            return new HumanoidCharacterProfile(Name, age, Sex, Appearance, _jobPriorities, PreferenceUnavailable);
+            return new HumanoidCharacterProfile(Name, age, Sex, Appearance, _jobPriorities, PreferenceUnavailable, _antagPreferences);
         }
 
         public HumanoidCharacterProfile WithSex(Sex sex)
         {
-            return new HumanoidCharacterProfile(Name, Age, sex, Appearance, _jobPriorities, PreferenceUnavailable);
+            return new HumanoidCharacterProfile(Name, Age, sex, Appearance, _jobPriorities, PreferenceUnavailable, _antagPreferences);
         }
 
         public HumanoidCharacterProfile WithCharacterAppearance(HumanoidCharacterAppearance appearance)
         {
-            return new HumanoidCharacterProfile(Name, Age, Sex, appearance, _jobPriorities, PreferenceUnavailable);
+            return new HumanoidCharacterProfile(Name, Age, Sex, appearance, _jobPriorities, PreferenceUnavailable, _antagPreferences);
         }
 
         public HumanoidCharacterProfile WithJobPriorities(IReadOnlyDictionary<string, JobPriority> jobPriorities)
@@ -85,7 +93,8 @@ namespace Content.Shared.Preferences
                 Sex,
                 Appearance,
                 new Dictionary<string, JobPriority>(jobPriorities),
-                PreferenceUnavailable);
+                PreferenceUnavailable,
+                _antagPreferences);
         }
 
         public HumanoidCharacterProfile WithJobPriority(string jobId, JobPriority priority)
@@ -100,12 +109,44 @@ namespace Content.Shared.Preferences
                 dictionary[jobId] = priority;
             }
 
-            return new HumanoidCharacterProfile(Name, Age, Sex, Appearance, dictionary, PreferenceUnavailable);
+            return new HumanoidCharacterProfile(Name, Age, Sex, Appearance, dictionary, PreferenceUnavailable, _antagPreferences);
         }
 
         public HumanoidCharacterProfile WithPreferenceUnavailable(PreferenceUnavailableMode mode)
         {
-            return new HumanoidCharacterProfile(Name, Age, Sex, Appearance, _jobPriorities, mode);
+            return new HumanoidCharacterProfile(Name, Age, Sex, Appearance, _jobPriorities, mode, _antagPreferences);
+        }
+
+        public HumanoidCharacterProfile WithAntagPreferences(IReadOnlyList<string> antagPreferences)
+        {
+            return new HumanoidCharacterProfile(
+                Name,
+                Age,
+                Sex,
+                Appearance,
+                _jobPriorities,
+                PreferenceUnavailable,
+                new List<string>(antagPreferences));
+        }
+
+        public HumanoidCharacterProfile WithAntagPreference(string antagId, bool pref)
+        {
+            var list = new List<string>(_antagPreferences);
+            if(pref)
+            {
+                if(!list.Contains(antagId))
+                {
+                    list.Add(antagId);
+                }
+            }
+            else
+            {
+                if(list.Contains(antagId))
+                {
+                    list.Remove(antagId);
+                }
+            }
+            return new HumanoidCharacterProfile(Name, Age, Sex, Appearance, _jobPriorities, PreferenceUnavailable, list);
         }
 
         public string Summary =>
@@ -119,6 +160,7 @@ namespace Content.Shared.Preferences
             if (Sex != other.Sex) return false;
             if (PreferenceUnavailable != other.PreferenceUnavailable) return false;
             if (!_jobPriorities.SequenceEqual(other._jobPriorities)) return false;
+            if (!_antagPreferences.SequenceEqual(other._antagPreferences)) return false;
             return Appearance.MemberwiseEquals(other.Appearance);
         }
     }

Content.Shared/Roles/AntagPrototype.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Robust.Shared.Localization;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+using YamlDotNet.RepresentationModel;
+
+namespace Content.Shared.Antags
+{
+    /// <summary>
+    ///     Describes information for a single antag.
+    /// </summary>
+    [Prototype("antag")]
+    public class AntagPrototype : IPrototype, IIndexedPrototype
+    {
+        public string ID { get; private set; }
+
+        /// <summary>
+        ///     The name of this antag as displayed to players.
+        /// </summary>
+        public string Name { get; private set; }
+
+        /// <summary>
+        ///     The antag's objective, displayed at round-start to the player.
+        /// </summary>
+        public string Objective { get; private set; }
+
+        /// <summary>
+        ///     Whether or not the antag role is one of the bad guys.
+        /// </summary>
+        public bool Antagonist { get; private set; }
+
+        /// <summary>
+        ///     Whether or not the player can set the antag role in antag preferences.
+        /// </summary>
+        public bool SetPreference { get; private set; }
+
+        public void LoadFrom(YamlMappingNode mapping)
+        {
+            ID = mapping.GetNode("id").AsString();
+            Name = Loc.GetString(mapping.GetNode("name").ToString());
+            Objective = mapping.GetNode("objective").ToString();
+            Antagonist = mapping.GetNode("antagonist").AsBool();
+            SetPreference = mapping.GetNode("setPreference").AsBool();
+        }
+    }
+}