Merge pull request #199 from space-syndicate/master

[Maps] Map pool change (space-syndicate#2887)
space-syndicate · Dec 26, 2024 · dfda772 · dfda772
2 parents 222eec6 + 71c814f
commit dfda772
Show file tree

Hide file tree

Showing 14 changed files with 201,836 additions and 32 deletions.
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -63,6 +63,7 @@ public sealed class PostMapInitTest
             "CorvaxTushkan",
             "CorvaxGlacier",
             "CorvaxAwesome",
+            "Origin",
             // Corvax-End
             "Dev",
             "TestTeg",
@@ -84,8 +85,6 @@ public sealed class PostMapInitTest
             "Gate",
             "Amber",
             "Loop"
-
-
         };
 
         /// <summary>

diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml
diff --git a/Resources/Prototypes/Corvax/Maps/Pools/default.yml b/Resources/Prototypes/Corvax/Maps/Pools/default.yml
@@ -1,24 +1,40 @@
 - type: gameMapPool
   id: CorvaxDefaultMapPool
   maps:
+  # Мапперская авантюра
+  ## Highpop
+  #- CorvaxDelta
+  #- CorvaxAvrite
+  #- CorvaxAstra
+  #- CorvaxPilgrim
+  #- CorvaxGlacier
+  #- Box
+  ## Midpop
+  #- CorvaxPaper
+  ##- CorvaxPearl — До реворка
+  #- CorvaxOutpost
+  #- CorvaxAwesome
+  #- Bagel
+  #- Marathon
+  ##- Train — До реворка оффами
+  ## Lowpop
+  #- CorvaxSilly
+  #- CorvaxMaus
+  #- CorvaxTushkan
+  #- Packed
+  #- Omega
+  #================
   # Highpop
-  - CorvaxDelta
-  - CorvaxAvrite
-  - CorvaxAstra
-  - CorvaxPilgrim
-  - CorvaxGlacier
   - Box
-  # Midpop
-  - CorvaxPaper
-  #- CorvaxPearl — До реворка
-  - CorvaxOutpost
-  - CorvaxAwesome
   - Bagel
+  - Cog
+  - Fland
+  - Origin
+  # Midpop
+  - Amber
   - Marathon
-  #- Train — До реворка оффами
+  - Meta
   # Lowpop
-  - CorvaxSilly
-  - CorvaxMaus
-  - CorvaxTushkan
-  - Packed
+  - Saltern
   - Omega
+  - Packed
diff --git a/Resources/Prototypes/Corvax/Maps/origin.yml b/Resources/Prototypes/Corvax/Maps/origin.yml
@@ -0,0 +1,63 @@
+- type: gameMap
+  id: Origin
+  mapName: 'Origin'
+  mapPath: /Maps/origin.yml
+  minPlayers: 55
+  stations:
+    Origin:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Origin {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml
+        - type: StationJobs
+          availableJobs:
+            #service
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            Bartender: [ 2, 2 ]
+            Botanist: [ 3, 3 ]
+            Chef: [ 3, 3 ]
+            Janitor: [ 3, 3 ]
+            Chaplain: [ 2, 2 ]
+            Librarian: [ 2, 2 ]
+            IAA: [ 1, 1 ]
+            ServiceWorker: [ 3, 4 ]
+            #engineering
+            ChiefEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 3, 3 ]
+            StationEngineer: [ 6, 6 ]
+            TechnicalAssistant: [ 2, 3 ]
+            #medical
+            ChiefMedicalOfficer: [ 1, 1 ]
+            Chemist: [ 2, 2 ]
+            Paramedic: [ 1, 1 ]
+            MedicalDoctor: [ 6, 6 ]
+            Psychologist: [ 1, 1 ]
+            MedicalIntern: [ 1, 2 ]
+            #science
+            ResearchDirector: [ 1, 1 ]
+            Scientist: [ 6, 6 ]
+            ResearchAssistant: [ 4, 4 ]
+            Borg: [ 2, 2 ]
+            #security
+            HeadOfSecurity: [ 1, 1 ]
+            Warden: [ 1, 1 ]
+            Detective: [ 1, 1 ]
+            SecurityOfficer: [ 7, 7 ]
+            SecurityCadet: [ 2, 4 ]
+            #supply
+            Quartermaster: [ 1, 1 ]
+            SalvageSpecialist: [ 3, 3 ]
+            CargoTechnician: [ 5, 5 ]
+            #civillian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 2, 2 ]
+            Boxer: [ 1, 1 ]
+            Reporter: [ 1, 1 ]
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
@@ -90,9 +90,9 @@
           protos:
           - VGRoid
         # Corvax-Mapping-Start
-        mining: !type:GridSpawnGroup
-          paths:
-          - /Maps/Shuttles/corvax_mining.yml
+        #mining: !type:GridSpawnGroup
+          #paths:
+          #- /Maps/Shuttles/corvax_mining.yml
         # Corvax-Mapping-End
 
 - type: entity

diff --git a/Resources/Prototypes/Maps/amber.yml b/Resources/Prototypes/Maps/amber.yml
@@ -2,8 +2,10 @@
   id: Amber
   mapName: 'Amber'
   mapPath: /Maps/amber.yml
-  minPlayers: 7
-  maxPlayers: 50
+  # Corvax-start
+  minPlayers: 25
+  maxPlayers: 55
+  # Corvax-end
   stations:
     Amber:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml
@@ -2,7 +2,7 @@
   id: Box
   mapName: 'Box Station'
   mapPath: /Maps/box.yml
-  minPlayers: 50
+  minPlayers: 55 # Corvax
   stations:
     Boxstation:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/cog.yml b/Resources/Prototypes/Maps/cog.yml
@@ -2,8 +2,7 @@
   id: Cog
   mapName: 'Cog'
   mapPath: /Maps/cog.yml
-  minPlayers: 40
-  maxPlayers: 80 #big map
+  minPlayers: 55 # Corvax
   stations:
     Cog:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml
@@ -2,7 +2,7 @@
   id: Fland
   mapName: 'Fland Installation'
   mapPath: /Maps/fland.yml
-  minPlayers: 70
+  minPlayers: 55 # Corvax
   stations:
     Fland:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
@@ -3,8 +3,8 @@
   mapName: 'Marathon Station'
   mapPath: /Maps/marathon.yml
   # Corvax-start
-  minPlayers: 20
-  maxPlayers: 50
+  minPlayers: 25
+  maxPlayers: 55
   # Corvax-end
   stations:
     Marathon:

diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
@@ -2,7 +2,10 @@
   id: Meta
   mapName: 'Meta Station'
   mapPath: /Maps/meta.yml
-  minPlayers: 50
+  # Corvax-start
+  minPlayers: 25
+  maxPlayers: 55
+  # Corvax-end
   stations:
     Meta:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml
@@ -4,7 +4,7 @@
   mapPath: /Maps/omega.yml
   # Corvax-start
   minPlayers: 0
-  maxPlayers: 30
+  maxPlayers: 25
   # Corvax-end
   stations:
     Omega:

diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml
@@ -4,7 +4,7 @@
   mapPath: /Maps/packed.yml
   # Corvax-start
   minPlayers: 0
-  maxPlayers: 30
+  maxPlayers: 25
   # Corvax-end
   stations:
     Packed:

diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
@@ -2,8 +2,10 @@
   id: Saltern
   mapName: 'Saltern'
   mapPath: /Maps/saltern.yml
+  # Corvax-start
   minPlayers: 0
-  maxPlayers: 35
+  maxPlayers: 25
+  # Corvax-end
   fallback: true
   stations:
     Saltern: