From 0a55209749688f7ab3f20fbb8f4e3e6810c9c6ef Mon Sep 17 00:00:00 2001 From: Nairod <110078045+Nairodian@users.noreply.github.com> Date: Fri, 24 Jan 2025 16:54:43 -0600 Subject: [PATCH] Triple Patch Threat (#542) --- Resources/CDMapPatches/elkridge.yml | 10 +++++++ Resources/CDMapPatches/loop.yml | 14 ++++++++++ Resources/CDMapPatches/plasma.yml | 11 ++++++++ Resources/Prototypes/Maps/Pools/default.yml | 6 ++--- Resources/Prototypes/Maps/elkridge.yml | 11 +++++--- Resources/Prototypes/Maps/loop.yml | 29 +++++++++++++-------- Resources/Prototypes/Maps/plasma.yml | 23 +++++++++------- 7 files changed, 78 insertions(+), 26 deletions(-) create mode 100644 Resources/CDMapPatches/elkridge.yml create mode 100644 Resources/CDMapPatches/loop.yml create mode 100644 Resources/CDMapPatches/plasma.yml diff --git a/Resources/CDMapPatches/elkridge.yml b/Resources/CDMapPatches/elkridge.yml new file mode 100644 index 00000000000..4fadbf4656c --- /dev/null +++ b/Resources/CDMapPatches/elkridge.yml @@ -0,0 +1,10 @@ +- !type:CDSpawnEntityMapPatch + worldPosition: -34.046875,-10.046875 + id: LockerLostAndFound +- !type:CDSpawnEntityMapPatch + worldPosition: 11.142467,-19.738266 + id: JobSlotsComputerFlatpack +- !type:CDSpawnEntityMapPatch + worldRotation: 3.141592653589793 rad + worldPosition: 19.953125,33.953125 + id: ComputerShuttleSalvage diff --git a/Resources/CDMapPatches/loop.yml b/Resources/CDMapPatches/loop.yml new file mode 100644 index 00000000000..5cbb28a066b --- /dev/null +++ b/Resources/CDMapPatches/loop.yml @@ -0,0 +1,14 @@ +- !type:CDSpawnEntityMapPatch + worldPosition: -21.124258,23.921648 + id: ComputerMedicalRecords +- !type:CDSpawnEntityMapPatch + worldRotation: -1.5707963267948966 rad + worldPosition: 15.875742,56.92165 + id: ComputerShuttleSalvage +- !type:CDSpawnEntityMapPatch + worldPosition: -28.124258,58.92165 + id: LockerLostAndFound +- !type:CDSpawnEntityMapPatch + worldRotation: 1.5707963267948966 rad + worldPosition: -30.124258,59.92165 + id: ComputerJobSlots diff --git a/Resources/CDMapPatches/plasma.yml b/Resources/CDMapPatches/plasma.yml new file mode 100644 index 00000000000..172c8909718 --- /dev/null +++ b/Resources/CDMapPatches/plasma.yml @@ -0,0 +1,11 @@ +- !type:CDSpawnEntityMapPatch + worldPosition: -46.731743,-6.401249 + id: LockerLostAndFound +- !type:CDSpawnEntityMapPatch + worldRotation: -1.5707963267948966 rad + worldPosition: -54.731743,-6.401249 + id: ComputerJobSlots +- !type:CDSpawnEntityMapPatch + worldRotation: 3.141592653589793 rad + worldPosition: -99.73174,30.598751 + id: ComputerShuttleSalvage diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml index c73b3b3b0b5..7c0f659b8e1 100644 --- a/Resources/Prototypes/Maps/Pools/default.yml +++ b/Resources/Prototypes/Maps/Pools/default.yml @@ -7,17 +7,17 @@ - Box - Cog - Core - #- Elkridge # CD Change, temporarily derotated + - Elkridge - Fland - Gemini #- Gate - #- Loop # CD change, temporarily derotated + - Loop - Marathon - Meta - Oasis - Omega - Packed - #- Plasma # CD Change, temporarily derotated + - Plasma - Reach #- Train <- CD change, please no - Ferrous diff --git a/Resources/Prototypes/Maps/elkridge.yml b/Resources/Prototypes/Maps/elkridge.yml index f0b71e99219..f606a7f1730 100644 --- a/Resources/Prototypes/Maps/elkridge.yml +++ b/Resources/Prototypes/Maps/elkridge.yml @@ -2,8 +2,9 @@ id: Elkridge mapName: 'Elkridge Depot' mapPath: /Maps/elkridge.yml - minPlayers: 7 - maxPlayers: 35 + minPlayers: 5 #CD change from 7 to 5 + maxPlayers: 25 #CD change from 35 to 25 + patchfile: /CDMapPatches/elkridge.yml #CD apply map patch stations: Elkridge: stationProto: StandardNanotrasenStation @@ -32,11 +33,13 @@ ServiceWorker: [ 2, 2 ] #engineering ChiefEngineer: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] #CD role AtmosphericTechnician: [ 2, 2 ] StationEngineer: [ 3, 4 ] TechnicalAssistant: [ 2, 2 ] #medical ChiefMedicalOfficer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] #CD role Chemist: [ 2, 2 ] MedicalDoctor: [ 3, 3 ] MedicalIntern: [ 2, 2 ] @@ -44,12 +47,14 @@ Psychologist: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] #CD role Scientist: [ 3, 4 ] ResearchAssistant: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] #CD role Warden: [ 1, 1 ] - SecurityOfficer: [ 3, 4 ] + SecurityOfficer: [ 3, 3 ] #CD change from 3-4 to 3-3 Detective: [ 1, 1 ] SecurityCadet: [ 2, 2 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/loop.yml b/Resources/Prototypes/Maps/loop.yml index c8a367d17cd..38c1747cb3f 100644 --- a/Resources/Prototypes/Maps/loop.yml +++ b/Resources/Prototypes/Maps/loop.yml @@ -2,8 +2,9 @@ id: Loop mapName: 'Loop Station' mapPath: /Maps/loop.yml - minPlayers: 35 - maxPlayers: 70 + minPlayers: 25 #CD change from 35 to 25 + maxPlayers: 45 #CD change from 70 to 45 + patchfile: /CDMapPatches/loop.yml #CD apply map patch stations: Loop: stationProto: StandardNanotrasenStation @@ -27,33 +28,37 @@ Janitor: [ 2, 2 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] - ServiceWorker: [ 3, 3 ] + ServiceWorker: [ 2, 2 ] #CD change from 3-3 to 2-2 #engineering ChiefEngineer: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] #CD role AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 5, 5 ] - TechnicalAssistant: [ 5, 5 ] + TechnicalAssistant: [ 2, 2 ] #CD change from 5-5 to 2-2 #medical ChiefMedicalOfficer: [ 1, 1 ] - Chemist: [ 3, 3 ] - MedicalDoctor: [ 4, 5 ] + SeniorPhysician: [ 1, 1 ] #CD role + Chemist: [ 2, 2 ] #CD change from 3-3 to 2-2 + MedicalDoctor: [ 3, 3 ] #CD change from 4-5 to 3-3 Paramedic: [ 2, 2 ] - MedicalIntern: [ 4, 4 ] + MedicalIntern: [ 2, 2 ] #CD change from 4-4 to 2-2 #science ResearchDirector: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] #CD role Scientist: [ 5, 5 ] - ResearchAssistant: [ 4, 4 ] + ResearchAssistant: [ 2, 2 ] #CD change from 4-4 to 2-2 #security HeadOfSecurity: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] #CD role Warden: [ 1, 1 ] - SecurityOfficer: [ 5, 5 ] + SecurityOfficer: [ 3, 3 ] #CD change from 5-5 to 3-3 Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] + SecurityCadet: [ 2, 2 ] #CD change from 4-4 to 2-2 Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] - CargoTechnician: [ 4, 4 ] + CargoTechnician: [ 3, 3 ] #CD change from 4-4 to 3-3 #civilian Passenger: [ -1, -1 ] Clown: [ 1, 1 ] @@ -63,3 +68,5 @@ #silicon StationAi: [ 1, 1 ] Borg: [ 2, 3 ] + #misc + Prisoner: [ 1, 1 ] #CD Role diff --git a/Resources/Prototypes/Maps/plasma.yml b/Resources/Prototypes/Maps/plasma.yml index 1369e5a42db..149177768b0 100644 --- a/Resources/Prototypes/Maps/plasma.yml +++ b/Resources/Prototypes/Maps/plasma.yml @@ -2,8 +2,9 @@ id: Plasma mapName: 'Plasma' mapPath: /Maps/plasma.yml - minPlayers: 20 - maxPlayers: 60 + minPlayers: 15 #CD change from 20 to 15 + maxPlayers: 35 #CD change from 60 to 35 + patchfile: /CDMapPatches/plasma.yml #CD apply map patch stations: Plasma: stationProto: StandardNanotrasenStation @@ -32,33 +33,37 @@ Reporter: [ 2, 3 ] #engineering ChiefEngineer: [ 1, 1 ] + SeniorEngineer: [ 1, 1 ] #CD role AtmosphericTechnician: [ 4, 4 ] StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 4, 4 ] + TechnicalAssistant: [ 2, 2 ] #CD change from 4-4 to 2-2 #medical ChiefMedicalOfficer: [ 1, 1 ] + SeniorPhysician: [ 1, 1 ] #CD role Chemist: [ 2, 2 ] - MedicalDoctor: [ 4, 4 ] + MedicalDoctor: [ 3, 3 ] #CD change from 4-4 to 3-3 Paramedic: [ 2, 2 ] - MedicalIntern: [ 4, 4 ] + MedicalIntern: [ 2, 2 ] #CD change from 4-4 to 2-2 Psychologist: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] #CD role Scientist: [ 4, 4 ] - ResearchAssistant: [ 4, 4 ] + ResearchAssistant: [ 2, 2 ] #CD change from 4-4 to 2-2 StationAi: [ 1, 1 ] Borg: [ 2, 4 ] #security HeadOfSecurity: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] #CD role Warden: [ 1, 1 ] - SecurityOfficer: [ 6, 8 ] + SecurityOfficer: [ 3, 3 ] #CD change from 6-8 to 3-3 Detective: [ 1, 2 ] - SecurityCadet: [ 4, 4 ] + SecurityCadet: [ 2, 2 ] #CD change from 4-4 to 2-2 Lawyer: [ 1, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 4, 4 ] - CargoTechnician: [ 4, 6 ] + CargoTechnician: [ 3, 3 ] #CD change from 4-6 to 3-3 #civilian Passenger: [ -1, -1 ] Clown: [ 1, 1 ]