From b03ab5cd308e51709b72c63c62b1b25ffd064e58 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 26 Jul 2023 23:14:21 -0600 Subject: [PATCH] Role timers update (#18321) * Update head_of_personnel.yml * Update captain.yml * Update quartermaster.yml * Update chief_medical_officer.yml * Update research_director.yml * Update head_of_security.yml * Update chief_engineer.yml * Update chief_engineer.yml * Update chief_medical_officer.yml * Update research_director.yml * Update head_of_security.yml * Update quartermaster.yml * Update quartermaster.yml * Update chief_engineer.yml * Update chief_medical_officer.yml * Update research_director.yml * Update head_of_security.yml --- .../Roles/Jobs/Cargo/quartermaster.yml | 6 ++-- .../Prototypes/Roles/Jobs/Command/captain.yml | 30 ++++++++----------- .../Roles/Jobs/Command/head_of_personnel.yml | 8 ++--- .../Roles/Jobs/Engineering/chief_engineer.yml | 4 ++- .../Jobs/Medical/chief_medical_officer.yml | 6 ++-- .../Roles/Jobs/Science/research_director.yml | 4 ++- .../Roles/Jobs/Security/head_of_security.yml | 7 ++--- 7 files changed, 33 insertions(+), 32 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index f3b03ce787..f4010c4de6 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -9,10 +9,12 @@ time: 21600 #6 hrs - !type:RoleTimeRequirement role: JobSalvageSpecialist - time: 21600 #6 hrs + time: 10800 #3 hrs - !type:DepartmentTimeRequirement department: Cargo - time: 108000 # 30 hrs + time: 36000 #10 hours + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs weight: 10 startingGear: QuartermasterGear icon: "QuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 86032879d4..7147adca11 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -4,24 +4,18 @@ description: job-description-captain playTimeTracker: JobCaptain requirements: - - !type:RoleTimeRequirement - role: JobHeadOfPersonnel - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobHeadOfSecurity - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobChiefMedicalOfficer - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobChiefEngineer - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobResearchDirector - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobQuartermaster - time: 21600 #6 hrs + - !type:DepartmentTimeRequirement + department: Engineering + time: 54000 # 15 hours + - !type:DepartmentTimeRequirement + department: Medical + time: 54000 # 15 hours + - !type:DepartmentTimeRequirement + department: Security + time: 54000 # 15 hours + - !type:DepartmentTimeRequirement + department: Command + time: 54000 # 15 hours weight: 20 startingGear: CaptainGear icon: "Captain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 954c49a239..23b0c315ad 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -6,16 +6,16 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 54000 # 15 hrs + time: 36000 # 10 hours - !type:DepartmentTimeRequirement department: Medical - time: 54000 # 15 hrs + time: 36000 # 10 hours - !type:DepartmentTimeRequirement department: Security - time: 54000 # 15 hrs + time: 36000 # 10 hrs - !type:DepartmentTimeRequirement department: Command - time: 72000 # 20 hrs + time: 36000 # 10 hours weight: 20 startingGear: HoPGear icon: "HeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index c81c19f7de..231f87f967 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -12,7 +12,9 @@ time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Engineering - time: 108000 # 30 hrs + time: 36000 #10 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs weight: 10 startingGear: ChiefEngineerGear icon: "ChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 22beedf860..2e71cc39aa 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -8,13 +8,15 @@ requirements: - !type:RoleTimeRequirement role: JobChemist - time: 21600 #6 hrs + time: 10800 #3 hrs - !type:RoleTimeRequirement role: JobMedicalDoctor time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Medical - time: 108000 # 30 hrs + time: 36000 #10 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs weight: 10 startingGear: CMOGear icon: "ChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index e7e3bf4a53..bddf10f856 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -6,7 +6,9 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 108000 # 30 hrs + time: 36000 #10 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs weight: 10 startingGear: ResearchDirectorGear icon: "ResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index d10ab2b43f..2135cf3168 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,16 +6,15 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobDetective - time: 7200 #2 hrs + time: 10800 #3 hrs - !type:RoleTimeRequirement role: JobSecurityOfficer time: 36000 #10 hrs - !type:DepartmentTimeRequirement department: Security time: 108000 # 30 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs weight: 10 startingGear: HoSGear icon: "HeadOfSecurity"