Add markers for easier merges

SerbiaStrong-220 · Oct 24, 2023 · 213574c · 213574c
1 parent dfd8745
commit 213574c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -116,6 +116,7 @@ public bool IsAllowed(JobPrototype job, HumanoidCharacterProfile profile, [NotNu
         return CheckAllowed(job, profile, out reason);
     }
 
+    //SS220 Species-Job-Requirement begin
     public void BuildReason(ReasonList reasons, out FormattedMessage reason)
     {
         reason = FormattedMessage.FromMarkup(string.Join('\n', reasons));
@@ -167,6 +168,7 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
         }
         return true;
     }
+    //SS220 Species-Job-Requirement end
 
     public bool CheckRoleTime(HashSet<JobRequirement>? requirements, ReasonList reasons)
     {
@@ -185,6 +187,6 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, ReasonList reas
             reasons.Add(jobReason.ToMarkup());
         }
 
-        return reasons.Count == 0;
+        return reasons.Count == 0; //SS220 Species-Job-Requirement
     }
 }
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -797,7 +797,7 @@ private void SetSpecies(string newSpecies)
             RebuildSpriteView(); // they might have different inv so we need a new dummy
             IsDirty = true;
             _needUpdatePreview = true;
-            UpdateRoleRequirements();
+            UpdateRoleRequirements(); //SS220 Species-Job-Requirement
         }
 
         private void SetName(string newName)
@@ -833,7 +833,7 @@ public void Save()
                 _preferencesManager.UpdateCharacter(Profile, CharacterSlot);
                 OnProfileChanged?.Invoke(Profile, CharacterSlot);
                 _needUpdatePreview = true;
-                UpdateRoleRequirements();
+                UpdateRoleRequirements(); //SS220 Species-Job-Requirement
             }
         }
 

diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -118,6 +118,7 @@ private void SpawnPlayer(IPlayerSession player, EntityUid station, string? jobId
             if (jobId != null && !_playTimeTrackings.IsAllowed(player, jobId))
                 return;
 
+            //SS220 Species-Job-Requirement
             if (jobId != null && !_roleSpeciesRestrictSystem.IsAllowed(player, jobId))
                 return;
 

diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -134,6 +134,7 @@ public sealed class SpeciesPrototype : IPrototype
     [DataField("buttScanTexture")]
     public string ButtScanTexture = "/Textures/SS220/Interface/Butts/human.png";
 
+    //SS220 Species-Job-Requirement
     [DataField("blockedJobs", required: false, customTypeSerializer: typeof(PrototypeIdListSerializer<JobPrototype>))]
     public List<string> BlockedJobs { get; } = default!;
 }

diff --git a/Content.Shared/Roles/JobRequirements.cs b/Content.Shared/Roles/JobRequirements.cs
@@ -72,6 +72,7 @@ public sealed partial class OverallPlaytimeRequirement : JobRequirement
 
     public static class JobRequirements
     {
+        //SS220 Species-Job-Requirement begin
         public static bool TryRequirementsSpeciesMet(
             JobPrototype job,
             SpeciesPrototype species,
@@ -87,6 +88,8 @@ public static bool TryRequirementsSpeciesMet(
             }
             return true;
         }
+        //SS220 Species-Job-Requirement end
+
         public static bool TryRequirementsMet(
             JobPrototype job,
             Dictionary<string, TimeSpan> playTimes,
-Original file line number
+Diff line change
@@ Expand Up @@
                 if (jobId != null && !_playTimeTrackings.IsAllowed(player, jobId))
                     return;
+                //SS220 Species-Job-Requirement
                 if (jobId != null && !_roleSpeciesRestrictSystem.IsAllowed(player, jobId))
                     return;
@@ Expand Down @@