JobRequiremet refactor (#579)

* JobRequirement refactor (#30347) * refactor JobRequirements * add profile support * fix * Update quartermaster.yml * sloth fixes * inport 30208 * Update DepartmentPrototype.cs * species restriction * left tweak stick * stringbuilder is cool! * Add JobRequirementOverride prototypes (#28607) * Add JobRequirementOverride prototypes * a * invert if * Add override that takes in prototypes directly * - fix: Errors. * - add: Add stuff. * - fix: Formatted message fix. * - add: Another requirement. --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
2024-08-07 17:30:43 +00:00
parent 44447d573f
commit 9a9c9598e0
53 changed files with 805 additions and 297 deletions
--- a/Resources/Locale/en-US/job/role-requirements.ftl
+++ b/Resources/Locale/en-US/job/role-requirements.ftl
@@ -4,7 +4,13 @@ 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-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:

 role-timer-locked = Locked (hover for details)

+role-timer-department-unknown = Unknown Department
+
 role-ban = You have been banned from this role.
--- a/Resources/Locale/ru-RU/job/role-requirements.ftl
+++ b/Resources/Locale/ru-RU/job/role-requirements.ftl
@@ -0,0 +1,16 @@
+role-timer-age-to-old = Для игры на этой роли вашему персонажу должно быть меньше [color=yellow]{$age}[/color] лет.
+role-timer-age-to-young = Для игры на этой роли вашему персонажу должно быть больше [color=yellow]{$age}[/color] лет.
+role-timer-whitelisted-species = Для игры на этой роли ваш персонаж должен быть одной из следующих рас:
+role-timer-blacklisted-species = Для игры на этой роли ваш персонаж не должен быть одной из следующих рас:
+
+role-timer-sex-whitelisted = Для игры на этой роли ваш персонаж должен быть [color=yellow]{$sex}[/color].
+role-timer-sex-blacklisted = Для игры на этой роли ваш персонаж не должен быть [color=yellow]{$sex}[/color].
+
+role-timer-sex-male = мужского пола
+role-timer-sex-female = женского пола
+role-timer-sex-unsexed = бесполым
+
+role-timer-gender-whitelisted = Для игры на этой роли ваш персонаж должен иметь одно из следующих местоимений:
+role-timer-gender-blacklisted = Для игры на этой роли ваш персонаж не должен иметь следующие местоимения:
+
+role-timer-department-unknown = Unknown Department
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -12,6 +12,13 @@
      time: 18000
    - !type:OverallPlaytimeRequirement
      time: 108000
+    - !type:AgeRequirement
+      requiredAge: 20
+    - !type:SpeciesRequirement
+      species:
+      - Human
+      - Dwarf
+      - Felinid
  weight: 10
  icon: "JobIconQuarterMaster"
  arrivalNotificationPrototype: QuartermasterArrivalNotification
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -16,6 +16,12 @@
    - !type:DepartmentTimeRequirement
      department: Command
      time: 18000 # 15 3
+    - !type:AgeRequirement
+      requiredAge: 20
+    - !type:SpeciesRequirement
+      species:
+      - Human
+      - Felinid
  weight: 20
  icon: "JobIconCaptain"
  requireAdminNotify: true
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -16,6 +16,12 @@
    - !type:DepartmentTimeRequirement
      department: Command
      time: 3600
+    - !type:AgeRequirement
+      requiredAge: 20
+    - !type:SpeciesRequirement
+      species:
+      - Human
+      - Felinid
  weight: 20
  icon: "JobIconHeadOfPersonnel"
  requireAdminNotify: true
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -12,6 +12,13 @@
      time: 18000
    - !type:OverallPlaytimeRequirement
      time: 108000
+    - !type:AgeRequirement
+      requiredAge: 20
+    - !type:SpeciesRequirement
+      species:
+      - Human
+      - Dwarf
+      - Felinid
  weight: 10
  icon: "JobIconChiefEngineer"
  requireAdminNotify: true
--- a/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml
+++ b/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml
@@ -12,6 +12,8 @@
    - !type:DepartmentTimeRequirement
      department: Security
      time: 36000 #10 hrs
+    - !type:AgeRequirement
+      requiredAge: 20
  icon: "JobIconInspector"
  arrivalNotificationPrototype: InspectorArrivalNotification
  supervisors: job-supervisors-captain
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -11,6 +11,12 @@
      time: 18000
    - !type:OverallPlaytimeRequirement
      time: 108000
+    - !type:AgeRequirement
+      requiredAge: 20
+    - !type:SpeciesRequirement
+      species:
+      - Human
+      - Felinid
  weight: 10
  icon: "JobIconChiefMedicalOfficer"
  arrivalNotificationPrototype: ChiefMedicalOfficerArrivalNotification
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -9,6 +9,12 @@
      time: 18000
    - !type:OverallPlaytimeRequirement
      time: 108000
+    - !type:AgeRequirement
+      requiredAge: 20
+    - !type:SpeciesRequirement
+      species:
+      - Human
+      - Felinid
  weight: 10
  icon: "JobIconResearchDirector"
  requireAdminNotify: true
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -7,6 +7,11 @@
  - !type:DepartmentTimeRequirement
    department: Security
    time: 54000 # 15 hours
+  - !type:SpeciesRequirement
+    species:
+    - Human
+    - Dwarf
+    - Felinid
  icon: "JobIconDetective"
  supervisors: job-supervisors-hos
  whitelistedSpecies:
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -12,6 +12,11 @@
      time: 18000
    - !type:OverallPlaytimeRequirement
      time: 108000
+    - !type:AgeRequirement
+      requiredAge: 20
+    - !type:SpeciesRequirement
+      species:
+      - Human
  weight: 10
  icon: "JobIconHeadOfSecurity"
  requireAdminNotify: true
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -10,6 +10,9 @@
      department: Security
      time: 54000 #15 hrs
      inverted: true # stop playing intern if you're good at security!
+    - !type:SpeciesRequirement
+      species:
+      - Human
  icon: "JobIconSecurityCadet"
  supervisors: job-supervisors-security
  whitelistedSpecies:
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -7,6 +7,9 @@
    - !type:DepartmentTimeRequirement
      department: Security
      time: 36000 #10 hrs
+    - !type:SpeciesRequirement
+      species:
+      - Human
  icon: "JobIconSecurityOfficer"
  supervisors: job-supervisors-hos
  whitelistedSpecies:
--- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
@@ -16,6 +16,9 @@
    - !type:DepartmentTimeRequirement
      department: Security
      time: 216000 # 60 hrs
+    - !type:SpeciesRequirement
+      species:
+      - Human
  icon: "JobIconSeniorOfficer"
  supervisors: job-supervisors-hos
  whitelistedSpecies:
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -7,6 +7,9 @@
    - !type:RoleTimeRequirement
      role: JobSecurityOfficer
      time: 36000 #10 hrs
+    - !type:SpeciesRequirement
+      species:
+      - Human
  icon: "JobIconWarden"
  supervisors: job-supervisors-hos
  whitelistedSpecies:
--- a/Resources/Prototypes/Roles/requirement_overrides.yml
+++ b/Resources/Prototypes/Roles/requirement_overrides.yml
@@ -0,0 +1,16 @@
+- type: jobRequirementOverride
+  id: Reduced
+  jobs:
+    Captain:
+    - !type:DepartmentTimeRequirement
+      department: Engineering
+      time: 3600 # 1 hours
+    - !type:DepartmentTimeRequirement
+      department: Medical
+      time: 3600 # 1 hours
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 3600 # 1 hours
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 3600 # 1 hour