From bcba50c8e2ac6a990ff3835c34037c211f508e83 Mon Sep 17 00:00:00 2001 From: flyingkarii <123355664+flyingkarii@users.noreply.github.com> Date: Sun, 3 Nov 2024 00:58:22 -0300 Subject: [PATCH] Playtime Requirements Increased (#5) * No more xeno friends * Playtime requirements updated * Fixed using wrong field. --- .../Roles/Jobs/Cargo/quartermaster.yml | 6 +-- .../Roles/Jobs/Cargo/salvage_specialist.yml | 4 ++ .../Prototypes/Roles/Jobs/Command/captain.yml | 38 ++++++++++--------- .../Roles/Jobs/Command/head_of_personnel.yml | 8 +++- .../Engineering/atmospheric_technician.yml | 2 +- .../Roles/Jobs/Engineering/chief_engineer.yml | 6 +-- .../Prototypes/Roles/Jobs/Medical/chemist.yml | 4 ++ .../Jobs/Medical/chief_medical_officer.yml | 6 +-- .../Roles/Jobs/Medical/medical_doctor.yml | 4 ++ .../Roles/Jobs/Medical/paramedic.yml | 4 ++ .../Prototypes/Roles/Jobs/Security/warden.yml | 4 +- .../Roles/Jobs/Wildcards/psychologist.yml | 4 ++ 12 files changed, 59 insertions(+), 31 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 07104382ec..bda5289e8e 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -8,9 +8,9 @@ # - !type:RoleTimeRequirement #DeltaV # role: JobCargoTechnician # time: 21600 #6 hrs - - !type:CharacterDepartmentTimeRequirement - department: Logistics # DeltaV - Logistics Department replacing Cargo - min: 14400 #Floofstation 4 hour + - !type:CharacterPlaytimeRequirement + tracker: JobSalvageSpecialist # DeltaV - Logistics Department replacing Cargo + min: 7200 # The Den - 2 hour 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 1fd35653c9..56b54a843a 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -3,6 +3,10 @@ name: job-name-salvagespec description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist + requirements: + - !type:CharacterPlaytimeRequirement + tracker: JobCargoTechnician # DeltaV - Logistics Department replacing Cargo + min: 7200 # The Den - 2 hour antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Free hardsuit and weapons icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index c953c40dde..05633cb801 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -4,24 +4,26 @@ description: job-description-captain playTimeTracker: JobCaptain requirements: - - !type:CharacterDepartmentTimeRequirement - department: Logistics # DeltaV - Logistics Department replacing Cargo - min: 14400 # Floofstation - 4 hour - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 14400 # Floofstation - 4 hour - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 14400 # Floofstation - 4 hour - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 14400 # Floofstation - 4 hour - - !type:CharacterDepartmentTimeRequirement # DeltaV - Epistemics dept time requirement - department: Epistemics # DeltaV - Epistemics Department replacing Science - min: 14400 # Floofstation - 4 hour - - !type:CharacterDepartmentTimeRequirement - department: Command - min: 14400 # Floofstation - 4 hour + - !type:CharacterPlaytimeRequirement + tracker: JobQuartermaster # DeltaV - Logistics Department replacing Cargo + min: 7200 # The Den - 2 hour + - !type:CharacterPlaytimeRequirement + tracker: JobChiefEngineer + min: 7200 # The Den - 2 hour + - !type:CharacterPlaytimeRequirement + tracker: JobChiefMedicalOfficer + min: 7200 # The Den - 2 hour + - !type:CharacterPlaytimeRequirement + tracker: JobHeadOfSecurity + min: 7200 # The Den - 2 hour + - !type:CharacterPlaytimeRequirement # DeltaV - Epistemics dept time requirement + tracker: JobResearchDirector # DeltaV - Epistemics Department replacing Science + min: 7200 # The Den - 2 hour + - !type:CharacterPlaytimeRequirement # DeltaV - Epistemics dept time requirement + tracker: JobHeadOfPersonnel # DeltaV - Epistemics Department replacing Science + min: 7200 # The Den - 2 hour + - !type:CharacterOverallTimeRequirement + min: 144000 # The Den - 40 hour 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 32827f5dad..1085a1e746 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -7,7 +7,13 @@ requirements: - !type:CharacterDepartmentTimeRequirement # DeltaV - Civilian dept time requirement department: Civilian - min: 14400 # Floofstation 4 hours + min: 28800 # The Den - 8 hours + - !type:CharacterPlaytimeRequirement + tracker: JobChef + min: 7200 # The Den - 2 hour + - !type:CharacterPlaytimeRequirement + tracker: JobBotanist + min: 7200 # The Den - 2 hour weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads 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 d841249083..814d3cf1c8 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -6,7 +6,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Engineering - min: 3600 # Floofstation - 1 hour + min: 14400 # The Den - 8 hours antagAdvantage: 10 # DeltaV - Reduced TC: External Access + Fireaxe + Free Hardsuit startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 0b8c13d65b..c039561015 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -4,9 +4,9 @@ description: job-description-ce playTimeTracker: JobChiefEngineer requirements: - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 14400 # Floofstation - 4 hour + - !type:CharacterPlaytimeRequirement + tracker: JobAtmosphericTechnician + min: 28800 # The Den - 8 hour # - !type:OverallPlaytimeRequirement # time: 72000 # DeltaV - 20 hours weight: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 50ea396219..118ca2db22 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -3,6 +3,10 @@ name: job-name-chemist description: job-description-chemist playTimeTracker: JobChemist + requirements: + - !type:CharacterPlaytimeRequirement + tracker: JobMedicalDoctor + min: 14400 # The Den - 4 hour 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 efc4c7078d..ffc209a0d3 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -7,9 +7,9 @@ playTimeTracker: JobChiefMedicalOfficer antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 14400 # Floofstation - 4 hour + - !type:CharacterPlaytimeRequirement + tracker: JobChemist + min: 28800 # The Den - 8 hour 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 0946b6ba20..5d4c893ff1 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -3,6 +3,10 @@ name: job-name-doctor description: job-description-doctor playTimeTracker: JobMedicalDoctor + requirements: + - !type:CharacterPlaytimeRequirement + tracker: JobMedicalIntern + min: 7200 # The Den - 2 hour startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 18ecce1cc1..ea5ff0f2af 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -3,6 +3,10 @@ name: job-name-paramedic description: job-description-paramedic playTimeTracker: JobParamedic + requirements: + - !type:CharacterPlaytimeRequirement + tracker: JobMedicalIntern + min: 7200 # The Den - 2 hour antagAdvantage: 2 # DeltaV - Reduced TC: External Access startingGear: ParamedicGear icon: "JobIconParamedic" diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 181e289ddc..04ffe70dc8 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -5,8 +5,8 @@ playTimeTracker: JobWarden requirements: - !type:CharacterPlaytimeRequirement # DeltaV - JobSecurityOfficer time requirement. Make them experienced in proper officer work. - tracker: JobSecurityOfficer - min: 3600 # Floofstation - 1 hour + tracker: JobDetective + min: 7200 # Floofstation - 1 hour startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 6073dfa98b..064f40f937 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -3,6 +3,10 @@ name: job-name-psychologist description: job-description-psychologist playTimeTracker: JobPsychologist + requirements: + - !type:CharacterDepartmentTimeRequirement + department: Medical + min: 14400 # Floofstation 4 hrs startingGear: PsychologistGear icon: "JobIconPsychologist" supervisors: job-supervisors-cmo