From 85de6ffcf42d3586d1e3e1cd1d2b60860bc217f7 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 8 Sep 2023 21:43:19 +0200 Subject: [PATCH] Sort jobs in map prototypes (#19910) * Update aspid.yml * Update barratry.yml * Update cluster.yml * Update kettle.yml * Update saltern.yml * Update origin.yml --- Resources/Prototypes/Maps/aspid.yml | 56 ++++++++++++++----------- Resources/Prototypes/Maps/barratry.yml | 46 +++++++++++--------- Resources/Prototypes/Maps/cluster.yml | 54 ++++++++++++++---------- Resources/Prototypes/Maps/kettle.yml | 52 +++++++++++++---------- Resources/Prototypes/Maps/origin.yml | 58 +++++++++++++++----------- Resources/Prototypes/Maps/saltern.yml | 44 +++++++++++-------- 6 files changed, 179 insertions(+), 131 deletions(-) diff --git a/Resources/Prototypes/Maps/aspid.yml b/Resources/Prototypes/Maps/aspid.yml index 3619f6a0db..a6370b35e1 100644 --- a/Resources/Prototypes/Maps/aspid.yml +++ b/Resources/Prototypes/Maps/aspid.yml @@ -19,42 +19,50 @@ overflowJobs: - Passenger availableJobs: - CargoTechnician: [ 2, 3 ] - Passenger: [ -1, -1 ] + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 3 ] Chef: [ 1, 3 ] - Clown: [ 1, 1 ] Janitor: [ 2, 3 ] - Mime: [ 1, 1 ] - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + Lawyer: [ 2, 2 ] + ServiceWorker: [ 1, 1 ] + #engineering ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 2, 2 ] + SeniorEngineer: [ 1, 1 ] StationEngineer: [ 2, 3 ] + TechnicalAssistant: [ 4, 4 ] + #medical ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 3, 3 ] + SeniorPhysician: [ 1, 1 ] + Paramedic: [ 1, 1 ] Chemist: [ 1, 2 ] + MedicalDoctor: [ 3, 3 ] + MedicalIntern: [ 4, 4 ] + #science ResearchDirector: [ 1, 1 ] - ResearchAssistant: [ 4, 4 ] + SeniorResearcher: [ 1, 1 ] Scientist: [ 3, 4 ] + ResearchAssistant: [ 4, 4 ] + Borg: [ 2, 2 ] + #security HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 3, 4 ] - Chaplain: [ 1, 1 ] Warden: [ 1, 1 ] - Librarian: [ 1, 1 ] - Lawyer: [ 2, 2 ] + SeniorOfficer: [ 1, 1 ] + Detective: [ 1, 1 ] + SecurityOfficer: [ 3, 4 ] + SecurityCadet: [ 4, 4 ] + #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 4 ] + CargoTechnician: [ 2, 3 ] + #civillian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] Musician: [ 1, 1 ] - AtmosphericTechnician: [ 2, 2 ] - TechnicalAssistant: [ 4, 4 ] - SeniorEngineer: [ 1, 1 ] - MedicalIntern: [ 4, 4 ] - ServiceWorker: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] - Detective: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - Paramedic: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - Borg: [ 2, 2 ] + diff --git a/Resources/Prototypes/Maps/barratry.yml b/Resources/Prototypes/Maps/barratry.yml index 9dd2db5ba4..be00008dcf 100644 --- a/Resources/Prototypes/Maps/barratry.yml +++ b/Resources/Prototypes/Maps/barratry.yml @@ -19,36 +19,44 @@ overflowJobs: - Passenger availableJobs: - CargoTechnician: [ 2, 2 ] - Passenger: [ -1, -1 ] + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] - Botanist: [ 2, 2] + Botanist: [ 2, 2 ] Chef: [ 2, 2 ] - Clown: [ 1, 1 ] Janitor: [ 2, 2 ] - Mime: [ 1, 1 ] - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + Lawyer: [ 2, 2 ] + ServiceWorker: [ 1, 2 ] + #engineering ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 4, 4 ] + TechnicalAssistant: [ 2, 4 ] + #medical ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 3, 3 ] Chemist: [ 2, 2 ] + MedicalDoctor: [ 3, 3 ] + MedicalIntern: [ 2, 4 ] + #science ResearchDirector: [ 1, 1 ] Scientist: [ 4, 4 ] + ResearchAssistant: [2, 4] + #security HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 4, 4 ] - Chaplain: [ 1, 1 ] Warden: [ 1, 1 ] - Librarian: [ 1, 1 ] - Lawyer: [ 2, 2 ] + Detective: [ 1, 1 ] + SecurityOfficer: [ 4, 4 ] + SecurityCadet: [ 2, 4 ] + #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] + CargoTechnician: [ 2, 2 ] + #civillian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] Musician: [ 1, 1 ] - AtmosphericTechnician: [ 3, 3 ] - TechnicalAssistant: [ 2, 4 ] - MedicalIntern: [ 2, 4 ] - ServiceWorker: [ 1, 2 ] - SecurityCadet: [ 2, 4 ] - Detective: [ 1, 1 ] - ResearchAssistant: [2, 4] + diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index ea9ef13e9e..73d90122e1 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -1,4 +1,4 @@ -- type: gameMap +- type: gameMap id: Cluster mapName: 'Cluster' mapPath: /Maps/cluster.yml @@ -19,41 +19,49 @@ overflowJobs: - Passenger availableJobs: - CargoTechnician: [ 1, 1 ] - Passenger: [ -1, -1 ] + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] Chef: [ 1, 1 ] - Clown: [ 1, 1 ] Janitor: [ 1, 1 ] - Mime: [ 1, 1 ] - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + Lawyer: [ 1, 1 ] + ServiceWorker: [ 1, 1 ] + #engineering ChiefEngineer: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 2, 2 ] StationEngineer: [ 2, 2 ] + TechnicalAssistant: [ 2, 2 ] + #medical ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 1, 1 ] - Chemist: [ 1, 1 ] SeniorPhysician: [ 1, 1 ] + Chemist: [ 1, 1 ] + MedicalDoctor: [ 1, 1 ] + MedicalIntern: [ 2, 2 ] + #science ResearchDirector: [ 1, 1 ] + SeniorResearcher: [ 1 , 1 ] Scientist: [ 2, 2 ] ResearchAssistant: [ 2, 2 ] - SeniorResearcher: [ 1 , 1 ] + Borg: [ 1, 1 ] + #security HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 2, 2 ] - Chaplain: [ 1, 1 ] Warden: [ 1, 1 ] - Librarian: [ 1, 1 ] - Lawyer: [ 1, 1 ] - Musician: [ 1, 1 ] - AtmosphericTechnician: [ 2, 2 ] - SeniorEngineer: [ 1, 1 ] - Detective: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] - TechnicalAssistant: [ 2, 2 ] - MedicalIntern: [ 2, 2 ] - ServiceWorker: [ 1, 1 ] + Detective: [ 1, 1 ] + SecurityOfficer: [ 2, 2 ] SecurityCadet: [ 2, 2 ] - SalvageSpecialist: [ 2, 2 ] + #supply Quartermaster: [ 1, 1 ] - Borg: [ 1, 1 ] + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 1, 1 ] + #civillian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + diff --git a/Resources/Prototypes/Maps/kettle.yml b/Resources/Prototypes/Maps/kettle.yml index fbcb5f1952..3e8cba3a22 100644 --- a/Resources/Prototypes/Maps/kettle.yml +++ b/Resources/Prototypes/Maps/kettle.yml @@ -18,42 +18,50 @@ overflowJobs: - Passenger availableJobs: - CargoTechnician: [ 3, 3 ] - Passenger: [ -1, -1 ] + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 2 ] Botanist: [ 3, 4 ] Chef: [ 2, 3 ] - Clown: [ 1, 2 ] Janitor: [ 4, 4 ] - Mime: [ 1, 2 ] - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] + Chaplain: [ 1, 2 ] + Librarian: [ 1, 2 ] + Lawyer: [ 2, 3 ] + Zookeeper: [ 1, 1 ] + ServiceWorker: [ 4, 4 ] + #engineering ChiefEngineer: [ 1, 1 ] - StationEngineer: [ 4, 6 ] + AtmosphericTechnician: [ 3, 3 ] SeniorEngineer: [ 1, 1 ] + StationEngineer: [ 4, 6 ] + TechnicalAssistant: [ 8, 8 ] + #medical ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 3, 5 ] SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 3 ] + Paramedic: [ 2, 2 ] + MedicalDoctor: [ 3, 5 ] + MedicalIntern: [ 8, 8 ] + #science ResearchDirector: [ 1, 1 ] - Scientist: [ 4, 6 ] SeniorResearcher: [ 1, 1 ] + Scientist: [ 4, 6 ] ResearchAssistant: [ 8, 8 ] + #security HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 4, 6 ] - SeniorOfficer: [ 1, 1 ] - Chaplain: [ 1, 2 ] Warden: [ 1, 1 ] - Librarian: [ 1, 2 ] - Lawyer: [ 2, 3 ] + SeniorOfficer: [ 1, 1 ] + Detective: [ 1, 1 ] + SecurityOfficer: [ 4, 6 ] + SecurityCadet: [ 8, 8 ] + #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 4 ] + CargoTechnician: [ 3, 3 ] + #civillian + Passenger: [ -1, -1 ] + Clown: [ 1, 2 ] + Mime: [ 1, 2 ] Musician: [ 1, 2 ] - AtmosphericTechnician: [ 3, 3 ] - TechnicalAssistant: [ 8, 8 ] - MedicalIntern: [ 8, 8 ] - ServiceWorker: [ 4, 4 ] - SecurityCadet: [ 8, 8 ] - Detective: [ 1, 1 ] - Zookeeper: [ 1, 1 ] - Paramedic: [ 2, 2 ] + diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 130048a0ba..2e38e56064 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -18,45 +18,53 @@ overflowJobs: - Passenger availableJobs: - CargoTechnician: [ 5, 5 ] - Passenger: [ -1, -1 ] + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] Chef: [ 3, 3 ] - Clown: [ 1, 1 ] Janitor: [ 3, 3 ] - Mime: [ 1, 1 ] - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] + Chaplain: [ 2, 2 ] + Librarian: [ 2, 2 ] + Lawyer: [ 2, 2 ] + ServiceWorker: [ 3, 4 ] + #engineering ChiefEngineer: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 5, 5 ] + TechnicalAssistant: [ 2, 3 ] + #medical ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 5, 5 ] + SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 3 ] + Paramedic: [ 1, 1 ] + MedicalDoctor: [ 5, 5 ] + Psychologist: [ 1, 1 ] + MedicalIntern: [ 1, 2 ] + #science ResearchDirector: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] Scientist: [ 5, 5 ] + ResearchAssistant: [ 4, 4 ] + Borg: [ 2, 2 ] + #security HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 6, 6 ] - Chaplain: [ 2, 2 ] Warden: [ 1, 1 ] - Librarian: [ 2, 2 ] - Lawyer: [ 2, 2 ] + SeniorOfficer: [ 1, 1 ] + Detective: [ 1, 1 ] + SecurityOfficer: [ 6, 6 ] + SecurityCadet: [ 2, 4 ] + #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] + CargoTechnician: [ 5, 5 ] + #civillian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] Musician: [ 2, 2 ] - AtmosphericTechnician: [ 3, 3 ] - TechnicalAssistant: [ 2, 3 ] - MedicalIntern: [ 1, 2 ] - ServiceWorker: [ 3, 4 ] - SecurityCadet: [ 2, 4 ] - Detective: [ 1, 1 ] - ResearchAssistant: [ 4, 4 ] Boxer: [ 1, 1 ] - Paramedic: [ 1, 1 ] Reporter: [ 1, 1 ] - Psychologist: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - Borg: [ 2, 2 ] + diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index f276703575..b41286688d 100644 --- a/Resources/Prototypes/Maps/saltern.yml +++ b/Resources/Prototypes/Maps/saltern.yml @@ -18,39 +18,47 @@ overflowJobs: - Passenger availableJobs: - CargoTechnician: [ 2, 2 ] - Passenger: [ -1, -1 ] + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] Chef: [ 1, 1 ] - Clown: [ 1, 1 ] Janitor: [ 1, 1 ] - Mime: [ 1, 1 ] - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 2 ] + #engineering ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 2, 2 ] SeniorEngineer: [1, 1 ] StationEngineer: [ 3, 3 ] - AtmosphericTechnician: [ 2, 2 ] + TechnicalAssistant: [ 4, 4 ] + #medical ChiefMedicalOfficer: [ 1, 1 ] SeniorPhysician: [ 1, 1 ] - MedicalDoctor: [ 2, 2 ] Chemist: [ 2, 2 ] + MedicalDoctor: [ 2, 2 ] + MedicalIntern: [ 4, 4 ] + #science ResearchDirector: [ 1, 1 ] SeniorResearcher: [1, 1 ] Scientist: [ 3, 3 ] ResearchAssistant: [ 2, 2 ] + Borg: [ 2, 2 ] + #security HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - Musician: [ 1, 1 ] - SalvageSpecialist: [ 1, 3 ] - Quartermaster: [ 1, 1 ] - TechnicalAssistant: [ 4, 4 ] - MedicalIntern: [ 4, 4 ] - ServiceWorker: [ 2, 2 ] SecurityCadet: [ 4, 4 ] - Warden: [ 1, 1 ] - Borg: [ 2, 2 ] + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 1, 3 ] + CargoTechnician: [ 2, 2 ] + #civillian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + -- 2.51.2