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

[MAPPING] NewYearMaps #888

Merged
merged 5 commits into from
Dec 11, 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
26 changes: 21 additions & 5 deletions Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ public sealed class PostMapInitTest
"/Maps/Shuttles/cargo.yml",
"/Maps/Shuttles/emergency.yml",
"/Maps/Shuttles/infiltrator.yml",
// ADT-New-Year-Start
"/Maps/ADTMaps/ADTStations/NewYear/adt_centcom.yml",
// ADT-New-Year-End
};

private static readonly string[] GameMaps =
Expand Down Expand Up @@ -82,11 +85,7 @@ public sealed class PostMapInitTest
"Oasis",
"Cog",
// ADT-Start
"ADT_FrontierHalloween",
"ADT_FrontierNewYear",
"ADT_Frontier",
"ADT_TrainHalloween",
"ADT_SalternHalloween",
"ADT_Astra",
"ADT_Avrit",
"ADT_Bagel",
Expand All @@ -108,8 +107,25 @@ public sealed class PostMapInitTest
"ADT_Alley",
"ADT_kilo",
"ADT_Pie",
"ADT_Cluster_Legacy"
"ADT_Cluster_Legacy",
// ADT-End

// ADT-Halloween-Start
"ADT_FrontierHalloween",
"ADT_TrainHalloween",
"ADT_SalternHalloween",
// ADT-Halloween-End

// ADT-New-Year-Start
"ADT_BagelNewYear",
"ADT_BoxNewYear",
"ADT_Cluster_LegacyNewYear",
"ADT_DeltaNewYear",
"ADT_FrontierNewYear",
"ADT_GeminiNewYear",
"ADT_PieNewYear",
"ADT_SalternNewYear"
// ADT-New-Year-End
};

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
ent-ADTClothingHeadHatsSnowMaiden = шапка Снегурочки
.desc = Шапка главной помощницы Деда Мороза.
.suffix = { "Новый Год" }

ent-ADTClothingHeadHornsDeer = оленьи рога
.desc = Рога основного средства передвижения Санты Клауса.
.suffix = { "Новый Год" }

ent-ADTClothingHeadHatChristmas = новогодняя шапка
.desc = Красная новогодняя (или рождественская) шапка.
.suffix = { "Новый Год" }

ent-ADTClothingHeadHatsMonkeyHoliday = новогодняя шапка для обезьяны
.desc = Макака тоже должна ощутить праздник, пон.
.suffix = { "Новый Год" }

ent-ADTClothingHeadHatsCatHoliday = новогодняя кошачья шапка
.desc = Для вашего котика.
.suffix = { "Новый Год" }

ent-ADTClothingHeadChristmasFlower = рождественский цветок
.desc = Кусочек омелы на вашей голове.
.suffix = { "Новый Год" }

ent-ADTClothingHeadHatDedMoroz = шапка Деда Мороза
.desc = Шапка главного слушателя стишков и раздавателя подарков.
.suffix = { "Новый Год" }

ent-ADTClothingHeadHatsAntenna = антенна
.desc = Бип-буп, с Новым Годом, кожаные мешки.
.suffix = { "Новый Год" }
159,891 changes: 159,891 additions & 0 deletions Resources/Maps/ADTMaps/ADTStations/NewYear/adt_bagel.yml

Large diffs are not rendered by default.

175,561 changes: 175,561 additions & 0 deletions Resources/Maps/ADTMaps/ADTStations/NewYear/adt_box.yml

Large diffs are not rendered by default.

56,478 changes: 56,478 additions & 0 deletions Resources/Maps/ADTMaps/ADTStations/NewYear/adt_centcom.yml

Large diffs are not rendered by default.

58,595 changes: 58,595 additions & 0 deletions Resources/Maps/ADTMaps/ADTStations/NewYear/adt_cluster_legacy.yml

Large diffs are not rendered by default.

253,679 changes: 253,679 additions & 0 deletions Resources/Maps/ADTMaps/ADTStations/NewYear/adt_delta.yml

Large diffs are not rendered by default.

215,435 changes: 215,435 additions & 0 deletions Resources/Maps/ADTMaps/ADTStations/NewYear/adt_gemini.yml

Large diffs are not rendered by default.

38,778 changes: 38,778 additions & 0 deletions Resources/Maps/ADTMaps/ADTStations/NewYear/adt_pie.yml

Large diffs are not rendered by default.

80,260 changes: 80,260 additions & 0 deletions Resources/Maps/ADTMaps/ADTStations/NewYear/adt_saltern.yml

Large diffs are not rendered by default.

78 changes: 78 additions & 0 deletions Resources/Prototypes/ADT/Maps/NewYear/adt_bagel_newyear.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
- type: gameMap
id: ADT_BagelNewYear
mapName: 'Bagel Station'
mapPath: /Maps/ADTMaps/ADTStations/NewYear/adt_bagel.yml
minPlayers: 20
maxPlayers: 90
stations:
ADT_BagelNewYear:
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
availableJobs:
# command
Captain: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ] #ADT-Roles
#service
HeadOfPersonnel: [ 1, 1 ]
Bartender: [ 2, 2 ]
Botanist: [ 3, 3 ]
Chef: [ 2, 2 ]
Janitor: [ 3, 3 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 4, 4 ]
ADTSeniorEngineer: [ 1, 1 ] # ADT-roles
#medical
ChiefMedicalOfficer: [ 1, 1 ]
Chemist: [ 2, 2 ]
MedicalDoctor: [ 3, 3 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 4, 4 ]
ADTPathologist: [ 1, 1 ] #ADT-Roles
ADTSeniorPhysician: [ 1, 1 ] #ADT-Roles
#science
ResearchDirector: [ 1, 1 ]
Scientist: [ 5, 5 ]
ResearchAssistant: [ 4, 4 ]
ADTRoboticist: [ 1, 2 ] #ADT-Roles
ADTSeniorResearcher: [ 1, 1 ] # ADT-roles
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
Brigmedic: [ 1, 1 ] #ADT-Roles
ADTSeniorOfficer: [ 1, 1 ] # ADT-Roles
ADTGuardOfficer: [ 1, 1 ] # ADT-Roles
Pilot: [ 1, 1] # Corvax-Pilot
#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 ]
# juridical
Lawyer: [ 1, 1 ]
IAA: [ 1, 1 ]
Magistrat: [ 1, 1 ] #ADT-Roles
#silicon
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]
78 changes: 78 additions & 0 deletions Resources/Prototypes/ADT/Maps/NewYear/adt_box_newyear.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
- type: gameMap
id: ADT_BoxNewYear
mapName: 'Box Station'
mapPath: /Maps/ADTMaps/ADTStations/NewYear/adt_box.yml
minPlayers: 30
stations:
ADT_BoxstationNewYear:
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
availableJobs:
# command
Captain: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ] #ADT-Roles
#service
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 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 5, 5 ]
TechnicalAssistant: [ 4, 4 ]
ADTSeniorEngineer: [ 1, 1 ] # ADT-roles
#medical
ChiefMedicalOfficer: [ 1, 1 ]
Chemist: [ 2, 2 ]
MedicalDoctor: [ 4, 4 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 4, 4 ]
Psychologist: [ 1, 1 ]
ADTPathologist: [ 1, 1 ] #ADT-Roles
ADTSeniorPhysician: [ 1, 1 ] #ADT-Roles
#science
ResearchDirector: [ 1, 1 ]
Scientist: [ 5, 5 ]
ResearchAssistant: [ 4, 4 ]
ADTRoboticist: [ 1, 2 ] #ADT-Roles
ADTSeniorResearcher: [ 1, 1 ] # ADT-roles
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 5, 5 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
Brigmedic: [ 1, 1 ] #ADT-Roles
ADTSeniorOfficer: [ 1, 1 ] # ADT-Roles
ADTGuardOfficer: [ 1, 1 ] # ADT-Roles
Pilot: [ 1, 1] # Corvax-Pilot
#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 ]
# juridical
Lawyer: [ 1, 1 ]
IAA: [ 1, 1 ]
Magistrat: [ 1, 1 ] #ADT-Roles
#silicon
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
- type: gameMap
id: ADT_Cluster_LegacyNewYear
mapName: 'Cluster Legacy'
mapPath: /Maps/ADTMaps/ADTStations/NewYear/adt_cluster_legacy.yml
minPlayers: 1
maxPlayers: 35
stations:
ADT_Cluster_LegacyNewYear:
stationProto: StandardNanotrasenStation
components:
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_cluster.yml
- type: StationNameSetup
mapNameTemplate: '{0} Cluster Station {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14-L'
- type: StationJobs
availableJobs:
# Command
Captain: [ 1, 1 ]
ADTBlueShieldOfficer: [ 1, 1 ]

# Service
HeadOfPersonnel: [ 1, 1 ]
Bartender: [ 1, 1 ]
Botanist: [ 2, 2 ]
Chef: [ 1, 1 ]
Janitor: [ 1, 1 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 1, 1 ]

# Engi
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 3, 3 ]
TechnicalAssistant: [ 2, 2 ]
ADTSeniorEngineer: [ 1, 1 ]

# Med
ChiefMedicalOfficer: [ 1, 1 ]
Chemist: [ 1, 1 ]
MedicalDoctor: [ 2, 2 ]
MedicalIntern: [ 2, 2 ]
ADTPathologist: [ 1, 1 ]
ADTSeniorPhysician: [ 1, 1 ]

# Science
ResearchDirector: [ 1, 1 ]
Scientist: [ 3, 3 ]
ResearchAssistant: [ 2, 2 ]
ADTRoboticist: [ 1, 1 ]
ADTSeniorResearcher: [ 1, 1 ]

# Security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
Detective: [ 1, 1 ]
SecurityOfficer: [ 3, 3 ]
SecurityCadet: [ 2, 2 ]
Brigmedic: [ 1, 1 ]
ADTSeniorOfficer: [ 1, 1 ]

# Supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 2, 2 ]
CargoTechnician: [ 2, 2 ]

# Civillian
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]

# Juridical
Lawyer: [ 1, 1 ]
IAA: [ 1, 1 ]
Magistrat: [ 1, 1 ]

# Silicon
StationAi: [ 1, 1 ]
Borg: [ 1, 2 ]
Loading
Loading