From 46f631fa1187b304b1a973db091bb67e9667cad7 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sun, 11 Aug 2024 18:47:26 +0000 Subject: [PATCH] tweak(AgeRequirement): Make the requiredAge more sensible (#30913) --- Content.Shared/Roles/JobRequirement/AgeRequirement.cs | 4 ++-- Resources/Locale/en-US/job/role-requirements.ftl | 4 ++-- Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 2 +- Resources/Prototypes/Roles/Jobs/Command/captain.yml | 2 +- Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml | 2 +- .../Prototypes/Roles/Jobs/Engineering/chief_engineer.yml | 2 +- .../Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml | 2 +- Resources/Prototypes/Roles/Jobs/Science/research_director.yml | 2 +- Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Content.Shared/Roles/JobRequirement/AgeRequirement.cs b/Content.Shared/Roles/JobRequirement/AgeRequirement.cs index 2cdc8e001c..75a77ae155 100644 --- 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 906a0470af..8c1af36c79 100644 --- 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 0197cd0daf..1beef052f8 100644 --- 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 e2687dd653..e74c307204 100644 --- 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 c1b285303d..7cac1456d4 100644 --- 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 c0d9569c5d..f9f94d21bb 100644 --- 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 94248450cd..0d3b5bb805 100644 --- 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 b66e89f420..48dffcb98c 100644 --- 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 c02f1cee76..7a5f5b6dcd 100644 --- 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" -- 2.52.0