From ef840804549ab427ccc80968decdad0e0a9a96d9 Mon Sep 17 00:00:00 2001 From: BL02DL Date: Mon, 28 Oct 2024 21:16:54 +0700 Subject: [PATCH 1/2] H_Maps --- .../_LostParadise/Maps/Hell/H_asterisk.yml | 77 +++++++++++++++++++ .../_LostParadise/Maps/Hell/H_kerberos.yml | 77 +++++++++++++++++++ .../_LostParadise/Maps/Hell/H_normandy.yml | 76 ++++++++++++++++++ .../_LostParadise/Maps/Hell/H_pebble.yml | 70 +++++++++++++++++ .../Maps/Pools/LostParadiseMapPool.yml | 9 +-- 5 files changed, 304 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/_LostParadise/Maps/Hell/H_asterisk.yml create mode 100644 Resources/Prototypes/_LostParadise/Maps/Hell/H_kerberos.yml create mode 100644 Resources/Prototypes/_LostParadise/Maps/Hell/H_normandy.yml create mode 100644 Resources/Prototypes/_LostParadise/Maps/Hell/H_pebble.yml diff --git a/Resources/Prototypes/_LostParadise/Maps/Hell/H_asterisk.yml b/Resources/Prototypes/_LostParadise/Maps/Hell/H_asterisk.yml new file mode 100644 index 0000000000..8d0de3d64f --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Maps/Hell/H_asterisk.yml @@ -0,0 +1,77 @@ +- type: gameMap + id: H_LPPAsterisk + mapName: 'Астериск' + mapPath: /Maps/_LostParadise/Hell/H_LPPAsterisk.yml + minPlayers: 20 + maxPlayers: 70 + stations: + H_LPPAsterisk: + stationProto: StandardNanotrasenStation + components: + - type: StationRandomTransform + enableStationRotation: false + maxStationOffset: null + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Kaeri.yml + - type: StationNameSetup + mapNameTemplate: '{0} Станция Астериск {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'DV' + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 1, 2 ] + Botanist: [ 2, 3 ] + Chef: [ 1, 2 ] + Clown: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Reporter: [ 1, 1 ] + Musician: [ 1, 1 ] + Janitor: [ 1, 2 ] + Mime: [ 1, 1 ] + #engineering + ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 1, 1 ] #back by popular demand + StationEngineer: [ 3, 3 ] + TechnicalAssistant: [ 2, 4 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + Chemist: [ 1, 2 ] + Paramedic: [ 1, 2 ] + MedicalDoctor: [ 2, 3 ] + MedicalIntern: [ 2, 3 ] + #science + ResearchDirector: [ 1, 1 ] + Chaplain: [ 1, 1 ] + ForensicMantis: [ 1, 1 ] + Scientist: [ 2, 3 ] + ResearchAssistant: [ 2, 3 ] + Borg: [ 1, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + Detective: [ 1, 1 ] + Brigmedic: [ 1, 1 ] + SecurityOfficer: [ 2, 3 ] + SecurityCadet: [ 1, 3 ] + Prisoner: [ 1, 2 ] # :^) + #supply + Quartermaster: [ 1, 1 ] + MailCarrier: [ 1, 2 ] + SalvageSpecialist: [ 2, 3 ] + CargoTechnician: [ 2, 4 ] + #civilian + Passenger: [ -1, -1 ] + #justice + Prosecutor: [ 1, 1 ] + Clerk: [ 1, 1 ] + ChiefJustice: [ 1, 1 ] + #LOST PARADISE + LPPBlueShieldOfficer: [ 1, 1 ] + LPPAdjutant: [ 1, 1 ] + LPPSecurityEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_LostParadise/Maps/Hell/H_kerberos.yml b/Resources/Prototypes/_LostParadise/Maps/Hell/H_kerberos.yml new file mode 100644 index 0000000000..c9795afbac --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Maps/Hell/H_kerberos.yml @@ -0,0 +1,77 @@ +- type: gameMap + id: H_LPPKerberos + mapName: 'NS Керберос' + mapPath: /Maps/_LostParadise/Hell/H_LPPKerberos.yml + minPlayers: 30 + stations: + H_LPPKerberos: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} NS Керберос {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/_LostParadise/Shuttles/LPPKerberos_evac.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + # Service + Bartender: [ 2, 2 ] + Botanist: [ 3, 4] + Chef: [ 2, 3 ] + Janitor: [ 2, 4 ] + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + ServiceWorker: [ 4, 6 ] + # Engineering + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 4, 5 ] + AtmosphericTechnician: [ 3, 4 ] + TechnicalAssistant: [ 2, 4 ] + # Medical + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 4, 6 ] + Chemist: [ 2, 2 ] + MedicalIntern: [ 2, 4 ] + Paramedic: [ 1, 1 ] + MedicalBorg: [ 2, 3 ] + # RND + ResearchDirector: [ 1, 1 ] + Scientist: [ 4, 6 ] + ResearchAssistant: [ 2, 4 ] + Borg: [ 3, 6 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 2 ] + ForensicMantis: [ 1, 2 ] + # Security + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 2, 4 ] + Warden: [ 1, 1 ] + Lawyer: [ 2, 2 ] + SecurityCadet: [ 1, 2 ] + Detective: [ 1, 1 ] + Prisoner: [ 3, 4 ] + Brigmedic: [ 1, 1 ] + PrisonGuard: [ 1, 1 ] + # Logistics + CargoTechnician: [ 3, 4 ] + Quartermaster: [ 1, 1 ] + MailCarrier: [ 1, 2 ] + SalvageSpecialist: [ 3, 3 ] + # Civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 3 ] + Reporter: [ 1, 2 ] + # Justice + Prosecutor: [ 1, 1 ] + Clerk: [ 2, 2 ] + ChiefJustice: [ 1, 1 ] + #LOST PARADISE + LPPBlueShieldOfficer: [ 1, 1 ] + LPPAdjutant: [ 1, 1 ] + LPPSecurityEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_LostParadise/Maps/Hell/H_normandy.yml b/Resources/Prototypes/_LostParadise/Maps/Hell/H_normandy.yml new file mode 100644 index 0000000000..eb26672feb --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Maps/Hell/H_normandy.yml @@ -0,0 +1,76 @@ +- type: gameMap + id: H_LPPNormandy + mapName: 'N7 Нормандия' + mapPath: /Maps/_LostParadise/Hell/H_LPPNormandy.yml + minPlayers: 20 + stations: + H_LPPNormandy: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} N7 Нормандия {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_UCLB.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + # Service + Bartender: [ 2, 2 ] + Botanist: [ 2, 3] + Chef: [ 1, 2 ] + Janitor: [ 2, 2 ] + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + ServiceWorker: [ 3, 4 ] + # Engineering + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 4, 5 ] + AtmosphericTechnician: [ 2, 2 ] + TechnicalAssistant: [ 2, 4 ] + # Medical + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 3, 5 ] + Chemist: [ 2, 2 ] + MedicalIntern: [ 2, 4 ] + Paramedic: [ 1, 1 ] + # RND + ResearchDirector: [ 1, 1 ] + Scientist: [ 3, 4 ] + ResearchAssistant: [ 2, 4 ] + Borg: [ 1, 2 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ForensicMantis: [ 1, 2 ] + # Security + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 3, 4 ] + Warden: [ 1, 1 ] + Lawyer: [ 2, 3 ] + SecurityCadet: [ 2, 2 ] + Detective: [ 1, 1 ] + Prisoner: [ 2, 3 ] + Brigmedic: [ 1, 1 ] + PrisonGuard: [ 1, 1 ] + # Logistics + CargoTechnician: [ 3, 4 ] + Quartermaster: [ 1, 1 ] + MailCarrier: [ 1, 2 ] + SalvageSpecialist: [ 4, 4 ] + # Civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 3 ] + Reporter: [ 1, 2 ] + # Justice + Prosecutor: [ 1, 1 ] + Clerk: [ 1, 1 ] + ChiefJustice: [ 1, 1 ] + #LOST PARADISE + LPPBlueShieldOfficer: [ 1, 1 ] + LPPAdjutant: [ 1, 1 ] + LPPSecurityEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_LostParadise/Maps/Hell/H_pebble.yml b/Resources/Prototypes/_LostParadise/Maps/Hell/H_pebble.yml new file mode 100644 index 0000000000..cc65e04cda --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Maps/Hell/H_pebble.yml @@ -0,0 +1,70 @@ +- type: gameMap + id: H_LPPPebble + mapName: 'Пеббл' + mapPath: /Maps/_LostParadise/Hell/H_LPPPebble.yml + minPlayers: 0 + maxPlayers: 30 + stations: + H_LPPPebbleStation: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Станция Пеббл {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'DV' + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 1, 2 ] + Botanist: [ 2, 2 ] + Boxer: [ 2, 2 ] + Chef: [ 2 , 2 ] + Clown: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Musician: [ 1, 1 ] + Janitor: [ 1, 2 ] + Mime: [ 1, 1 ] + #engineering + ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 1, 1] + StationEngineer: [ 2, 3 ] + TechnicalAssistant: [ 2, 2 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + Chemist: [ 1, 1 ] + MedicalDoctor: [ 2, 3 ] + MedicalIntern: [ 2, 2 ] + Paramedic: [ 1, 1 ] + Psychologist: [ 1, 1 ] + #science + ResearchDirector: [ 1, 1 ] + Chaplain: [ 1, 1 ] + ForensicMantis: [ 1, 1 ] + Scientist: [ 2, 3 ] + ResearchAssistant: [ 2, 2 ] + Borg: [ 1, 1 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + Detective: [ 1, 1 ] + SecurityOfficer: [ 2, 2 ] + SecurityCadet: [ 1, 1 ] + #supply + Quartermaster: [ 1, 1 ] + MailCarrier: [ 1, 2 ] + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 2, 3 ] + #civilian + Passenger: [ -1, -1 ] + #justice + Prosecutor: [ 1, 1 ] + Clerk: [ 1, 1 ] + #LOST PARADISE + LPPBlueShieldOfficer: [ 1, 1 ] + LPPAdjutant: [ 1, 1 ] + LPPSecurityEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml b/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml index f0391f8f58..1ccab09d9d 100644 --- a/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml +++ b/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml @@ -1,8 +1,7 @@ - type: gameMapPool id: LostParadiseMapPool maps: - - LPPAsterisk - - LPPSubmarine - - LPPPebble - - LPPNormandy - - LPPKerberos + - H_LPPAsterisk + - H_LPPPebble + - H_LPPNormandy + - H_LPPKerberos From 2a11b4e853034d7b3ce385a109e60a9cb765588a Mon Sep 17 00:00:00 2001 From: BL02DL Date: Mon, 28 Oct 2024 21:22:35 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B8=D0=BD=D1=82=D0=B5=D0=B3=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=BE=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=82=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.IntegrationTests/Tests/PostMapInitTest.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index 0f6b162109..4275c68a36 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -67,6 +67,10 @@ public sealed class PostMapInitTest "LPPNormandy", //LPP "LPPPebble", //LPP "LPPSubmarine", //LPP + "H_LPPKerberos", //LPP + "H_LPPAsterisk", //LPP + "H_LPPNormandy", //LPP + "H_LPPPebble", //LPP "Gax", "Rad" };