Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Maps] Map pool change #2887

Merged
merged 3 commits into from
Dec 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public sealed class PostMapInitTest
"CorvaxTushkan",
"CorvaxGlacier",
"CorvaxAwesome",
"Origin",
// Corvax-End
"Dev",
"TestTeg",
Expand All @@ -84,8 +85,6 @@ public sealed class PostMapInitTest
"Gate",
"Amber",
"Loop"


};

/// <summary>
Expand Down
201,720 changes: 201,720 additions & 0 deletions Resources/Maps/origin.yml

Large diffs are not rendered by default.

46 changes: 31 additions & 15 deletions Resources/Prototypes/Corvax/Maps/Pools/default.yml
Original file line number Diff line number Diff line change
@@ -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
63 changes: 63 additions & 0 deletions Resources/Prototypes/Corvax/Maps/origin.yml
Original file line number Diff line number Diff line change
@@ -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 ]
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Stations/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions Resources/Prototypes/Maps/amber.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: Box
mapName: 'Box Station'
mapPath: /Maps/box.yml
minPlayers: 50
minPlayers: 55 # Corvax
stations:
Boxstation:
stationProto: StandardNanotrasenStation
Expand Down
3 changes: 1 addition & 2 deletions Resources/Prototypes/Maps/cog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/fland.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: Fland
mapName: 'Fland Installation'
mapPath: /Maps/fland.yml
minPlayers: 70
minPlayers: 55 # Corvax
stations:
Fland:
stationProto: StandardNanotrasenStation
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Maps/marathon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 4 additions & 1 deletion Resources/Prototypes/Maps/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/omega.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
mapPath: /Maps/omega.yml
# Corvax-start
minPlayers: 0
maxPlayers: 30
maxPlayers: 25
# Corvax-end
stations:
Omega:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/packed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
mapPath: /Maps/packed.yml
# Corvax-start
minPlayers: 0
maxPlayers: 30
maxPlayers: 25
# Corvax-end
stations:
Packed:
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/Maps/saltern.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading