From be3d07e1adf1a3adfa71f0e067fd630a6e18b1ae Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Sun, 8 Oct 2023 16:21:37 -0500 Subject: [PATCH] Adjusted playtime requirements for roles --- .../Roles/Jobs/Cargo/quartermaster.yml | 10 +++---- .../Roles/Jobs/Cargo/salvage_specialist.yml | 6 ++-- .../Roles/Jobs/Civilian/bartender.yml | 2 +- .../Roles/Jobs/Civilian/chaplain.yml | 4 +++ .../Prototypes/Roles/Jobs/Civilian/chef.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/clown.yml | 2 +- .../Roles/Jobs/Civilian/librarian.yml | 3 ++ .../Roles/Jobs/Civilian/musician.yml | 3 ++ .../Roles/Jobs/Civilian/service_worker.yml | 3 ++ .../Prototypes/Roles/Jobs/Command/captain.yml | 3 ++ .../Roles/Jobs/Command/head_of_personnel.yml | 28 ++++++++----------- .../Engineering/atmospheric_technician.yml | 2 +- .../Roles/Jobs/Engineering/chief_engineer.yml | 8 +++--- .../Prototypes/Roles/Jobs/Medical/chemist.yml | 2 +- .../Jobs/Medical/chief_medical_officer.yml | 2 +- .../Roles/Jobs/Medical/paramedic.yml | 2 +- .../Roles/Jobs/Science/research_director.yml | 2 +- .../Roles/Jobs/Security/head_of_security.yml | 16 ++++------- .../Roles/Jobs/Security/security_cadet.yml | 2 +- .../Roles/Jobs/Security/security_officer.yml | 4 +-- .../Prototypes/Roles/Jobs/Wildcards/boxer.yml | 3 ++ .../Roles/Jobs/Wildcards/psychologist.yml | 6 ++++ .../Roles/Jobs/Wildcards/reporter.yml | 3 ++ .../Roles/Jobs/Wildcards/zookeeper.yml | 3 ++ 24 files changed, 69 insertions(+), 52 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 645c2156391..d266da85d75 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -5,18 +5,18 @@ playTimeTracker: JobQuartermaster antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - - !type:RoleTimeRequirement - role: JobCargoTechnician - time: 21600 #6 hrs + # - !type:RoleTimeRequirement #DeltaV + # role: JobCargoTechnician + # time: 21600 #6 hrs - !type:RoleTimeRequirement role: JobSalvageSpecialist time: 10800 #3 hrs - - !type:RoleTimeRequirement # DeltaV - Courrier role time requirement + - !type:RoleTimeRequirement # DeltaV - Courier role time requirement role: JobMailCarrier time: 7200 # 2 hours - !type:DepartmentTimeRequirement department: Cargo - time: 36000 #10 hours + time: 43200 #DeltaV 12 hours - !type:OverallPlaytimeRequirement time: 144000 #40 hrs weight: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 6bb1945f1c8..93df4da99ef 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -7,9 +7,9 @@ requirements: - !type:DepartmentTimeRequirement department: Cargo - time: 10800 # 3 hrs - - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs + time: 21600 #DeltaV 6 hrs + # - !type:OverallPlaytimeRequirement #DeltaV + # time: 36000 #10 hrs icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 33d988749a7..0230fcbc179 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 + time: 3600 #DeltaV startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 08e99294457..62d7e4d51ca 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -3,6 +3,10 @@ name: job-name-chaplain description: job-description-chaplain playTimeTracker: JobChaplain + requirements: + - !type:DepartmentTimeRequirement + department: Science + time: 14400 #DeltaV 4 hours startingGear: ChaplainGear icon: "JobIconChaplain" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index ff9a0ab477e..2bcec8ad8a7 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 + time: 3600 #DeltaV 1 hour startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index de9ff94d644..94685b70608 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -5,7 +5,7 @@ playTimeTracker: JobClown requirements: - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement - time: 60 # 60 seconds + time: 7200 #2 hrs startingGear: ClownGear icon: "JobIconClown" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 8a3e2adaa37..91aa34f5eaa 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -3,6 +3,9 @@ name: job-name-librarian description: job-description-librarian playTimeTracker: JobLibrarian + requirements: + - !type:OverallPlaytimeRequirement #DeltaV + time: 3600 # 1 hr startingGear: LibrarianGear icon: "JobIconLibrarian" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index f50825945a3..cb43e727b71 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -3,6 +3,9 @@ name: job-name-musician description: job-description-musician playTimeTracker: JobMusician + requirements: + - !type:OverallPlaytimeRequirement + time: 7200 # DeltaV - 2 hours startingGear: MusicianGear icon: "JobIconMusician" supervisors: job-supervisors-hire diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index c4e1dd1dfb2..f7068389c12 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -3,6 +3,9 @@ name: job-name-serviceworker description: job-description-serviceworker playTimeTracker: JobServiceWorker + requirements: + - !type:OverallPlaytimeRequirement + time: 7200 # DeltaV - 2 hours startingGear: ServiceWorkerGear icon: "JobIconServiceWorker" supervisors: job-supervisors-service diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index d1b36c23e90..2af0724dbde 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -4,6 +4,9 @@ description: job-description-captain playTimeTracker: JobCaptain requirements: + - !type:DepartmentTimeRequirement + department: Cargo + time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement department: Engineering time: 18000 # DeltaV - 5 hours diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 8b7cc184dbd..474f7d76532 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -5,26 +5,20 @@ playTimeTracker: JobHeadOfPersonnel antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 18000 # DeltaV - 5 hours - - !type:DepartmentTimeRequirement - department: Medical - time: 18000 # DeltaV - 5 hours - - !type:DepartmentTimeRequirement - department: Security - time: 18000 # DeltaV - 5 hours - - !type:DepartmentTimeRequirement # DeltaV - Epistemics dept time requirement - department: Science - time: 18000 # 5 hours -# - !type:DepartmentTimeRequirement -# department: Command -# time: 36000 # 10 hours + - !type:RoleTimeRequirement + role: JobChef + time: 14400 # DeltaV - 4 hours + - !type:RoleTimeRequirement + role: JobBartender + time: 14400 # DeltaV - 4 hours + - !type:RoleTimeRequirement + role: JobJanitor + time: 14400 # DeltaV - 4 hours - !type:DepartmentTimeRequirement # DeltaV - Civilian dept time requirement department: Civilian - time: 10800 # 3 hours - - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement time: 72000 # 20 hours + - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement + time: 90000 # 25 hours weight: 20 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index c044af0ede6..5348fa8f6f1 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -7,7 +7,7 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 28800 # DeltaV - 8 hours + time: 36000 # DeltaV - 10 hours startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 01a49b6ecfd..3c8fa500d77 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,15 +6,15 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 14400 # DeltaV - 4 hours + time: 36000 # DeltaV - 10 hours # - !type:RoleTimeRequirement # DeltaV - No Station Engineer time requirement # role: JobStationEngineer # time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Engineering - time: 28800 # DeltaV - 8 hours - - !type:OverallPlaytimeRequirement - time: 72000 # DeltaV - 20 hours + time: 90000 # DeltaV - 25 hours +# - !type:OverallPlaytimeRequirement +# time: 72000 # DeltaV - 20 hours weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 72a5f47be7c..478fc27222e 100644 --- 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: 21600 # DeltaV - 6 hours + time: 28800 # DeltaV - 8 hours startingGear: ChemistGear icon: "JobIconChemist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index dc0fc90782b..1e7afa9c043 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -9,7 +9,7 @@ requirements: - !type:RoleTimeRequirement role: JobChemist - time: 10800 #3 hrs + time: 14400 #DeltaV 4 hrs # - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement # role: JobMedicalDoctor # time: 21600 #6 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 800360e99ec..db7ae7d3344 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -10,7 +10,7 @@ # time: 14400 #4 hrs - !type:DepartmentTimeRequirement # DeltaV - Medical dept time requirement department: Medical - time: 14400 # DeltaV - 4 hours + time: 28800 # DeltaV - 8 hours # - !type:OverallPlaytimeRequirement # DeltaV - No playtime requirement # time: 54000 # 15 hrs startingGear: ParamedicGear diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 8aaf50671ef..c02683c5bb2 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -7,7 +7,7 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 43200 # DeltaV - 12 hours + time: 54000 # DeltaV - 15 hours - !type:OverallPlaytimeRequirement time: 72000 # DeltaV - 20 hours weight: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index a978da96bdb..e2503548988 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,21 +6,15 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 36000 # DeltaV - 10 hours -# - !type:RoleTimeRequirement # DeltaV - No Security Officer time requirement -# role: JobSecurityOfficer -# time: 36000 #10 hrs - - !type:DepartmentTimeRequirement - department: Security - time: 36000 # DeltaV - 10 hours + time: 14400 #DeltaV 4 hrs + - !type:RoleTimeRequirement # DeltaV - No Security Officer time requirement + role: JobDetective + time: 14400 #DeltaV 4 hrs - !type:DepartmentTimeRequirement # DeltaV - Command dept time requirement department: Command time: 36000 # 10 hours - - !type:RoleTimeRequirement # DeltaV - Lawyer role time requirement - role: JobLawyer - time: 14400 # 4 hours - !type:OverallPlaytimeRequirement - time: 54000 # DeltaV - 15 hours + time: 90000 # DeltaV - 25 hours weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index b6dc7777782..1d684a0077a 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -5,7 +5,7 @@ playTimeTracker: JobSecurityCadet requirements: - !type:OverallPlaytimeRequirement - time: 18000 # DeltaV - 5 hours + time: 14400 # DeltaV - 4 hours # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit # department: Security # time: 54000 #15 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 34c5932c740..a0bb8978ab5 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -6,9 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 18000 # DeltaV - 5 hours - - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement - time: 18000 # 5 hours + time: 14400 # DeltaV - 4 hours startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index ea214f528de..f328ce3e0a2 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -3,6 +3,9 @@ name: job-name-boxer description: job-description-boxer playTimeTracker: JobBoxer + requirements: + - !type:OverallPlaytimeRequirement + time: 7200 #DeltaV 2 hours startingGear: BoxerGear icon: "JobIconBoxer" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index f405d2ca9d5..649f0528cbe 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -3,6 +3,12 @@ name: job-name-psychologist description: job-description-psychologist playTimeTracker: JobPsychologist + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 #DeltaV 10 hours + - !type:DepartmentTimeRequirement + department: Medical + time: 14400 #DeltaV 4 hrs startingGear: PsychologistGear icon: "JobIconPsychologist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index 22d9cb91afd..a3d53851e1a 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -3,6 +3,9 @@ name: job-name-reporter description: job-description-reporter playTimeTracker: JobReporter + requirements: + - !type:OverallPlaytimeRequirement + time: 7200 #DeltaV 2 hours startingGear: ReporterGear icon: "JobIconReporter" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index 73b804db7a4..5b76d08286d 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -3,6 +3,9 @@ name: job-name-zookeeper description: job-description-zookeeper playTimeTracker: JobZookeeper + requirements: + - !type:OverallPlaytimeRequirement + time: 7200 #DeltaV 2 hours startingGear: ZookeeperGear icon: "JobIconZookeeper" supervisors: job-supervisors-hop