From ff7dc00a06bc7cfd518044a95f7652fdae5328d9 Mon Sep 17 00:00:00 2001 From: emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 28 Jul 2026 12:29:44 -0600 Subject: [PATCH] real --- Content.Benchmarks/MapLoadBenchmark.cs | 2 +- .../Tests/Power/StationPowerTests.cs | 1 - Resources/Prototypes/Maps/Pools/default.yml | 1 - Resources/Prototypes/Maps/bagel.yml | 46 ++++----- Resources/Prototypes/Maps/box.yml | 58 +++++------ Resources/Prototypes/Maps/elkridge.yml | 48 +++++----- Resources/Prototypes/Maps/exo.yml | 64 ++++++------- Resources/Prototypes/Maps/marathon.yml | 50 +++++----- Resources/Prototypes/Maps/oasis.yml | 69 +++++++------- Resources/Prototypes/Maps/packed.yml | 95 +++++++++---------- Resources/Prototypes/Maps/plasma.yml | 80 ++++++++-------- Resources/Prototypes/Maps/reach.yml | 45 --------- Resources/Prototypes/Maps/serpentcrest.yml | 61 ++++++------ Resources/Prototypes/Maps/snowball.yml | 57 +++++------ 14 files changed, 316 insertions(+), 361 deletions(-) delete mode 100644 Resources/Prototypes/Maps/reach.yml diff --git a/Content.Benchmarks/MapLoadBenchmark.cs b/Content.Benchmarks/MapLoadBenchmark.cs index 9ea95c84b6..5b3fa1e6da 100644 --- a/Content.Benchmarks/MapLoadBenchmark.cs +++ b/Content.Benchmarks/MapLoadBenchmark.cs @@ -48,7 +48,7 @@ public class MapLoadBenchmark PoolManager.Shutdown(); } - public static string[] MapsSource { get; } = { "Empty", "Saltern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Convex"}; + public static string[] MapsSource { get; } = { "Empty", "Saltern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Convex"}; [ParamsSource(nameof(MapsSource))] public string Map; diff --git a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs index 763cec328e..f4bf3a35d3 100644 --- a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs +++ b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs @@ -33,7 +33,6 @@ public sealed class StationPowerTests : GameTest "Plasma", "Relic", "Snowball", - "Reach", "Exo", ]; diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml index 9a88b13eba..1c7a8ecc21 100644 --- a/Resources/Prototypes/Maps/Pools/default.yml +++ b/Resources/Prototypes/Maps/Pools/default.yml @@ -9,7 +9,6 @@ - Oasis - Packed - Plasma - - Reach - Exo - Snowball - Serpentcrest diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 397b2628ed..6160e9e7bb 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -2,8 +2,8 @@ id: Bagel mapName: 'Bagel Station' mapPath: /Maps/bagel.yml - minPlayers: 35 - maxPlayers: 80 + minPlayers: 45 #could be 35 if roundstart bulk jobs were lowered more + maxPlayers: 65 stations: Bagel: stationProto: StandardNanotrasenStation @@ -16,7 +16,7 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml - type: StationJobs - availableJobs: # 60 jobs total w/o latejoins & interns, 77 jobs total w/ latejoins & interns + availableJobs: #non roundstart jobs exist so minplayers can be pushed down to 45. if you want to remove these raise the minimum to 53. #command (7) Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] @@ -25,41 +25,41 @@ ChiefEngineer: [ 1, 1 ] ResearchDirector: [ 1, 1 ] Quartermaster: [ 1, 1 ] - #service (13 - 14) - Bartender: [ 1, 2 ] + #service (8-11) + Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] - Chef: [ 2, 2 ] + Chef: [ 1, 1 ] Janitor: [ 2, 2 ] Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - Reporter: [ 2, 2 ] - #engineering (7) - AtmosphericTechnician: [ 3, 3 ] + Librarian: [ 0, 1 ] + ServiceWorker: [ 1, 2 ] + Reporter: [ 1, 2 ] + #engineering (6-8) + AtmosphericTechnician: [ 2, 2 ] StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 4, 4 ] #intern, not counted - #medical (6) + TechnicalAssistant: [ 2, 2 ] + #medical (8-8) Chemist: [ 2, 2 ] MedicalDoctor: [ 3, 3 ] Paramedic: [ 1, 1 ] - MedicalIntern: [ 4, 4 ] #intern, not counted - #science (5) - Scientist: [ 5, 5 ] - ResearchAssistant: [ 4, 4 ] #intern, not counted - #security (10) + MedicalIntern: [ 2, 2 ] + #science (6-6) + Scientist: [ 4, 4 ] + ResearchAssistant: [ 2, 2 ] + #security (9-10) Warden: [ 1, 1 ] - SecurityOfficer: [ 6, 6 ] + SecurityOfficer: [ 4, 5 ] Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] #intern, not counted - Lawyer: [ 2, 2 ] + SecurityCadet: [ 2, 2 ] + Lawyer: [ 1, 1 ] #supply (6) SalvageSpecialist: [ 3, 3 ] CargoTechnician: [ 3, 3 ] - #civilian (3+) + #civilian (2-3 + overflow) Passenger: [ -1, -1 ] #infinite, not counted Clown: [ 1, 1 ] Mime: [ 1, 1 ] - Musician: [ 1, 1 ] + Musician: [ 0, 1 ] #silicon (3) StationAi: [ 1, 1 ] Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index a63d48fef7..42970467ba 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -2,7 +2,8 @@ id: Box mapName: 'Box Station' mapPath: /Maps/box.yml - minPlayers: 50 + minPlayers: 45 + maxPlayers: 65 stations: Boxstation: stationProto: StandardNanotrasenStation @@ -15,8 +16,8 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml - type: StationJobs - availableJobs: # 63 jobs total w/o latejoins & interns, 82 jobs total w/ latejoins & interns - #Command (7) + availableJobs: + #command (7) Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] HeadOfSecurity: [ 1, 1 ] @@ -24,42 +25,41 @@ ChiefEngineer: [ 1, 1 ] ResearchDirector: [ 1, 1 ] Quartermaster: [ 1, 1 ] - #Service (14) - Bartender: [ 2, 2 ] - Botanist: [ 3, 3 ] - Chef: [ 2, 2 ] + #service (8-10) + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] Janitor: [ 2, 2 ] Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] + Librarian: [ 0, 1 ] + ServiceWorker: [ 1, 2 ] Reporter: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #Engineering (8) - AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 5, 5 ] - TechnicalAssistant: [ 4, 4 ] #intern, exclude from dept count - #Medical (8) + #engineering (6-8) + AtmosphericTechnician: [ 2, 2 ] + StationEngineer: [ 4, 4 ] + TechnicalAssistant: [ 2, 2 ] + #medical (8-8) Chemist: [ 2, 2 ] - MedicalDoctor: [ 4, 4 ] + MedicalDoctor: [ 3, 3 ] Paramedic: [ 1, 1 ] - MedicalIntern: [ 4, 4 ] #intern, exclude from dept count - Psychologist: [ 1, 1 ] - #Science (5) - Scientist: [ 5, 5 ] - ResearchAssistant: [ 4, 4 ] #intern, exclude from dept count - #Security (9 - 11) + MedicalIntern: [ 2, 2 ] + #science (6-6) + Scientist: [ 4, 4 ] + ResearchAssistant: [ 2, 2 ] + #security (10-11) Warden: [ 1, 1 ] - SecurityOfficer: [ 5, 7 ] + SecurityOfficer: [ 5, 6 ] Detective: [ 1, 1 ] - SecurityCadet: [ 2, 4 ] #intern, exclude from dept count - Lawyer: [ 2, 2 ] - #Supply (6) + SecurityCadet: [ 2, 2 ] + Lawyer: [ 1, 1 ] + #supply (6) SalvageSpecialist: [ 3, 3 ] CargoTechnician: [ 3, 3 ] - #Civilian (3+) + #civilian (2-3 + overflow) Passenger: [ -1, -1 ] #infinite, not counted Clown: [ 1, 1 ] Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #Silicon (3) + Musician: [ 0, 1 ] + #silicon (3) StationAi: [ 1, 1 ] - Borg: [ 2, 3 ] + Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/elkridge.yml b/Resources/Prototypes/Maps/elkridge.yml index 3239812d17..a88e7f36ad 100644 --- a/Resources/Prototypes/Maps/elkridge.yml +++ b/Resources/Prototypes/Maps/elkridge.yml @@ -2,8 +2,8 @@ id: Elkridge mapName: 'Elkridge Depot' mapPath: /Maps/elkridge.yml - minPlayers: 15 - maxPlayers: 45 + minPlayers: 25 + maxPlayers: 44 stations: Elkridge: stationProto: StandardNanotrasenStation @@ -18,7 +18,7 @@ - type: StationCargoShuttle path: /Maps/Shuttles/cargo_elkridge.yml - type: StationJobs - availableJobs: # 46 jobs total w/o latejoins & interns, 61 jobs total w/ latejoins & interns + availableJobs: #command (7) Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] @@ -27,42 +27,42 @@ ChiefEngineer: [ 1, 1 ] ResearchDirector: [ 1, 1 ] Quartermaster: [ 1, 1 ] - #service (9 - 11) + #service 7-11 Bartender: [ 1, 1 ] - Botanist: [ 1, 2 ] + Botanist: [ 2, 2 ] Chef: [ 1, 1 ] Janitor: [ 1, 2 ] Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - Reporter: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering (5 - 6) + Librarian: [ 0, 1 ] + Reporter: [ 0, 1 ] + ServiceWorker: [ 1, 2 ] + #engineering 7-8 AtmosphericTechnician: [ 2, 2 ] StationEngineer: [ 3, 4 ] - TechnicalAssistant: [ 2, 2 ] #intern, not counted - #medical (6 - 7) + TechnicalAssistant: [ 2, 2 ] + #medical 7-9 Chemist: [ 2, 2 ] MedicalDoctor: [ 2, 3 ] - MedicalIntern: [ 2, 2 ] #intern, not counted + MedicalIntern: [ 2, 2 ] Paramedic: [ 1, 1 ] - Psychologist: [ 1, 1 ] - #science (3 - 4) + Psychologist: [ 0, 1 ] + #science 5-6 Scientist: [ 3, 4 ] - ResearchAssistant: [ 2, 2 ] #intern, not counted - #security (6 - 7) + ResearchAssistant: [ 2, 2 ] + #security 6-8 Warden: [ 1, 1 ] SecurityOfficer: [ 3, 4 ] Detective: [ 1, 1 ] - SecurityCadet: [ 2, 2 ] #intern, not counted - Lawyer: [ 1, 1 ] - #supply (4 - 5) + SecurityCadet: [ 2, 2 ] + Lawyer: [ 0, 1 ] + #supply 4 SalvageSpecialist: [ 2, 2 ] - CargoTechnician: [ 2, 3 ] - #civilian (3+) - Passenger: [ -1, -1 ] #infinite, not counted + CargoTechnician: [ 2, 2 ] + #civilian 2-3 + overflow + Passenger: [ -1, -1 ] Clown: [ 1, 1 ] Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #silicon (3) + Musician: [ 0, 1 ] + #silicon 3 StationAi: [ 1, 1 ] Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/exo.yml b/Resources/Prototypes/Maps/exo.yml index 52bb586db4..eec23ee413 100644 --- a/Resources/Prototypes/Maps/exo.yml +++ b/Resources/Prototypes/Maps/exo.yml @@ -2,8 +2,8 @@ id: Exo mapName: 'Exo' mapPath: /Maps/exo.yml - minPlayers: 40 - maxPlayers: 80 + minPlayers: 45 + maxPlayers: 65 stations: Exo: stationProto: StandardNanotrasenStation @@ -19,49 +19,49 @@ path: /Maps/Shuttles/cargo_exo.yml - type: StationJobs availableJobs: - #service + #command (7) Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] - Bartender: [ 2, 2 ] + HeadOfSecurity: [ 1, 1 ] + ChiefMedicalOfficer: [ 1, 1 ] + ChiefEngineer: [ 1, 1 ] + ResearchDirector: [ 1, 1 ] + Quartermaster: [ 1, 1 ] + #service (8-10) + Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] - Chef: [ 2, 2 ] + Chef: [ 1, 1 ] Janitor: [ 2, 2 ] Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering - ChiefEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 3, 3 ] + Librarian: [ 0, 1 ] + ServiceWorker: [ 1, 2 ] + Reporter: [ 1, 1 ] + #engineering (6-8) + AtmosphericTechnician: [ 2, 2 ] StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 3, 3 ] - #medical - ChiefMedicalOfficer: [ 1, 1 ] + TechnicalAssistant: [ 2, 2 ] + #medical (8-8) Chemist: [ 2, 2 ] - MedicalDoctor: [ 4, 4 ] - MedicalIntern: [ 3, 3 ] + MedicalDoctor: [ 3, 3 ] Paramedic: [ 1, 1 ] - Psychologist: [ 1, 1 ] - #science - ResearchDirector: [ 1, 1 ] + MedicalIntern: [ 2, 2 ] + #science (6-6) Scientist: [ 4, 4 ] - ResearchAssistant: [ 3, 3 ] - #security - HeadOfSecurity: [ 1, 1 ] + ResearchAssistant: [ 2, 2 ] + #security (10-11) Warden: [ 1, 1 ] - SecurityOfficer: [ 5, 5 ] + SecurityOfficer: [ 5, 6 ] Detective: [ 1, 1 ] - SecurityCadet: [ 3, 3 ] - Lawyer: [ 2, 2 ] - #supply - Quartermaster: [ 1, 1 ] + SecurityCadet: [ 2, 2 ] + Lawyer: [ 1, 1 ] + #supply (6) SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 4, 4 ] - #civilian - Passenger: [ -1, -1 ] + CargoTechnician: [ 3, 3 ] + #civilian (2-3 + overflow) + Passenger: [ -1, -1 ] #infinite, not counted Clown: [ 1, 1 ] Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - Reporter: [ 2, 2 ] - #silicon + Musician: [ 0, 1 ] + #silicon (3) StationAi: [ 1, 1 ] Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index 1c075f5b1d..a633857eea 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -2,8 +2,8 @@ id: Marathon mapName: 'Marathon Station' mapPath: /Maps/marathon.yml - minPlayers: 35 - maxPlayers: 70 + minPlayers: 45 + maxPlayers: 65 stations: Marathon: stationProto: StandardNanotrasenStation @@ -16,7 +16,7 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml - type: StationJobs - availableJobs: # 61 jobs total w/o latejoins & interns, 76 jobs total w/ latejoins & interns + availableJobs: #command (7) Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] @@ -25,41 +25,41 @@ ChiefEngineer: [ 1, 1 ] ResearchDirector: [ 1, 1 ] Quartermaster: [ 1, 1 ] - #service (11 - 13) - Bartender: [ 2, 2 ] - Botanist: [ 2, 3 ] - Chef: [ 2, 2 ] - Janitor: [ 1, 2 ] + #service (8-10) + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] + Janitor: [ 2, 2 ] Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering (7) - AtmosphericTechnician: [ 3, 3 ] + Librarian: [ 0, 1 ] + ServiceWorker: [ 1, 2 ] + Reporter: [ 1, 1 ] + #engineering (6-8) + AtmosphericTechnician: [ 2, 2 ] StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 3, 3 ] #intern, not counted - #medical (8) + TechnicalAssistant: [ 2, 2 ] + #medical (8-8) Chemist: [ 2, 2 ] - MedicalDoctor: [ 4, 4 ] - MedicalIntern: [ 3, 3 ] #intern, not counted - Psychologist: [ 1, 1 ] + MedicalDoctor: [ 3, 3 ] Paramedic: [ 1, 1 ] - #science (4) + MedicalIntern: [ 2, 2 ] + #science (6-6) Scientist: [ 4, 4 ] - ResearchAssistant: [ 3, 3 ] #intern, not counted - #security (12) + ResearchAssistant: [ 2, 2 ] + #security (10-11) Warden: [ 1, 1 ] - SecurityOfficer: [ 8, 8 ] + SecurityOfficer: [ 5, 6 ] Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] #intern, not counted - Lawyer: [ 2, 2 ] + SecurityCadet: [ 2, 2 ] + Lawyer: [ 1, 1 ] #supply (6) SalvageSpecialist: [ 3, 3 ] CargoTechnician: [ 3, 3 ] - #civilian (3+) + #civilian (2-3 + overflow) Passenger: [ -1, -1 ] #infinite, not counted Clown: [ 1, 1 ] Mime: [ 1, 1 ] - Musician: [ 1, 1 ] + Musician: [ 0, 1 ] #silicon (3) StationAi: [ 1, 1 ] Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index af45486bfc..26f5e37892 100644 --- a/Resources/Prototypes/Maps/oasis.yml +++ b/Resources/Prototypes/Maps/oasis.yml @@ -2,7 +2,8 @@ id: Oasis mapName: 'Oasis' mapPath: /Maps/oasis.yml - minPlayers: 70 + minPlayers: 25 + maxPlayers: 44 stations: Oasis: stationProto: StandardNanotrasenStation @@ -15,7 +16,7 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_accordia.yml - type: StationJobs - availableJobs: # 72 jobs total w/o latejoins & interns, 91 jobs total w/ latejoins & interns + availableJobs: #command (7) Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] @@ -24,42 +25,42 @@ ChiefEngineer: [ 1, 1 ] ResearchDirector: [ 1, 1 ] Quartermaster: [ 1, 1 ] - #service (15 - 16) - Bartender: [ 2, 2 ] - Botanist: [ 2, 3 ] - Chef: [ 2, 2 ] - Janitor: [ 3, 3 ] + #service 7-11 + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] + Janitor: [ 1, 2 ] Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - Reporter: [ 1, 1 ] - #engineering (8) - AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 5, 5 ] - TechnicalAssistant: [ 4, 4 ] #intern, not counted - #medical (11) + Librarian: [ 0, 1 ] + Reporter: [ 0, 1 ] + ServiceWorker: [ 1, 2 ] + #engineering 7-8 + AtmosphericTechnician: [ 2, 2 ] + StationEngineer: [ 3, 4 ] + TechnicalAssistant: [ 2, 2 ] + #medical 7-9 Chemist: [ 2, 2 ] - MedicalDoctor: [ 6, 6 ] - Paramedic: [ 2, 2 ] - MedicalIntern: [ 4, 4 ] #intern, not counted - Psychologist: [ 1, 1 ] - #science (5) - Scientist: [ 5, 5 ] - ResearchAssistant: [ 6, 6 ] #intern, not counted - #security (13) + MedicalDoctor: [ 2, 3 ] + MedicalIntern: [ 2, 2 ] + Paramedic: [ 1, 1 ] + Psychologist: [ 0, 1 ] + #science 5-6 + Scientist: [ 3, 4 ] + ResearchAssistant: [ 2, 2 ] + #security 6-8 Warden: [ 1, 1 ] - SecurityOfficer: [ 8, 8 ] + SecurityOfficer: [ 3, 4 ] Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] #intern, not counted - Lawyer: [ 3, 3 ] - #supply (7) - SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 4, 4 ] - #civilian (3+) - Passenger: [ -1, -1 ] #infinite, not counted + SecurityCadet: [ 2, 2 ] + Lawyer: [ 0, 1 ] + #supply 4 + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 2, 2 ] + #civilian 2-3 + overflow + Passenger: [ -1, -1 ] Clown: [ 1, 1 ] Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #silicon (3) - Borg: [ 2, 2 ] + Musician: [ 0, 1 ] + #silicon 3 StationAi: [ 1, 1 ] + Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index 7410ce24c5..4079b4da7f 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -3,8 +3,8 @@ id: Packed mapName: 'Packed' mapPath: /Maps/packed.yml - minPlayers: 7 - maxPlayers: 35 + minPlayers: 0 + maxPlayers: 24 stations: Packed: stationProto: StandardNanotrasenStation @@ -17,49 +17,48 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_crimson.yml - type: StationJobs - availableJobs: # 47 jobs total w/o latejoins & interns, 58 jobs total w/ latejoins & interns - #command (7) - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - HeadOfSecurity: [ 1, 1 ] - ChiefMedicalOfficer: [ 1, 1 ] - ChiefEngineer: [ 1, 1 ] - ResearchDirector: [ 1, 1 ] - Quartermaster: [ 1, 1 ] - #service (8 - 10) - Bartender: [ 1, 1 ] - Botanist: [ 1, 2 ] - Chef: [ 1, 1 ] - Janitor: [ 1, 2 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering (6) - AtmosphericTechnician: [ 2, 2 ] - StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 3, 3 ] #intern, not counted - #medical (6) - Chemist: [ 2, 2 ] - MedicalDoctor: [ 3, 3 ] - MedicalIntern: [ 2, 2 ] #intern, not counted - Paramedic: [ 1, 1 ] - #science (4) - Scientist: [ 4, 4 ] - ResearchAssistant: [ 2, 2 ] #intern, not counted - #security (6) - Warden: [ 1, 1 ] - SecurityOfficer: [ 3, 3 ] - Detective: [ 1, 1 ] - SecurityCadet: [ 2, 2 ] #intern, not counted - Lawyer: [ 1, 1 ] - #supply (4) - SalvageSpecialist: [ 2, 2 ] - CargoTechnician: [ 2, 2 ] - #civilian (3+) - Passenger: [ -1, -1 ] #infinite, not counted - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #silicon (3) - StationAi: [ 1, 1 ] - Borg: [ 2, 2 ] + availableJobs: + #command (7) + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + HeadOfSecurity: [ 1, 1 ] + ChiefMedicalOfficer: [ 1, 1 ] + ChiefEngineer: [ 1, 1 ] + ResearchDirector: [ 1, 1 ] + Quartermaster: [ 1, 1 ] + #service 7-7 + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] + Janitor: [ 1, 1 ] + Chaplain: [ 1, 1 ] + ServiceWorker: [ 1, 1 ] + #engineering 6-6 + AtmosphericTechnician: [ 2, 2 ] + StationEngineer: [ 3, 3 ] + TechnicalAssistant: [ 1, 1 ] + #medical 7-7 + Chemist: [ 2, 2 ] + MedicalDoctor: [ 2, 2 ] + MedicalIntern: [ 2, 2 ] + Paramedic: [ 1, 1 ] + #science 3-3 + Scientist: [ 2, 2 ] + ResearchAssistant: [ 1, 1 ] + #security 4-7 + Warden: [ 1, 1 ] + SecurityOfficer: [ 2, 2 ] + Detective: [ 0, 1 ] + SecurityCadet: [ 1, 2 ] + Lawyer: [ 0, 1 ] + #supply 4 + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 2, 2 ] + #civilian 2-3 + overflow + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 0, 1 ] + #silicon 3 + StationAi: [ 1, 1 ] + Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/plasma.yml b/Resources/Prototypes/Maps/plasma.yml index 1d8be63fff..ba705c950b 100644 --- a/Resources/Prototypes/Maps/plasma.yml +++ b/Resources/Prototypes/Maps/plasma.yml @@ -2,8 +2,8 @@ id: Plasma mapName: 'Plasma' mapPath: /Maps/plasma.yml - minPlayers: 30 - maxPlayers: 80 + minPlayers: 25 + maxPlayers: 45 stations: Plasma: stationProto: StandardNanotrasenStation @@ -18,51 +18,51 @@ - type: StationCargoShuttle path: /Maps/Shuttles/cargo_plasma.yml - type: StationJobs - availableJobs: # 66 jobs total w/o latejoins & interns, 91 jobs total w/ latejoins & interns + availableJobs: #command (7) Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] - ChiefEngineer: [ 1, 1 ] - ChiefMedicalOfficer: [ 1, 1 ] - ResearchDirector: [ 1, 1 ] HeadOfSecurity: [ 1, 1 ] + ChiefMedicalOfficer: [ 1, 1 ] + ChiefEngineer: [ 1, 1 ] + ResearchDirector: [ 1, 1 ] Quartermaster: [ 1, 1 ] - #service (15 - 17) - Bartender: [ 2, 2 ] - Botanist: [ 2, 3 ] - Chef: [ 2, 2 ] - Janitor: [ 3, 3 ] + #service 7-11 + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] + Janitor: [ 1, 2 ] Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - Reporter: [ 2, 3 ] - #engineering (8) - AtmosphericTechnician: [ 4, 4 ] - StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 4, 4 ] #intern, not counted - #medical (9) + Librarian: [ 0, 1 ] + Reporter: [ 0, 1 ] + ServiceWorker: [ 1, 2 ] + #engineering 7-8 + AtmosphericTechnician: [ 2, 2 ] + StationEngineer: [ 3, 4 ] + TechnicalAssistant: [ 2, 2 ] + #medical 7-9 Chemist: [ 2, 2 ] - MedicalDoctor: [ 4, 4 ] - Paramedic: [ 2, 2 ] - MedicalIntern: [ 4, 4 ] #intern, not counted - Psychologist: [ 1, 1 ] - #science (4) - Scientist: [ 4, 4 ] - ResearchAssistant: [ 4, 4 ] #intern, not counted - #security (9 - 11) + MedicalDoctor: [ 2, 3 ] + MedicalIntern: [ 2, 2 ] + Paramedic: [ 1, 1 ] + Psychologist: [ 0, 1 ] + #science 5-6 + Scientist: [ 3, 4 ] + ResearchAssistant: [ 2, 2 ] + #security 6-8 Warden: [ 1, 1 ] - SecurityOfficer: [ 6, 8 ] - Detective: [ 1, 2 ] #good cop, bad cop - SecurityCadet: [ 4, 4 ] #intern, not counted - Lawyer: [ 1, 2 ] - #supply (8 - 10) - SalvageSpecialist: [ 4, 4 ] #the salvagers yearn for the mines - CargoTechnician: [ 4, 6 ] - #civilian (3 - 4+) - Passenger: [ -1, -1 ] #infinite, the tiders yearn for the mines - Clown: [ 1, 2 ] # this might be fun! + SecurityOfficer: [ 3, 4 ] + Detective: [ 1, 1 ] + SecurityCadet: [ 2, 2 ] + Lawyer: [ 0, 1 ] + #supply 4 + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 2, 2 ] + #civilian 2-3 + overflow + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #silicon (3 - 5) - Borg: [ 2, 4 ] + Musician: [ 0, 1 ] + #silicon 3 StationAi: [ 1, 1 ] + Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/reach.yml b/Resources/Prototypes/Maps/reach.yml deleted file mode 100644 index e410ddbfd3..0000000000 --- a/Resources/Prototypes/Maps/reach.yml +++ /dev/null @@ -1,45 +0,0 @@ -- type: gameMap - id: Reach - mapName: 'Reach' - mapPath: /Maps/reach.yml - minPlayers: 0 - maxPlayers: 7 - stations: - Reach: - stationProto: StandardNanotrasenStation - components: - - type: StationNameSetup - mapNameTemplate: '{0} Reach Transport {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'SC' - - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency.yml - - type: StationJobs - availableJobs: # 17 jobs total w/o latejoins, 21 jobs total w/ latejoins - #command (2) - Captain: [ 1, 1 ] - HeadOfSecurity: [ 1, 1 ] - #service (4) - Bartender: [ 1, 1 ] - Botanist: [ 1, 1 ] - Chef: [ 1, 1 ] - Janitor: [ 1, 1 ] - #engineering (2 - 3) - AtmosphericTechnician: [ 1, 1 ] - StationEngineer: [ 1, 2 ] - #medical (2 - 3) - Chemist: [ 1, 1 ] - MedicalDoctor: [ 1, 2 ] - #science (1) - Scientist: [ 1, 1 ] - #security (1 - 3) - SecurityOfficer: [ 1, 3 ] - #supply (2) - CargoTechnician: [ 1, 1 ] - SalvageSpecialist: [ 1, 1 ] - #civilian (3+) - Passenger: [ -1, -1 ] #infinite, not counted - Clown: [ 1, 1 ] - Mime: [ 1, 1 ] - Musician: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/serpentcrest.yml b/Resources/Prototypes/Maps/serpentcrest.yml index f879444173..6e66e80377 100644 --- a/Resources/Prototypes/Maps/serpentcrest.yml +++ b/Resources/Prototypes/Maps/serpentcrest.yml @@ -2,7 +2,8 @@ id: Serpentcrest mapName: 'Serpentcrest' mapPath: /Maps/serpentcrest.yml - minPlayers: 50 + minPlayers: 45 + maxPlayers: 65 stations: Serpentcrest: stationProto: StandardNanotrasenStation @@ -17,7 +18,7 @@ - type: StationCargoShuttle path: /Maps/Shuttles/cargo_syndicate.yml - type: StationJobs - availableJobs: + availableJobs: #command (7) Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] @@ -26,41 +27,41 @@ ChiefEngineer: [ 1, 1 ] ResearchDirector: [ 1, 1 ] Quartermaster: [ 1, 1 ] - #service - Bartender: [ 2, 2 ] + #service (8-10) + Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] - Chef: [ 2, 2 ] - Janitor: [ 4, 4 ] + Chef: [ 1, 1 ] + Janitor: [ 2, 2 ] Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 3 ] + Librarian: [ 0, 1 ] + ServiceWorker: [ 1, 2 ] Reporter: [ 1, 1 ] - #engineering - AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 4, 5 ] - TechnicalAssistant: [ 3, 3 ] #intern, not counted - #medical - Chemist: [ 3, 3 ] - MedicalDoctor: [ 5, 5 ] - Paramedic: [ 2, 2 ] - MedicalIntern: [ 3, 3 ] #intern, not counted - #science (5) - Scientist: [ 5, 5 ] - ResearchAssistant: [ 4, 4 ] #intern, not counted - #security + #engineering (6-8) + AtmosphericTechnician: [ 2, 2 ] + StationEngineer: [ 4, 4 ] + TechnicalAssistant: [ 2, 2 ] + #medical (8-8) + Chemist: [ 2, 2 ] + MedicalDoctor: [ 3, 3 ] + Paramedic: [ 1, 1 ] + MedicalIntern: [ 2, 2 ] + #science (6-6) + Scientist: [ 4, 4 ] + ResearchAssistant: [ 2, 2 ] + #security (10-11) Warden: [ 1, 1 ] SecurityOfficer: [ 5, 6 ] Detective: [ 1, 1 ] - SecurityCadet: [ 3, 3 ] #intern, not counted - Lawyer: [ 2, 2 ] - #supply - SalvageSpecialist: [ 4, 4 ] - CargoTechnician: [ 4, 5 ] - #civilian + SecurityCadet: [ 2, 2 ] + Lawyer: [ 1, 1 ] + #supply (6) + SalvageSpecialist: [ 3, 3 ] + CargoTechnician: [ 3, 3 ] + #civilian (2-3 + overflow) Passenger: [ -1, -1 ] #infinite, not counted Clown: [ 1, 1 ] Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #silicon - Borg: [ 3, 3 ] + Musician: [ 0, 1 ] + #silicon (3) StationAi: [ 1, 1 ] + Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/snowball.yml b/Resources/Prototypes/Maps/snowball.yml index 13c87e4e12..af62a13076 100644 --- a/Resources/Prototypes/Maps/snowball.yml +++ b/Resources/Prototypes/Maps/snowball.yml @@ -2,8 +2,8 @@ id: Snowball mapName: 'Snowball Station' mapPath: /Maps/snowball.yml - minPlayers: 15 - maxPlayers: 50 + minPlayers: 25 + maxPlayers: 44 stations: Snowball: stationProto: StandardNanotrasenStation @@ -16,7 +16,7 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml - type: StationJobs - availableJobs: # 49 roundstart jobs without interns, 75 total jobs including interns + availableJobs: #command (7) Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] @@ -25,40 +25,41 @@ ChiefEngineer: [ 1, 1 ] ResearchDirector: [ 1, 1 ] Quartermaster: [ 1, 1 ] - #service (10 - 13) - Bartender: [ 1, 2 ] + #service 7-11 + Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] - Chef: [ 2, 3 ] + Chef: [ 1, 1 ] Janitor: [ 1, 2 ] Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] - #engineering (5 - 7) + Librarian: [ 0, 1 ] + Reporter: [ 0, 1 ] + ServiceWorker: [ 1, 2 ] + #engineering 7-8 AtmosphericTechnician: [ 2, 2 ] - StationEngineer: [ 3, 5 ] - TechnicalAssistant: [ 3, 3 ] #intern, not counted - #medical (6 - 8) + StationEngineer: [ 3, 4 ] + TechnicalAssistant: [ 2, 2 ] + #medical 7-9 Chemist: [ 2, 2 ] - MedicalDoctor: [ 3, 5 ] - MedicalIntern: [ 3, 3 ] #intern, not counted + MedicalDoctor: [ 2, 3 ] + MedicalIntern: [ 2, 2 ] Paramedic: [ 1, 1 ] - #science (3 - 5) - Scientist: [ 3, 5 ] - ResearchAssistant: [ 3, 3 ] #intern, not counted - #security (6 - 8) + #science 5-6 + Scientist: [ 3, 4 ] + ResearchAssistant: [ 2, 2 ] + #security 6-8 Warden: [ 1, 1 ] - SecurityOfficer: [ 3, 5 ] + SecurityOfficer: [ 3, 4 ] Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] #intern, not counted - Lawyer: [ 1, 1 ] - #supply (6-8) - SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 3, 5 ] - #civilian (3+) - Passenger: [ -1, -1 ] #infinite, not counted + SecurityCadet: [ 2, 2 ] + Lawyer: [ 0, 1 ] + #supply 4 + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 2, 2 ] + #civilian 2-3 + overflow + Passenger: [ -1, -1 ] Clown: [ 1, 1 ] Mime: [ 1, 1 ] - Musician: [ 1, 1 ] - #silicon (3) + Musician: [ 0, 1 ] + #silicon 3 StationAi: [ 1, 1 ] Borg: [ 2, 2 ]