Merge pull request #225 from PyotrIgn/newyear_maps

Новогодние карты
AdventureTimeSS14 · Dec 17, 2023 · e28569f · e28569f
2 parents b0293bb + d52f660
commit e28569f
Show file tree

Hide file tree

Showing 19 changed files with 1,101,730 additions and 18 deletions.
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -52,6 +52,13 @@ public sealed class PostMapInitTest
             "HalloweenBagel",
             "HalloweenAspid",
             "ADTNYCluster",
+            "ADTNYSaltern",
+            "ADTNYBox",
+            "ADTNYAspid",
+            "ADTNYMarathon",
+            "ADTNYBagel",
+            "ADTNYCore",
+            "ADTNYDelta",
 
             // Corvax-Start
             "CorvaxAvrite",

diff --git a/Resources/Audio/ADT/Fun/Frostpunk.ogg b/Resources/Audio/ADT/Fun/Frostpunk.ogg
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -833,3 +833,9 @@ Entries:
   - {message: Фикс РСУ двигателей, type: Fix}
   id: 55637 #костыль отображения в Обновлениях
   time: '2023-12-16T04:20:00.0000000+00:00'
+
+- author: Петр Игнатьевич
+  changes:
+  - {message: Добавлен новогодние варианты карт и изменен плейлист карт, type: Add}
+  id: 55638 #костыль отображения в Обновлениях
+  time: '2023-12-17T07:20:00.0000000+00:00'
diff --git a/Resources/Maps/NewYear/adtny_aspid.yml b/Resources/Maps/NewYear/adtny_aspid.yml
diff --git a/Resources/Maps/NewYear/adtny_bagel.yml b/Resources/Maps/NewYear/adtny_bagel.yml
diff --git a/Resources/Maps/NewYear/adtny_box.yml b/Resources/Maps/NewYear/adtny_box.yml
diff --git a/Resources/Maps/NewYear/adtny_core.yml b/Resources/Maps/NewYear/adtny_core.yml
diff --git a/Resources/Maps/NewYear/adtny_delta.yml b/Resources/Maps/NewYear/adtny_delta.yml
diff --git a/Resources/Maps/NewYear/adtny_marathon.yml b/Resources/Maps/NewYear/adtny_marathon.yml
diff --git a/Resources/Maps/NewYear/adtny_saltern.yml b/Resources/Maps/NewYear/adtny_saltern.yml
diff --git a/Resources/Prototypes/ADT/Maps/NewYear/adtny_aspid.yml b/Resources/Prototypes/ADT/Maps/NewYear/adtny_aspid.yml
@@ -0,0 +1,73 @@
+- type: gameMap
+  id: ADTNYAspid
+  mapName: 'NCS Aspid'
+  mapPath: /Maps/NewYear/adtny_aspid.yml
+  minPlayers: 25
+  maxPlayers: 70
+  stations:
+    ADTNYAspid:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} NCS Aspid {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml
+        - type: StationJobs
+          overflowJobs:
+            - Passenger
+          availableJobs:
+            #service
+            Captain: [ 1, 1 ]
+            IAA: [ 1, 1 ] # Corvax-IAA
+            HeadOfPersonnel: [ 1, 1 ]
+            Bartender: [ 1, 2 ]
+            Botanist: [ 2, 3 ]
+            Chef: [ 1, 3 ]
+            Janitor: [ 2, 3 ]
+            Chaplain: [ 1, 1 ]
+            Librarian: [ 1, 1 ]
+            #Lawyer: [ 2, 2 ] # Corvax-IAA
+            ServiceWorker: [ 1, 1 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 2, 2 ]
+            SeniorEngineer: [ 1, 1 ]
+            StationEngineer: [ 2, 3 ]
+            TechnicalAssistant: [ 4, 4 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
+            Paramedic: [ 1, 1 ]
+            Chemist: [ 1, 2 ]
+            MedicalDoctor: [ 3, 3 ]
+            MedicalIntern: [ 4, 4 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ]
+            Scientist: [ 3, 4 ]
+            ResearchAssistant: [ 4, 4 ]
+            Borg: [ 2, 2 ]
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            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 ]
+            #ADT
+            Brigmedic: [ 1, 1 ]
+            ADTBlueShieldOfficer: [ 1, 2 ]
+            Magistrat: [ 1, 1 ]
+            ADTInvestigator: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/ADT/Maps/NewYear/adtny_bagel.yml b/Resources/Prototypes/ADT/Maps/NewYear/adtny_bagel.yml
@@ -0,0 +1,80 @@
+- type: gameMap
+  id: ADTNYBagel
+  mapName: 'Bagel Station'
+  mapPath: /Maps/NewYear/adtny_bagel.yml
+  minPlayers: 40
+  maxPlayers: 76
+  stations:
+    ADTNYBagel:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Bagel Station {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml
+        - type: StationJobs
+          overflowJobs:
+            - Passenger
+          availableJobs:
+            #service
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            Bartender: [ 2, 2 ]
+            Botanist: [ 3, 3 ]
+            Chef: [ 2, 2 ]
+            Janitor: [ 3, 3 ]
+            Chaplain: [ 1, 1 ]
+            Librarian: [ 1, 1 ]
+            #Lawyer: [ 2, 2 ]
+            ServiceWorker: [ 2, 2 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 3, 3 ]
+            StationEngineer: [ 3, 3 ]
+            TechnicalAssistant: [ 4, 4 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
+            Chemist: [ 2, 3 ]
+            MedicalDoctor: [ 2, 2 ]
+            Paramedic: [ 1, 1 ]
+            MedicalIntern: [ 4, 4 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ]
+            Scientist: [ 4, 4 ]
+            ResearchAssistant: [ 4, 4 ]
+            Borg: [ 2, 2 ]
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 3, 3 ]
+            Detective: [ 1, 1 ]
+            SecurityCadet: [ 4, 4 ]
+            #Lawyer: [ 2, 2 ] # Corvax-IAA
+            #supply
+            Quartermaster: [ 1, 1 ]
+            SalvageSpecialist: [ 3, 3 ]
+            CargoTechnician: [ 3, 3 ]
+            #civilian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 1, 1 ]
+            Reporter: [ 2, 2 ]
+            #ADT
+            Brigmedic: [ 1, 1 ]
+            ADTBlueShieldOfficer: [ 1, 2 ]
+            Magistrat: [ 1, 1 ]
+            IAA: [ 1, 1 ] # Corvax-IAA
+            ADTInvestigator: [ 1, 1 ] #ADT
+            ADTEngiBorg: [ 1, 1 ] #ADT
+            ADTJanitorBorg: [ 1, 1 ] #ADT
+            ADTMedicalBorg: [ 1, 1 ] #ADT
+            ADTServiseBorg: [ 1, 1 ] #ADT
+            ADTSupplyBorg: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/ADT/Maps/NewYear/adtny_box.yml b/Resources/Prototypes/ADT/Maps/NewYear/adtny_box.yml
@@ -0,0 +1,73 @@
+- type: gameMap
+  id: ADTNYBox
+  mapName: 'Box Station'
+  mapPath: /Maps/NewYear/adtny_box.yml
+  minPlayers: 50
+  stations:
+    ADTNYBox:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Box Station {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: 'TG'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
+        - type: StationJobs
+          overflowJobs:
+            - Passenger
+          availableJobs:
+            #service
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            Bartender: [ 2, 2 ]
+            Botanist: [ 3, 3 ]
+            Chef: [ 2, 2 ]
+            Janitor: [ 2, 2 ]
+            Chaplain: [ 1, 1 ]
+            Librarian: [ 1, 1 ]
+            ServiceWorker: [ 2, 2 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 3, 3 ]
+            StationEngineer: [ 4, 4 ]
+            TechnicalAssistant: [ 4, 4 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
+            Chemist: [ 2, 3 ]
+            MedicalDoctor: [ 3, 3 ]
+            Paramedic: [ 1, 1 ]
+            MedicalIntern: [ 4, 4 ]
+            Psychologist: [ 1, 1 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ]
+            Scientist: [ 4, 4 ]
+            ResearchAssistant: [ 4, 4 ]
+            Borg: [ 2, 2 ]
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 4, 4 ]
+            Detective: [ 1, 1 ]
+            SecurityCadet: [ 4, 4 ]
+            #Lawyer: [ 2, 2 ] # Corvax-IAA
+            #supply
+            Quartermaster: [ 1, 1 ]
+            SalvageSpecialist: [ 3, 3 ]
+            CargoTechnician: [ 3, 3 ]
+            #civilian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 1, 1 ]
+            #ADT
+            Brigmedic: [ 1, 1 ]
+            ADTBlueShieldOfficer: [ 1, 2 ]
+            Magistrat: [ 1, 1 ]
+            IAA: [ 1, 1 ] # Corvax-IAA
+            ADTInvestigator: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/Maps/adt_ny_cluster.yml → ...otypes/ADT/Maps/NewYear/adtny_cluster.yml b/Resources/Prototypes/Maps/adt_ny_cluster.yml → ...otypes/ADT/Maps/NewYear/adtny_cluster.yml
diff --git a/Resources/Prototypes/ADT/Maps/NewYear/adtny_core.yml b/Resources/Prototypes/ADT/Maps/NewYear/adtny_core.yml
@@ -0,0 +1,74 @@
+- type: gameMap
+  id: ADTNYCore
+  mapName: 'Core'
+  mapPath: /Maps/NewYear/adtny_core.yml
+  minPlayers: 30
+  maxPlayers: 60
+  stations:
+    ADTNYCore:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Core {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml
+        - type: StationJobs
+          overflowJobs:
+            - Passenger
+          availableJobs:
+            #service
+            Bartender: [ 2, 2 ]
+            Botanist: [ 2, 2]
+            Chef: [ 1, 1 ]
+            Janitor: [ 2, 2 ]
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            Chaplain: [ 1, 1 ]
+            Librarian: [ 1, 1 ]
+            ServiceWorker: [ 3, 3 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            StationEngineer: [ 3, 3 ]
+            AtmosphericTechnician: [ 2, 2 ]
+            TechnicalAssistant: [ 2, 2 ]
+            SeniorEngineer: [ 1, 1 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            MedicalDoctor: [ 2, 3 ]
+            Chemist: [ 1, 2 ]
+            MedicalIntern: [ 2, 2 ]
+            Paramedic: [ 1, 2 ]
+            SeniorPhysician: [ 1, 1 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            Scientist: [ 2, 2 ]
+            ResearchAssistant: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ]
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            SecurityOfficer: [ 3, 3 ]
+            Warden: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            SecurityCadet: [ 1, 1 ]
+            Detective: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
+            #supply
+            CargoTechnician: [ 3, 3 ]
+            Quartermaster: [ 1, 1 ]
+            SalvageSpecialist: [ 2, 2 ]
+            #civilian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 1, 1 ]
+            Boxer: [ 2, 2 ]
+            Reporter: [ 2, 2 ]
+            #ADT
+            Brigmedic: [ 1, 1 ]
+            ADTBlueShieldOfficer: [ 1, 2 ]
+            Magistrat: [ 1, 1 ]
+            IAA: [ 1, 1 ] # Corvax-IAA
+            ADTInvestigator: [ 1, 1 ] #ADT
diff --git a/Resources/Prototypes/ADT/Maps/NewYear/adtny_delta.yml b/Resources/Prototypes/ADT/Maps/NewYear/adtny_delta.yml
@@ -0,0 +1,70 @@
+- type: gameMap
+  id: ADTNYDelta
+  mapName: 'Delta Station'
+  mapPath: /Maps/NewYear/adtny_delta.yml
+  minPlayers: 40
+  stations:
+    ADTNYDelta:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Дельта {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: 'TG'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml
+        - type: StationJobs
+          overflowJobs:
+            - Passenger
+          availableJobs:
+            CargoTechnician: [ 5, 5 ]
+            Passenger: [ -1, -1 ]
+            Bartender: [ 1, 1 ]
+            Botanist: [ 3, 4 ]
+            Chef: [ 1, 2 ]
+            Clown: [ 1, 1 ]
+            Janitor: [ 1, 2 ]
+            Mime: [ 1, 1 ]
+            Captain: [ 1, 1 ]
+            IAA: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
+            StationEngineer: [ 7, 7 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
+            MedicalDoctor: [ 5, 5 ]
+            Chemist: [ 2, 2 ]
+            ResearchDirector: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ] 
+            Scientist: [ 7, 7 ]
+            HeadOfSecurity: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 5, 5 ]
+            Chaplain: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            Librarian: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            SalvageSpecialist: [ 3, 3 ]
+            Musician: [ 2, 2 ]
+            AtmosphericTechnician: [ 2, 3 ]
+            TechnicalAssistant: [ 3, 3 ]
+            ResearchAssistant: [ 3, 3 ]
+            Reporter: [ 2, 2 ]
+            MedicalIntern: [ 3, 3 ]
+            ServiceWorker: [ 3, 3 ]
+            SecurityCadet: [ 3, 3 ]
+            Psychologist: [ 1, 1 ]
+            Detective: [ 1, 1 ]
+            Paramedic: [ 1, 1 ]
+            Borg: [ 2, 2 ]
+            Brigmedic: [ 1, 1 ]           
+            ADTBlueShieldOfficer: [ 1, 2 ]
+            Magistrat: [ 1, 1 ]
+            ADTInvestigator: [ 1, 1 ] #ADT
+            ADTEngiBorg: [ 1, 1 ] #ADT
+            ADTJanitorBorg: [ 1, 1 ] #ADT
+            ADTMedicalBorg: [ 1, 1 ] #ADT
+            ADTServiseBorg: [ 1, 1 ] #ADT
+            ADTSupplyBorg: [ 1, 1 ] #ADT