Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #333 from mersen-tyn/maps_mersen
Browse files Browse the repository at this point in the history
Новый фронтир, новые шаттлы, новые блюспейс разбитые шаттлы и прочие фиксы по картам
  • Loading branch information
Vonsant authored Jun 23, 2024
2 parents 2ddf990 + 34d0454 commit ba60aaa
Show file tree
Hide file tree
Showing 25 changed files with 107,848 additions and 5,814 deletions.
2,884 changes: 2,884 additions & 0 deletions Resources/Maps/CorvaxFrontier/Bluespace/RuinedComet.yml

Large diffs are not rendered by default.

23,923 changes: 23,923 additions & 0 deletions Resources/Maps/CorvaxFrontier/Bluespace/RuinedCrescent.yml

Large diffs are not rendered by default.

4,489 changes: 4,489 additions & 0 deletions Resources/Maps/CorvaxFrontier/Bluespace/RuinedInv.yml

Large diffs are not rendered by default.

5,003 changes: 5,003 additions & 0 deletions Resources/Maps/CorvaxFrontier/Bluespace/RuinedSprinter.yml

Large diffs are not rendered by default.

47,837 changes: 47,837 additions & 0 deletions Resources/Maps/CorvaxFrontier/Outpost/corvaxFrontier.yml

Large diffs are not rendered by default.

10,188 changes: 5,621 additions & 4,567 deletions Resources/Maps/CorvaxFrontier/Shuttles/Expedition/Sunset.yml

Large diffs are not rendered by default.

3,009 changes: 3,009 additions & 0 deletions Resources/Maps/CorvaxFrontier/Shuttles/Fang.yml

Large diffs are not rendered by default.

4,577 changes: 4,577 additions & 0 deletions Resources/Maps/CorvaxFrontier/Shuttles/Mantis.yml

Large diffs are not rendered by default.

4,245 changes: 3,132 additions & 1,113 deletions Resources/Maps/CorvaxFrontier/Shuttles/Nfsd/skat.yml

Large diffs are not rendered by default.

1,581 changes: 1,455 additions & 126 deletions Resources/Maps/CorvaxFrontier/Shuttles/Scrap/dual.yml

Large diffs are not rendered by default.

936 changes: 936 additions & 0 deletions Resources/Maps/CorvaxFrontier/Shuttles/mailpod.yml

Large diffs are not rendered by default.

1,497 changes: 1,497 additions & 0 deletions Resources/Maps/CorvaxFrontier/Shuttles/mailtruck.yml

Large diffs are not rendered by default.

3,373 changes: 3,373 additions & 0 deletions Resources/Maps/CorvaxFrontier/Shuttles/phoron.yml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Resources/Maps/_NF/Shuttles/Bus/publicts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ entities:
gravityShakeSound: !type:SoundPathSpecifier
path: /Audio/Effects/alert.ogg
- type: DecalGrid
- type: StationTransit
chunkCollection:
version: 2
nodes:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- type: entity
parent: AirlockGlassShuttle
id: AirlockExternalGlassShuttlePostman
suffix: Внешний, Стеклянный, Почтальон
components:
- type: PriorityDock
tag: Postman
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: Sunset
name: NLE Закат
description: Крупногабаритный экспедиционный шаттл, ранее был использовался для выполнения разведывательных задач. Рекомендуемый состав команды 3-8 человек.
price: 145000 # 33% tax
price: 155000 # 33% tax
category: Large
group: Expedition
shuttlePath: /Maps/CorvaxFrontier/Shuttles/Expedition/Sunset.yml
Expand Down
30 changes: 30 additions & 0 deletions Resources/Prototypes/CorvaxFrontier/Shipyard/Fang.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#Corvax Frontier
- type: vessel
id: Fang
name: NMS Клык
description: Среднегабаритный шахтерский шаттл. Рекомендованный состав команды 1-5 человек.
price: 34450
category: Medium
group: Civilian
shuttlePath: /Maps/CorvaxFrontier/Shuttles/Fang.yml

- type: gameMap
id: Fang
mapName: 'NMS Клык'
mapPath: /Maps/CorvaxFrontier/Shuttles/Fang.yml
minPlayers: 0
stations:
Fang:
stationProto: StandardFrontierVessel
components:
- type: StationNameSetup
mapNameTemplate: 'Клык {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
30 changes: 30 additions & 0 deletions Resources/Prototypes/CorvaxFrontier/Shipyard/Mantis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#Corvax Frontier
- type: vessel
id: Mantis
name: NRS Богомол
description: Среднегабаритный шаттл-ресторан. Рекомендованный размер команды 1-3 человек.
price: 40999
category: Medium
group: Civilian
shuttlePath: /Maps/CorvaxFrontier/Shuttles/Mantis.yml

- type: gameMap
id: Mantis
mapName: 'NRS Богомол'
mapPath: /Maps/CorvaxFrontier/Shuttles/Mantis.yml
minPlayers: 0
stations:
Mantis:
stationProto: StandardFrontierVessel
components:
- type: StationNameSetup
mapNameTemplate: 'Богомол {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
2 changes: 1 addition & 1 deletion Resources/Prototypes/CorvaxFrontier/Shipyard/Nfsd/skat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: Skat
name: NSF Скат
description: Патрульный шаттл. Был разработан НТ при поддержке "Drunk Masters", в связи с чем, мостик шаттла доверху забит алкоголем.
price: 75000
price: 80000
category: Medium
group: Security
shuttlePath: /Maps/CorvaxFrontier/Shuttles/Nfsd/skat.yml
Expand Down
30 changes: 30 additions & 0 deletions Resources/Prototypes/CorvaxFrontier/Shipyard/phoron.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#Corvax Frontier
- type: vessel
id: phoron
name: NRS Форон
description: Малогабаритный шаттл-ресторан. Рекомендованный размер команды 1-3 человек.
price: 30999
category: Small
group: Civilian
shuttlePath: /Maps/CorvaxFrontier/Shuttles/phoron.yml

- type: gameMap
id: phoron
mapName: 'NRS Форон'
mapPath: /Maps/CorvaxFrontier/Shuttles/phoron.yml
minPlayers: 0
stations:
phoron:
stationProto: StandardFrontierVessel
components:
- type: StationNameSetup
mapNameTemplate: 'Форон {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
2 changes: 2 additions & 0 deletions Resources/Prototypes/CorvaxFrontier/tags.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- type: Tag
id: Postman
4 changes: 4 additions & 0 deletions Resources/Prototypes/_NF/Events/events_bluespace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@
- /Maps/CorvaxFrontier/Bluespace/RuinedHauler.yml #Corvax-Frontier
- /Maps/CorvaxFrontier/Bluespace/RuinedBarge.yml #Corvax-Frontier
- /Maps/CorvaxFrontier/Bluespace/RuinedCourser.yml #Corvax-Frontier
- /Maps/CorvaxFrontier/Bluespace/RuinedComet.yml #Corvax-Frontier
- /Maps/CorvaxFrontier/Bluespace/RuinedCrescent.yml #Corvax-Frontier
- /Maps/CorvaxFrontier/Bluespace/RuinedInv.yml #Corvax-Frontier
- /Maps/CorvaxFrontier/Bluespace/RuinedSprinter.yml #Corvax-Frontier
rewardFactor: 0.5 # Filler to make the bank go up

- type: entity
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Maps/Outpost/frontier.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
- type: gameMap
id: Frontier
mapName: 'Frontier Outpost'
mapPath: /Maps/_NF/Outpost/frontier.yml
mapPath: /Maps/CorvaxFrontier/Outpost/corvaxFrontier.yml #CorvaxFrontier
minPlayers: 0
maxPlayers: 100
stations:
Frontier:
corvaxFrontier: #CorvaxFrontier
stationProto: StandardFrontierStation
components:
- type: StationNameSetup
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Shipyard/mailpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
price: 12000
category: Small
group: None
shuttlePath: /Maps/_NF/Shuttles/mailpod.yml
shuttlePath: /Maps/CorvaxFrontier/Shuttles/mailpod.yml #Corvax Frontier

- type: gameMap
id: MailPod
mapName: 'NC Ямщик'
mapPath: /Maps/_NF/Shuttles/mailpod.yml
mapPath: /Maps/CorvaxFrontier/Shuttles/mailpod.yml #Corvax Frontier
minPlayers: 0
stations:
MailPod:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Shipyard/mailtruck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
price: 16000
category: Small
group: None
shuttlePath: /Maps/_NF/Shuttles/mailtruck.yml
shuttlePath: /Maps/CorvaxFrontier/Shuttles/mailtruck.yml #Corvax Frontier

- type: gameMap
id: MailTruck
mapName: 'NC Почтарь'
mapPath: /Maps/_NF/Shuttles/mailtruck.yml
mapPath: /Maps/CorvaxFrontier/Shuttles/mailtruck.yml #Corvax Frontier
minPlayers: 0
stations:
MailTruck:
Expand Down

0 comments on commit ba60aaa

Please sign in to comment.