tweak(AgeRequirement): Make the requiredAge more sensible (#30913)

diff --git a/Content.Shared/Roles/JobRequirement/AgeRequirement.cs b/Content.Shared/Roles/JobRequirement/AgeRequirement.cs
index 2cdc8e001c11e1d449317987b08ed2438e11ac40..75a77ae155652eccd8ff9d15d3502bdfbe3c10e8 100644 (file)
--- a/Content.Shared/Roles/JobRequirement/AgeRequirement.cs
+++ b/Content.Shared/Roles/JobRequirement/AgeRequirement.cs
@@ -33,7 +33,7 @@ public sealed partial class AgeRequirement : JobRequirement
             reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-young",
                 ("age", RequiredAge)));
 
-            if (profile.Age <= RequiredAge)
+            if (profile.Age < RequiredAge)
                 return false;
         }
         else
@@ -41,7 +41,7 @@ public sealed partial class AgeRequirement : JobRequirement
             reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-old",
                 ("age", RequiredAge)));
 
-            if (profile.Age >= RequiredAge)
+            if (profile.Age > RequiredAge)
                 return false;
         }
 

diff --git a/Resources/Locale/en-US/job/role-requirements.ftl b/Resources/Locale/en-US/job/role-requirements.ftl
index 906a0470af0dd7b171928caaa23dbf7f660cbf8f..8c1af36c795cb91fa036fb3c140f0db254b5964e 100644 (file)
--- a/Resources/Locale/en-US/job/role-requirements.ftl
+++ b/Resources/Locale/en-US/job/role-requirements.ftl
@@ -4,8 +4,8 @@ role-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0"
 role-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime to play this role. (Are you trying to play a trainee role?)
 role-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color] to play this role.
 role-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color] to play this role. (Are you trying to play a trainee role?)
-role-timer-age-to-old = Your character must be under the age of [color=yellow]{$age}[/color] to play this role.
-role-timer-age-to-young = Your character must be over the age of [color=yellow]{$age}[/color] to play this role.
+role-timer-age-to-old = Your character's age must be at most [color=yellow]{$age}[/color] to play this role.
+role-timer-age-to-young = Your character's age must be atleast [color=yellow]{$age}[/color] to play this role.
 role-timer-whitelisted-species = Your character must be one of the following species to play this role:
 role-timer-blacklisted-species = Your character must not be one of the following species to play this role:
 

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index 0197cd0daf5a8b51d2297df8f560d9fc94a09cb1..1beef052f8286901cac969ed996f7dc29c0a97e1 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -16,7 +16,7 @@
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
     - !type:AgeRequirement
-      requiredAge: 20
+      requiredAge: 21
   weight: 10
   startingGear: QuartermasterGear
   icon: "JobIconQuarterMaster"

diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index e2687dd6538130e530b3b24d5aac9fa4df976fbb..e74c307204bfe1bc81d2b20449da3fbf1059ce8b 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -17,7 +17,7 @@
       department: Command
       time: 54000 # 15 hours
     - !type:AgeRequirement
-      requiredAge: 20
+      requiredAge: 21
   weight: 20
   startingGear: CaptainGear
   icon: "JobIconCaptain"

diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index c1b285303d2cef247055e87d91635408ea10e477..7cac1456d4f116dc5c7138bf64f2065462a9aef4 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -17,7 +17,7 @@
       department: Command
       time: 36000 # 10 hours
     - !type:AgeRequirement
-      requiredAge: 20
+      requiredAge: 21
   weight: 20
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index c0d9569c5da7fc2fa61acaedccbebdf3dc89c4b5..f9f94d21bbce6a7fba34d6bf11ff98bb842e2b7d 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -16,7 +16,7 @@
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
     - !type:AgeRequirement
-      requiredAge: 20
+      requiredAge: 21
   weight: 10
   startingGear: ChiefEngineerGear
   icon: "JobIconChiefEngineer"

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index 94248450cdad1d4855be745f7b5c7e41f6fa5136..0d3b5bb80511fb84254f1f2cca30e33ebcb395da 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -18,7 +18,7 @@
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
     - !type:AgeRequirement
-      requiredAge: 20
+      requiredAge: 21
   weight: 10
   startingGear: CMOGear
   icon: "JobIconChiefMedicalOfficer"

diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index b66e89f42077d326e254a84cc48d933bd16dbae5..48dffcb98cb8b3f9208ad31b62485bb2a9663d61 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -10,7 +10,7 @@
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
     - !type:AgeRequirement
-      requiredAge: 20
+      requiredAge: 21
   weight: 10
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"

diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index c02f1cee760596a413cd11a9d7b60dfe30fbc1a8..7a5f5b6dcde331a7fed0333a1c9f1562fb40f058 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -16,7 +16,7 @@
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
     - !type:AgeRequirement
-      requiredAge: 20
+      requiredAge: 21
   weight: 10
   startingGear: HoSGear
   icon: "JobIconHeadOfSecurity"