From 155aad727318c997b2bebb8700727f01b667077d Mon Sep 17 00:00:00 2001 From: AruMoon Date: Thu, 7 Sep 2023 07:20:00 +0500 Subject: [PATCH] change roles time requirements --- .../Roles/Jobs/Cargo/quartermaster.yml | 8 ++++--- .../Roles/Jobs/Cargo/salvage_specialist.yml | 4 +++- .../Roles/Jobs/Civilian/bartender.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/chef.yml | 2 +- .../Prototypes/Roles/Jobs/Command/captain.yml | 23 ++++++++++--------- .../Roles/Jobs/Command/head_of_personnel.yml | 11 +++++---- .../Engineering/atmospheric_technician.yml | 6 ++--- .../Roles/Jobs/Engineering/chief_engineer.yml | 6 +++-- .../Jobs/Engineering/station_engineer.yml | 2 +- .../Jobs/Engineering/technical_assistant.yml | 2 +- .../Prototypes/Roles/Jobs/Medical/chemist.yml | 2 +- .../Jobs/Medical/chief_medical_officer.yml | 4 +++- .../Roles/Jobs/Medical/medical_doctor.yml | 2 +- .../Roles/Jobs/Science/research_assistant.yml | 2 +- .../Roles/Jobs/Science/research_director.yml | 4 +++- .../Roles/Jobs/Science/scientist.yml | 2 +- .../Roles/Jobs/Security/detective.yml | 2 +- .../Roles/Jobs/Security/head_of_security.yml | 9 ++++++-- .../Roles/Jobs/Security/security_cadet.yml | 4 ++-- .../Roles/Jobs/Security/security_officer.yml | 2 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 2 +- 21 files changed, 59 insertions(+), 42 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 97741f30348646..110e45c5a349f0 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: 18000 + time: 10800 #3 hrs - !type:DepartmentTimeRequirement - department: Cargo - time: 72000 + time: 36000 #10 hours + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs + weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 83582e06d32d36..924357bf53b6af 100644 --- 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: 14400 + time: 10800 # 3 hrs + - !type:OverallPlaytimeRequirement + 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 5d2379ad85fc02..33d988749a74e2 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: 3600 + time: 1800 startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index c5257b1f76c487..ff9a0ab477e69b 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: 3600 + time: 1800 startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 87dbc0565cc89b..2bef9568c3b507 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -4,17 +4,18 @@ description: job-description-captain playTimeTracker: JobCaptain requirements: - - !type:RoleTimeRequirement - role: JobChiefEngineer - time: 10800 - - !type:RoleTimeRequirement - role: JobHeadOfSecurity - time: 10800 - - !type:RoleTimeRequirement - role: JobChiefMedicalOfficer - time: 10800 - - !type:OverallPlaytimeRequirement - time: 216000 + - !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: "JobIconCaptain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index c45c02d7bf2a14..88d595ffb9a180 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -6,15 +6,16 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 36000 + time: 36000 # 10 hours - !type:DepartmentTimeRequirement department: Medical - time: 36000 + time: 36000 # 10 hours - !type:DepartmentTimeRequirement department: Security - time: 36000 - - !type:OverallPlaytimeRequirement - time: 144000 + time: 36000 # 10 hours + - !type:DepartmentTimeRequirement + department: Command + time: 36000 # 10 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 3319e9afc314ed..a8960edf15a9ed 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -4,9 +4,9 @@ description: job-description-atmostech playTimeTracker: JobAtmosphericTechnician requirements: - - !type:RoleTimeRequirement - role: JobStationEngineer - time: 18000 + - !type:DepartmentTimeRequirement + department: Engineering + time: 54000 # 15 hrs 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 e0e7ea703f7f7b..d83d8171dcc9da 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,10 +6,12 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 18000 + time: 18000 #5 hrs - !type:DepartmentTimeRequirement department: Engineering - time: 72000 + time: 36000 #10 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 44ce09aab4a33d..dafbb55007e227 100644 --- 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: 10800 + time: 10800 #3 hrs startingGear: StationEngineerGear icon: "JobIconStationEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 16d2139410a418..0127be9cca626a 100644 --- 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: 36000 + time: 54000 #15 hrs inverted: true # stop playing intern if you're good at engineering! startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index a1cb57cc37ce19..ac7ccd18ebb1ef 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: 10800 + time: 10800 #3 hrs 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 5b05f9e3731754..4e20a88d15a3c2 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -14,7 +14,9 @@ time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Medical - time: 72000 + time: 36000 #10 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 5535a497d96e7e..7d028116c4a93f 100644 --- 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: 10800 + time: 10800 #3 hrs startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index a6d85b1da61216..ad69d6544cc7d1 100644 --- 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: 36000 + time: 36000 #10 hrs inverted: true # stop playing intern if you're good at science! startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 5483ee952fa4df..a5df4cb3e56948 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: 72000 + time: 36000 #10 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 1b9c39d00fe14d..ee78fa8461ae3f 100644 --- 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: 10800 + time: 10800 #3 hrs startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 571ff23d5e71bd..7b1023d6116848 100644 --- 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: 18000 + time: 18000 #5 hrs startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index c6307a485bfe58..da0ad025e5acbc 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,10 +6,15 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 18000 + time: 10800 #3 hrs + - !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 36000 #10 hrs - !type:DepartmentTimeRequirement department: Security - time: 72000 + time: 108000 # 30 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs 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 8dc461f9af7a81..b58009ae86e109 100644 --- 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 + time: 36000 #10 hrs - !type:DepartmentTimeRequirement department: Security - time: 36000 + time: 54000 #15 hrs inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index a7d7d493a05833..277ea0fd3aca77 100644 --- 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: 10800 + time: 10800 #3 hrs startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 14c818e30fac2c..5c4e222ab957ad 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 36000 + time: 36000 #10 hrs startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos