From cdc474c7f24b338ac724d61afbcc5d6088771726 Mon Sep 17 00:00:00 2001 From: Moony Date: Tue, 10 May 2022 15:21:55 -0500 Subject: [PATCH] fix the fact I sent a bunch of maps to detroit. (#8087) --- Content.Server/Maps/GameMapPrototype.cs | 2 +- Resources/Prototypes/Maps/atlas.yml | 76 ++++++++++++----------- Resources/Prototypes/Maps/barratry.yml | 70 +++++++++++---------- Resources/Prototypes/Maps/infiltrator.yml | 16 ++--- Resources/Prototypes/Maps/pirate.yml | 16 ++--- 5 files changed, 94 insertions(+), 86 deletions(-) diff --git a/Content.Server/Maps/GameMapPrototype.cs b/Content.Server/Maps/GameMapPrototype.cs index 97ebe3c45c..3b2b16c710 100644 --- a/Content.Server/Maps/GameMapPrototype.cs +++ b/Content.Server/Maps/GameMapPrototype.cs @@ -31,7 +31,7 @@ public sealed partial class GameMapPrototype : IPrototype [DataField("mapPath", required: true)] public ResourcePath MapPath { get; } = default!; - [DataField("stations")] + [DataField("stations", required: true)] private Dictionary _stations = new(); /// diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml index f367662f5a..47d0ffb231 100644 --- a/Resources/Prototypes/Maps/atlas.yml +++ b/Resources/Prototypes/Maps/atlas.yml @@ -1,43 +1,45 @@ - type: gameMap id: atlas mapName: 'Atlas' - mapNameTemplate: '{0} Atlas {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'R4' # R4407/Goon. GS isn't as cool sounding. mapPath: /Maps/atlas.yml minPlayers: 0 maxPlayers: 25 - overflowJobs: - - Passenger - availableJobs: - CargoTechnician: [ 1, 2 ] - Passenger: [ -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 ] - ChiefEngineer: [ 1, 1 ] - StationEngineer: [ 3, 3 ] - ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 2, 2 ] - Chemist: [ 2, 2 ] - ResearchDirector: [ 1, 1 ] - Scientist: [ 1, 3 ] - HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 3, 3 ] - Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] - Lawyer: [ 1, 1 ] - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 2, 2 ] - Musician: [ 1, 1 ] - AtmosphericTechnician: [ 1, 1 ] - TechnicalAssistant: [ 1, 1 ] - MedicalIntern: [ 1, 1 ] - ServiceWorker: [ 1, 1 ] - SecurityCadet: [ 1, 1 ] + stations: + Station: #TODO: Mapper, add a BecomesStation component to the primary grid of the map. + mapNameTemplate: '{0} Atlas {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'R4' # R4407/Goon. GS isn't as cool sounding. + overflowJobs: + - Passenger + availableJobs: + CargoTechnician: [ 1, 2 ] + Passenger: [ -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 ] + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 3, 3 ] + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 2, 2 ] + Chemist: [ 2, 2 ] + ResearchDirector: [ 1, 1 ] + Scientist: [ 1, 3 ] + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 3, 3 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 2, 2 ] + Musician: [ 1, 1 ] + AtmosphericTechnician: [ 1, 1 ] + TechnicalAssistant: [ 1, 1 ] + MedicalIntern: [ 1, 1 ] + ServiceWorker: [ 1, 1 ] + SecurityCadet: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/barratry.yml b/Resources/Prototypes/Maps/barratry.yml index 426e29acb3..56e90371a6 100644 --- a/Resources/Prototypes/Maps/barratry.yml +++ b/Resources/Prototypes/Maps/barratry.yml @@ -1,39 +1,41 @@ - type: gameMap id: barratry mapName: 'Barratry' - mapNameTemplate: '{0} Barratry {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' mapPath: /Maps/barratry.yml minPlayers: 40 - overflowJobs: - - Passenger - availableJobs: - CargoTechnician: [ 3, 3 ] - Passenger: [ -1, -1 ] - Bartender: [ 2, 2 ] - Botanist: [ 3, 4] - Chef: [ 2, 2 ] - Clown: [ 1, 1 ] - Janitor: [ 2, 3 ] - Mime: [ 1, 1 ] - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] - ChiefEngineer: [ 1, 1 ] - StationEngineer: [ 5, 5 ] - ChiefMedicalOfficer: [ 1, 1 ] - MedicalDoctor: [ 4, 4 ] - Chemist: [ 2, 3 ] - ResearchDirector: [ 1, 1 ] - Scientist: [ 4, 4 ] - HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 5, 5 ] - Chaplain: [ 1, 1 ] - Warden: [ 1, 1 ] - Librarian: [ 1, 1 ] - Lawyer: [ 2, 2 ] - Quartermaster: [ 1, 1 ] - SalvageSpecialist: [ 3, 3 ] - Musician: [ 1, 1 ] - AtmosphericTechnician: [ 2, 3 ] + stations: + Station: #TODO: Mapper, add a BecomesStation component to the primary grid of the map. + mapNameTemplate: '{0} Barratry {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + overflowJobs: + - Passenger + availableJobs: + CargoTechnician: [ 3, 3 ] + Passenger: [ -1, -1 ] + Bartender: [ 2, 2 ] + Botanist: [ 3, 4] + Chef: [ 2, 2 ] + Clown: [ 1, 1 ] + Janitor: [ 2, 3 ] + Mime: [ 1, 1 ] + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 5, 5 ] + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 4, 4 ] + Chemist: [ 2, 3 ] + ResearchDirector: [ 1, 1 ] + Scientist: [ 4, 4 ] + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 5, 5 ] + Chaplain: [ 1, 1 ] + Warden: [ 1, 1 ] + Librarian: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 3, 3 ] + Musician: [ 1, 1 ] + AtmosphericTechnician: [ 2, 3 ] diff --git a/Resources/Prototypes/Maps/infiltrator.yml b/Resources/Prototypes/Maps/infiltrator.yml index 175a84f5e5..864d9d0707 100644 --- a/Resources/Prototypes/Maps/infiltrator.yml +++ b/Resources/Prototypes/Maps/infiltrator.yml @@ -1,13 +1,15 @@ - type: gameMap id: infiltrator mapName: 'Syndicate Infiltrator' - mapNameTemplate: '{0} Infiltrator {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' mapPath: /Maps/infiltrator.yml minPlayers: 0 votable: false - overflowJobs: [] - availableJobs: - Captain: [ 1, 1 ] \ No newline at end of file + stations: + Station: #TODO: Mapper, add a BecomesStation component to the primary grid of the map. + mapNameTemplate: '{0} Infiltrator {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + overflowJobs: [] + availableJobs: + Captain: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/pirate.yml b/Resources/Prototypes/Maps/pirate.yml index ed1a8b5b49..c5c2c1af79 100644 --- a/Resources/Prototypes/Maps/pirate.yml +++ b/Resources/Prototypes/Maps/pirate.yml @@ -1,13 +1,15 @@ - type: gameMap id: pirate mapName: 'Pirate Ship' - mapNameTemplate: '{0} Pirate {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' mapPath: /Maps/pirate.yml minPlayers: 0 votable: false - overflowJobs: [] - availableJobs: - Captain: [ 1, 1 ] \ No newline at end of file + stations: + Station: #TODO: Mapper, add a BecomesStation component to the primary grid of the map. + mapNameTemplate: '{0} Pirate {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + overflowJobs: [] + availableJobs: + Captain: [ 1, 1 ]