update non-command role requirements (#17440)

* adjust non-head role timers * double intern role caps requested by emisse * reduce base intern requirement to 4 hrs
2023-07-18 14:04:26 -05:00
parent ee4809a222
commit e0e8394246
29 changed files with 80 additions and 72 deletions
--- a/Resources/Prototypes/Maps/aspid.yml
+++ b/Resources/Prototypes/Maps/aspid.yml
@@ -35,7 +35,7 @@
            MedicalDoctor: [ 3, 3 ]
            Chemist: [ 1, 2 ]
            ResearchDirector: [ 1, 1 ]
-            ResearchAssistant: [ 2, 2 ]
+            ResearchAssistant: [ 4, 4 ]
            Scientist: [ 3, 4 ]
            HeadOfSecurity: [ 1, 1 ]
            SecurityOfficer: [ 3, 4 ]
@@ -47,9 +47,9 @@
            SalvageSpecialist: [ 3, 4 ]
            Musician: [ 1, 1 ]
            AtmosphericTechnician: [ 2, 2 ]
-            TechnicalAssistant: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
+            TechnicalAssistant: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ]
            ServiceWorker: [ 1, 1 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityCadet: [ 4, 4 ]
            Detective: [ 1, 1 ]
            Paramedic: [1, 1]
--- a/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@ -46,11 +46,11 @@
            SalvageSpecialist: [ 3, 3 ]
            Musician: [ 1, 1 ]
            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
+            TechnicalAssistant: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ]
            ServiceWorker: [ 2, 2 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityCadet: [ 4, 4 ]
            Reporter: [ 2, 2 ]
            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 2, 2 ]
+            ResearchAssistant: [ 4, 4 ]
            Paramedic: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/barratry.yml
+++ b/Resources/Prototypes/Maps/barratry.yml
@@ -46,9 +46,9 @@
            SalvageSpecialist: [ 3, 3 ]
            Musician: [ 1, 1 ]
            AtmosphericTechnician: [ 2, 3 ]
-            TechnicalAssistant: [ 1, 2 ]
-            MedicalIntern: [ 1, 2 ]
+            TechnicalAssistant: [ 2, 4 ]
+            MedicalIntern: [ 2, 4 ]
            ServiceWorker: [ 1, 2 ]
-            SecurityCadet: [ 1, 2 ]
+            SecurityCadet: [ 2, 4 ]
            Detective: [ 1, 1 ]
-            ResearchAssistant: [1, 2]
+            ResearchAssistant: [2, 4]
--- a/Resources/Prototypes/Maps/box.yml
+++ b/Resources/Prototypes/Maps/box.yml
@@ -45,10 +45,10 @@
            SalvageSpecialist: [ 3, 3 ]
            Musician: [ 2, 2 ]
            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 4, 4 ]
-            MedicalIntern: [ 4, 4 ]
+            TechnicalAssistant: [ 8, 8 ]
+            MedicalIntern: [ 8, 8 ]
            ServiceWorker: [ 4, 4 ]
-            SecurityCadet: [ 4, 4 ]
+            SecurityCadet: [ 8, 8 ]
            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 4, 4 ]
+            ResearchAssistant: [ 8, 8 ]
            Paramedic: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/cluster.yml
+++ b/Resources/Prototypes/Maps/cluster.yml
@@ -36,7 +36,7 @@
            Chemist: [ 1, 1 ]
            ResearchDirector: [ 1, 1 ]
            Scientist: [ 2, 2 ]
-            ResearchAssistant: [ 1, 1 ]
+            ResearchAssistant: [ 2, 2 ]
            HeadOfSecurity: [ 1, 1 ]
            SecurityOfficer: [ 2, 2 ]
            Chaplain: [ 1, 1 ]
@@ -46,9 +46,9 @@
            Musician: [ 1, 1 ]
            AtmosphericTechnician: [ 2, 2 ]
            Detective: [ 1, 1 ]
-            TechnicalAssistant: [ 1, 1 ]
-            MedicalIntern: [ 1, 1 ]
+            TechnicalAssistant: [ 2, 2 ]
+            MedicalIntern: [ 2, 2 ]
            ServiceWorker: [ 1, 1 ]
-            SecurityCadet: [ 1, 1 ]
+            SecurityCadet: [ 2, 2 ]
            SalvageSpecialist: [ 2, 2 ]
            Quartermaster: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/fland.yml
+++ b/Resources/Prototypes/Maps/fland.yml
@@ -45,10 +45,10 @@
            SalvageSpecialist: [ 3, 3 ]
            Musician: [ 1, 1 ]
            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
+            TechnicalAssistant: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ]
            ServiceWorker: [ 2, 2 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityCadet: [ 4, 4 ]
            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 3, 3 ]
+            ResearchAssistant: [ 6, 6 ]
            Paramedic: [ 2, 2 ]
--- a/Resources/Prototypes/Maps/kettle.yml
+++ b/Resources/Prototypes/Maps/kettle.yml
@@ -35,7 +35,7 @@
            Chemist: [ 2, 3 ]
            ResearchDirector: [ 1, 1 ]
            Scientist: [ 4, 6 ]
-            ResearchAssistant: [ 4, 4 ]
+            ResearchAssistant: [ 8, 8 ]
            HeadOfSecurity: [ 1, 1 ]
            SecurityOfficer: [ 4, 6 ]
            Chaplain: [ 1, 2 ]
@@ -46,10 +46,10 @@
            SalvageSpecialist: [ 3, 4 ]
            Musician: [ 1, 2 ]
            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 4, 4 ]
-            MedicalIntern: [ 4, 4 ]
+            TechnicalAssistant: [ 8, 8 ]
+            MedicalIntern: [ 8, 8 ]
            ServiceWorker: [ 4, 4 ]
-            SecurityCadet: [ 4, 4 ]
+            SecurityCadet: [ 8, 8 ]
            Detective: [ 1, 1 ]
            Zookeeper: [1, 1]
            Paramedic: [2, 2]
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -46,10 +46,10 @@
            SalvageSpecialist: [ 3, 3 ]
            Musician: [ 1, 1 ]
            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
+            TechnicalAssistant: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ]
            ServiceWorker: [ 2, 2 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityCadet: [ 4, 4 ]
            Psychologist: [ 1, 1 ]
            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 2, 2 ]
+            ResearchAssistant: [ 4, 4 ]
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -45,10 +45,10 @@
            SalvageSpecialist: [ 3, 3 ]
            Musician: [ 2, 2 ]
            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 4, 4 ]
-            MedicalIntern: [ 4, 4 ]
+            TechnicalAssistant: [ 8, 8 ]
+            MedicalIntern: [ 8, 8 ]
            ServiceWorker: [ 4, 4 ]
-            SecurityCadet: [ 4, 4 ]
+            SecurityCadet: [ 8, 8 ]
            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 4, 4 ]
+            ResearchAssistant: [ 8, 8 ]
            Paramedic: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/moose.yml
+++ b/Resources/Prototypes/Maps/moose.yml
@@ -36,7 +36,7 @@
            Chemist: [ 2, 2 ]
            ResearchDirector: [ 1, 1 ]
            Scientist: [ 3, 3 ]
-            ResearchAssistant: [ 2, 2 ]
+            ResearchAssistant: [ 4, 4 ]
            HeadOfSecurity: [ 1, 1 ]
            SecurityOfficer: [ 2, 3 ]
            Chaplain: [ 1, 1 ]
@@ -45,9 +45,9 @@
            Lawyer: [ 1, 1 ]
            SalvageSpecialist: [ 1, 2 ]
            Quartermaster: [ 1, 1 ]
-            TechnicalAssistant: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
+            TechnicalAssistant: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ]
            ServiceWorker: [ 2, 2 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityCadet: [ 4, 4 ]
            Detective: [ 1, 1 ]
            Warden: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/omega.yml
+++ b/Resources/Prototypes/Maps/omega.yml
@@ -34,7 +34,7 @@
            Chemist: [ 2, 2 ]
            ResearchDirector: [ 1, 1 ]
            Scientist: [ 3, 3 ]
-            ResearchAssistant: [ 1, 1 ]
+            ResearchAssistant: [ 2, 2 ]
            HeadOfSecurity: [ 1, 1 ]
            SecurityOfficer: [ 3, 3 ]
            Chaplain: [ 1, 1 ]
@@ -44,9 +44,9 @@
            Musician: [ 1, 1 ]
            AtmosphericTechnician: [ 2, 2 ]
            Detective: [ 1, 1 ]
-            TechnicalAssistant: [ 1, 1 ]
-            MedicalIntern: [ 1, 1 ]
+            TechnicalAssistant: [ 2, 2 ]
+            MedicalIntern: [ 2, 2 ]
            ServiceWorker: [ 1, 1 ]
-            SecurityCadet: [ 1, 1 ]
+            SecurityCadet: [ 2, 2 ]
            SalvageSpecialist: [ 2, 2 ]
            Quartermaster: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/origin.yml
+++ b/Resources/Prototypes/Maps/origin.yml
@@ -45,12 +45,12 @@
            SalvageSpecialist: [ 3, 3 ]
            Musician: [ 2, 2 ]
            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
+            TechnicalAssistant: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ]
            ServiceWorker: [ 4, 4 ]
-            SecurityCadet: [ 3, 3 ]
+            SecurityCadet: [ 6, 6 ]
            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 2, 2]
+            ResearchAssistant: [ 4, 4]
            Boxer: [ 1, 1]
            Paramedic: [ 1, 1]
            Psychologist: [ 1, 1]
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -36,7 +36,7 @@
            Chemist: [ 2, 2 ]
            ResearchDirector: [ 1, 1 ]
            Scientist: [ 3, 3 ]
-            ResearchAssistant: [ 1, 1 ]
+            ResearchAssistant: [ 2, 2 ]
            HeadOfSecurity: [ 1, 1 ]
            SecurityOfficer: [ 3, 3 ]
            Chaplain: [ 1, 1 ]
@@ -45,8 +45,8 @@
            Lawyer: [ 1, 1 ]
            SalvageSpecialist: [ 1, 3 ]
            Quartermaster: [ 1, 1 ]
-            TechnicalAssistant: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
+            TechnicalAssistant: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ]
            ServiceWorker: [ 2, 2 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityCadet: [ 4, 4 ]
            Warden: [ 1, 1 ]
--- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
@@ -6,7 +6,9 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Cargo
-      time: 3600
+      time: 10800 # 3 hrs
+    - !type:OverallPlaytimeRequirement
+      time: 36000 #10 hrs
  icon: "ShaftMiner"
  startingGear: SalvageSpecialistGear
  supervisors: job-supervisors-qm
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -3,6 +3,9 @@
  name: job-name-lawyer
  description: job-description-lawyer
  playTimeTracker: JobLawyer
+  requirements:
+    - !type:OverallPlaytimeRequirement
+      time: 36000 # 10 hrs
  startingGear: LawyerGear
  icon: "Lawyer"
  supervisors: job-supervisors-hop
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -3,6 +3,9 @@
  name: job-name-mime
  description: job-description-mime
  playTimeTracker: JobMime
+  requirements:
+    - !type:OverallPlaytimeRequirement
+      time: 14400 #4 hrs
  startingGear: MimeGear
  icon: "Mime"
  supervisors: job-supervisors-hop
--- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -6,7 +6,7 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Engineering
-      time: 3600
+      time: 54000 # 15 hrs
  startingGear: AtmosphericTechnicianGear
  icon: "AtmosphericTechnician"
  supervisors: job-supervisors-ce
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -6,7 +6,7 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Engineering
-      time: 1800
+      time: 14400 #4 hrs
  startingGear: StationEngineerGear
  icon: "StationEngineer"
  supervisors: job-supervisors-ce
--- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -6,7 +6,7 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Engineering
-      time: 28800
+      time: 54000 #15 hrs
      inverted: true # stop playing intern if you're good at engineering!
  startingGear: TechnicalAssistantGear
  icon: "TechnicalAssistant"
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -6,7 +6,7 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Medical
-      time: 1800
+      time: 14400 #4 hrs
  startingGear: ChemistGear
  icon: "Chemist"
  supervisors: job-supervisors-cmo
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -6,7 +6,7 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Medical
-      time: 1800
+      time: 14400 #4 hrs
  startingGear: DoctorGear
  icon: "MedicalDoctor"
  supervisors: job-supervisors-cmo
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -6,7 +6,7 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Medical
-      time: 28800
+      time: 54000 # 15 hrs
      inverted: true # stop playing intern if you're good at med!
  startingGear: MedicalInternGear
  icon: "MedicalIntern"
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -4,11 +4,11 @@
  description: job-description-paramedic
  playTimeTracker: JobParamedic
  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Medical
-      time: 9000
+    - !type:RoleTimeRequirement
+      role: JobMedicalDoctor
+      time: 14400 #4 hrs
    - !type:OverallPlaytimeRequirement
-      time: 54000
+      time: 54000 # 15 hrs
  startingGear: ParamedicGear
  icon: "Paramedic"
  supervisors: job-supervisors-cmo
--- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -6,7 +6,7 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Science
-      time: 28800
+      time: 54000 #15 hrs
      inverted: true # stop playing intern if you're good at science!
  startingGear: ResearchAssistantGear
  icon: "ResearchAssistant"
--- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
@@ -6,7 +6,7 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Science
-      time: 1800
+      time: 14400 #4 hrs
  startingGear: ScientistGear
  icon: "Scientist"
  supervisors: job-supervisors-rd
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -6,7 +6,7 @@
  requirements:
  - !type:DepartmentTimeRequirement
    department: Security
-    time: 7200 #2 hrs
+    time: 54000 # 15 hours
  startingGear: DetectiveGear
  icon: "Detective"
  supervisors: job-supervisors-hos
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -5,10 +5,10 @@
  playTimeTracker: JobSecurityCadet
  requirements:
    - !type:OverallPlaytimeRequirement
-      time: 18000 #5 hrs
+      time: 36000 #10 hrs
    - !type:DepartmentTimeRequirement
      department: Security
-      time: 28800 #8 hrs
+      time: 54000 #15 hrs
      inverted: true # stop playing intern if you're good at security!
  startingGear: SecurityCadetGear
  icon: "SecurityCadet"
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -6,7 +6,7 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Security
-      time: 3600 #1 hr
+      time: 36000 #10 hrs
  startingGear: SecurityOfficerGear
  icon: "SecurityOfficer"
  supervisors: job-supervisors-hos
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -4,9 +4,9 @@
  description: job-description-warden
  playTimeTracker: JobWarden
  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 10800
+    - !type:RoleTimeRequirement
+      role: JobSecurityOfficer
+      time: 36000 #10 hrs
  startingGear: WardenGear
  icon: "Warden"
  supervisors: job-supervisors-hos