From 5097ae5e6f2df8ad8ecdb2df558d081ec56b0175 Mon Sep 17 00:00:00 2001 From: Minemoder5000 Date: Sat, 19 Apr 2025 09:31:38 -0600 Subject: [PATCH] Rebalance and reduce playtime requirements for most roles. (#36666) --- .../Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 6 ++---- .../Roles/Jobs/Cargo/salvage_specialist.yml | 4 +--- .../Prototypes/Roles/Jobs/Civilian/bartender.yml | 2 +- Resources/Prototypes/Roles/Jobs/Civilian/chef.yml | 2 +- Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/service_worker.yml | 4 ++++ Resources/Prototypes/Roles/Jobs/Command/captain.yml | 11 +++++++---- .../Roles/Jobs/Command/head_of_personnel.yml | 11 +++++++---- .../Roles/Jobs/Engineering/atmospheric_technician.yml | 6 +++--- .../Roles/Jobs/Engineering/chief_engineer.yml | 6 ++---- .../Roles/Jobs/Engineering/station_engineer.yml | 2 +- .../Roles/Jobs/Engineering/technical_assistant.yml | 2 +- Resources/Prototypes/Roles/Jobs/Medical/chemist.yml | 2 +- .../Roles/Jobs/Medical/chief_medical_officer.yml | 7 ++----- .../Prototypes/Roles/Jobs/Medical/medical_doctor.yml | 2 +- .../Prototypes/Roles/Jobs/Medical/medical_intern.yml | 2 +- Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml | 8 +++----- Resources/Prototypes/Roles/Jobs/Science/borg.yml | 5 +++-- .../Roles/Jobs/Science/research_assistant.yml | 2 +- .../Roles/Jobs/Science/research_director.yml | 11 ++++++----- Resources/Prototypes/Roles/Jobs/Science/scientist.yml | 2 +- .../Prototypes/Roles/Jobs/Security/detective.yml | 6 +++--- .../Roles/Jobs/Security/head_of_security.yml | 11 ++++++----- .../Prototypes/Roles/Jobs/Security/security_cadet.yml | 2 +- .../Roles/Jobs/Security/security_officer.yml | 2 +- Resources/Prototypes/Roles/Jobs/Security/warden.yml | 3 +++ 26 files changed, 64 insertions(+), 59 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 740afded64..e0cbc95690 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -6,15 +6,13 @@ requirements: - !type:RoleTimeRequirement role: JobCargoTechnician - time: 21600 #6 hrs + time: 18000 #5 hrs - !type:RoleTimeRequirement role: JobSalvageSpecialist - time: 10800 #3 hrs + time: 9000 #2.5 hrs - !type:DepartmentTimeRequirement department: Cargo 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 679b39f05b..8a1811f0c9 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -6,9 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Cargo - time: 10800 # 3 hrs - - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs + time: 9000 # 2.5 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 2d035ee3b4..3306c41196 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: 1800 #0.5 hr 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 5abb1d4c8e..8ea6dd1acf 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: 1800 #0.5 hr startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 713cde0e0c..3cd8258e59 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -5,7 +5,7 @@ playTimeTracker: JobLawyer requirements: - !type:OverallPlaytimeRequirement - time: 36000 # 10 hrs + time: 9000 # 2.5 hrs startingGear: LawyerGear icon: "JobIconLawyer" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 427d9b8192..9dd79cfabe 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -3,6 +3,10 @@ name: job-name-serviceworker description: job-description-serviceworker playTimeTracker: JobServiceWorker + requirements: + - !type:DepartmentTimeRequirement + department: Civilian + time: 1800 #0.5 hr 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 a22d334c94..33fc261922 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -6,16 +6,19 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 54000 # 15 hours + time: 14400 # 4 hours - !type:DepartmentTimeRequirement department: Medical - time: 54000 # 15 hours + time: 14400 # 4 hours + - !type:DepartmentTimeRequirement + department: Science + time: 14400 # 4 hours - !type:DepartmentTimeRequirement department: Security - time: 54000 # 15 hours + time: 14400 # 4 hours - !type:DepartmentTimeRequirement department: Command - time: 54000 # 15 hours + time: 14400 # 4 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 f457cfbc49..5f4691b250 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -6,16 +6,19 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 36000 # 10 hours + time: 9000 # 2.5 hours - !type:DepartmentTimeRequirement department: Medical - time: 36000 # 10 hours + time: 9000 # 2.5 hours + - !type:DepartmentTimeRequirement + department: Science + time: 9000 # 2.5 hrs - !type:DepartmentTimeRequirement department: Security - time: 36000 # 10 hrs + time: 9000 # 2.5 hrs - !type:DepartmentTimeRequirement department: Command - time: 36000 # 10 hours + time: 9000 # 2.5 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 55c5cfaa06..007b1d1174 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:DepartmentTimeRequirement - department: Engineering - time: 54000 # 15 hrs + - !type:DepartmentTimeRequirement + department: Engineering + time: 9000 #2.5 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 9bac538551..5550e02840 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,15 +6,13 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 21600 #6 hrs + time: 9000 #2.5 hrs - !type:RoleTimeRequirement role: JobStationEngineer - time: 21600 #6 hrs + time: 18000 #5 hrs - !type:DepartmentTimeRequirement department: Engineering 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 0bd81e65e0..17a6e67ae2 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: 14400 #4 hrs + time: 9000 #2.5 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 d0d3cfe786..23ad4ca401 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -8,7 +8,7 @@ time: 3600 #1 hr - !type:DepartmentTimeRequirement department: Engineering - time: 54000 #15 hrs + time: 18000 #5 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 dec2b6273e..830af18b9b 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: 14400 #4 hrs + time: 18000 #5 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 83b16d427b..d6b717df80 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -8,16 +8,13 @@ requirements: - !type:RoleTimeRequirement role: JobChemist - time: 10800 #3 hrs + time: 9000 #2.5 hrs - !type:RoleTimeRequirement role: JobMedicalDoctor - time: 21600 #6 hrs + time: 18000 #5 hrs - !type:DepartmentTimeRequirement department: Medical time: 36000 #10 hrs - - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs - weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" supervisors: job-supervisors-captain diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index c23401f0fb..f0f39d156f 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: 14400 #4 hrs + time: 9000 #2.5 hrs startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 41808558fd..f7414d75ab 100644 --- 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: 54000 # 15 hrs + time: 18000 # 5 hrs inverted: true # stop playing intern if you're good at med! startingGear: MedicalInternGear icon: "JobIconMedicalIntern" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 166f9ac42b..22b985e8d7 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -4,11 +4,9 @@ description: job-description-paramedic playTimeTracker: JobParamedic requirements: - - !type:RoleTimeRequirement - role: JobMedicalDoctor - time: 14400 #4 hrs - - !type:OverallPlaytimeRequirement - time: 54000 # 15 hrs + - !type:DepartmentTimeRequirement + department: Medical + time: 9000 #2.5 hrs startingGear: ParamedicGear icon: "JobIconParamedic" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index d85ed2a8bf..84ded8ed48 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -1,4 +1,5 @@ # No idea why it's in sci but we ball. +# Why is this one file? - type: job id: StationAi name: job-name-station-ai @@ -7,7 +8,7 @@ requirements: - !type:RoleTimeRequirement role: JobBorg - time: 54000 # 15 hrs + time: 18000 # 5 hrs canBeAntag: false icon: JobIconStationAi supervisors: job-supervisors-rd @@ -22,7 +23,7 @@ playTimeTracker: JobBorg requirements: - !type:OverallPlaytimeRequirement - time: 144000 # 40 hrs + time: 36000 # 10 hrs canBeAntag: false icon: JobIconBorg supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index c421c09b8a..8dba235d89 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: 54000 #15 hrs + time: 18000 #5 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 7d6db3e0be..bc341907d7 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -4,11 +4,12 @@ description: job-description-rd playTimeTracker: JobResearchDirector requirements: - - !type:DepartmentTimeRequirement - department: Science - time: 36000 #10 hrs - - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + - !type:RoleTimeRequirement + role: JobScientist + time: 18000 #5 hrs + - !type:DepartmentTimeRequirement + department: Science + time: 36000 #10 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 8bb99eab3c..cefd26c450 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: 14400 #4 hrs + time: 9000 #2.5 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 d6bc23f9ff..19f14eda95 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -4,9 +4,9 @@ description: job-description-detective playTimeTracker: JobDetective requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 54000 # 15 hours + - !type:RoleTimeRequirement + role: JobSecurityOfficer + 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 e22eccb7da..edf45ca944 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,15 +6,16 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 10800 #3 hrs + time: 3600 #1 hr + - !type:RoleTimeRequirement + role: JobDetective + time: 3600 #1 hr, knowing how to use the tools is important - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 36000 #10 hrs + time: 18000 #5 hrs - !type:DepartmentTimeRequirement department: Security - time: 108000 # 30 hrs - - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 36000 # 10 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 cee8a88264..260f92b587 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -8,7 +8,7 @@ time: 36000 #10 hrs - !type:DepartmentTimeRequirement department: Security - time: 54000 #15 hrs + time: 18000 #5 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 dd2f82d666..af074c17aa 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: 36000 #10 hrs + time: 9000 #2.5 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 856c866038..0a49023a44 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -6,6 +6,9 @@ requirements: - !type:RoleTimeRequirement role: JobSecurityOfficer + time: 18000 #5 hrs + - !type:DepartmentTimeRequirement + department: Security time: 36000 #10 hrs weight: 5 startingGear: WardenGear -- 2.51.2