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

fix shuttles #113

Merged
merged 1 commit into from
Jan 18, 2025
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: 2 additions & 1 deletion Resources/Prototypes/Corvax/Shipyard/BlackMarket/Poli.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- type: vessel
id: Poli
parent: BaseVessel
name: Полюс
description: Среднегабаритный пиратский шаттл. Рекомендованный состав команды 2-8 человека.
price: 100000
Expand All @@ -23,4 +24,4 @@
prefixCreator: '14'
- type: StationJobs
availableJobs:
Pirate: [ 0, 0 ]
Pirate: [ 0, 0 ]
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- type: vessel
id: QueenAnnesRevenge
parent: BaseVessel
name: Месть Королевы Анны
description: Среднегабаритный пиратский шаттл. Рекомендованный состав команды 2-8 человека.
price: 100000
Expand All @@ -23,4 +24,4 @@
prefixCreator: '14'
- type: StationJobs
availableJobs:
Pirate: [ 0, 0 ]
Pirate: [ 0, 0 ]
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- type: vessel
id: SalvationUnion
parent: BaseVessel
name: Союз Спасения
description: Малый пиратский шаттл. Рекомендованный состав команды 1-2 человека.
price: 39000
Expand All @@ -23,4 +24,4 @@
prefixCreator: '14'
- type: StationJobs
availableJobs:
Pirate: [ 0, 0 ]
Pirate: [ 0, 0 ]
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# a wooden pirate version of the classic Prospector
- type: vessel
id: Barnacle
parent: BaseVessel
name: Моряк
description: 'Малогабаритный пиратский шаттл.'
price: 24000
Expand Down Expand Up @@ -32,5 +33,5 @@
!type:NanotrasenNameGenerator
prefixCreator: '14'
- type: StationJobs
availableJobs:
availableJobs:
Pirate: [ 0, 0 ]
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: Bocakillo
parent: BaseVessel
name: Сэндвич
description: Малогабаритный пиратский шаттл. Рекомендованный размер команды 2-3 человека.
price: 35000 #Cheap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# Kestrel looking ship with hangar bay meant to be used along with hoverbikes.
- type: vessel
id: Falcon
parent: BaseVessel
name: Сокол
description: Пиратский среднегабаритный шаттл. Рекомендованный размер команды 3-4 человека.
price: 70000 #Selling price is 22520
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Shipyard/BlackMarket/hog.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- type: vessel
id: hog
parent: BaseVessel
name: Боров
description: Среднегабаритный пиратский шаттл. Рекомендованный состав команды 2-4 человека.
price: 80000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: Menace
parent: BaseVessel
name: Предъява
description: Малогабаритный штурмовой шаттл Синдиката. Рекомендованный размер команды 1-2 человека.
price: 21000
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- type: vessel
id: Schooner
parent: BaseVessel
name: Шхуна
description: Среднегабаритный пиратский шаттл. Рекомендованный состав команды 2-4 человека.
price: 60000
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Shipyard/Civilian/Kudzu.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Corvax Frontier
- type: vessel
id: Kudzu
parent: BaseVessel
name: SLI Кудза
description: Среднегабаритный грузовой шаттл. Рекомендованный состав команды 1-4 человек.
price: 80000
Expand Down
7 changes: 4 additions & 3 deletions Resources/Prototypes/Corvax/Shipyard/Civilian/bazaar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
# Discord: ???

# Shuttle Notes:
#
#
- type: vessel
id: Bazaar
parent: BaseVessel
name: SLI Барахолка
description: Среднегабаритный торговый шаттл. Рекомендованный размер команды 2-4 человека.
price: 95555 # on init ~57005$ + 8550$ from 15% markup
Expand All @@ -20,13 +21,13 @@
class:
- Cargo
- Civilian

- type: gameMap
id: Bazaar
mapName: 'SLI Барахолка'
mapPath: /Maps/Corvax/Shuttles/Civilian/bazaar.yml
minPlayers: 0
stations:
stations:
Bazaar:
stationProto: StandardFrontierVessel
components:
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Shipyard/Civilian/bookworm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: Bookworm
parent: BaseVessel
name: SBB Книжный червь
description: Среднегабаритный космический источник знаний. Рекомендованный состав команды 1-3 человека.
price: 32000
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Corvax/Shipyard/Civilian/bottleneck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: Bottleneck
parent: BaseVessel
name: NT Горлышко бутылки
description: Личный транспорт и мобильный офис для представителя Фронтиры
price: 20000 #Appraises at ~14477, margin of ~10% - TODO: fix this value, getting tests to pass - Whatstone
Expand All @@ -36,4 +37,4 @@
mapNameTemplate: 'Горлышко бутылки {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14'
prefixCreator: '14'
3 changes: 2 additions & 1 deletion Resources/Prototypes/Corvax/Shipyard/Civilian/broom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
# Discord: erhardsteinhauer

# Shuttle Notes:
#
#
- type: vessel
id: Broom
parent: BaseVessel
name: LVHI Метла
description: Тесный, но надежный шаттл для оказания услуг по уборке помещений.
price: 15000 # ~9650$ on mapinit + ~1450$ from 15% markup
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Shipyard/Civilian/camper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

- type: vessel
id: Camper
parent: BaseVessel
name: SSS Кемпер
description: Персональный малогабаритный шаттл на 1 человека.
price: 15000
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Corvax/Shipyard/Civilian/esquire.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
# - type: vessel
# id: Esquire
# parent: BaseVessel
# name: NT Дворянин
# description: Среднегабаритный шаттл предоставления юридических услуг. Рекомендованный размер команды 2-4 человека.
# price: 38500
Expand Down Expand Up @@ -38,4 +39,4 @@
# availableJobs:
# Contractor: [ 0, 0 ]
# Pilot: [ 0, 0 ]
# Mercenary: [ 0, 0 ]
# Mercenary: [ 0, 0 ]
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: harbormaster
parent: BaseVessel
name: NC Квадрон
description: Малогабаритный персональный шаттл. Рекомендованный размер команды 1 человек.
price: 30300 # ~24600$ on mapinit + ~3690$ from 15% markup
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Corvax/Shipyard/Civilian/hercules.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- type: vessel
id: Hercules
parent: BaseVessel
name: NCS Геркулес
description: Среднегабаритный грузовой шаттл. Рабочая лошадка "Космологистики", используется для перевозки большого объема грузов на дальние расстояния. Рекомендованный состав команды 2-5 человека.
price: 39900
Expand All @@ -9,7 +10,7 @@
class:
- Cargo
- Civilian

- type: gameMap
id: Hercules
mapName: 'NCS Геркулес'
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Shipyard/Civilian/honker.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- type: vessel
id: Honker
parent: BaseVessel
name: NT ХОНКЕР
description: ХОНК ХОНК ХОНК ХОНК ХОНК ХОНК
price: 22500
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: kilderkin
parent: BaseVessel
name: NC Бочка
description: Среднегабаритный шаттл-бар. Рекомендованный состав команды 2-4 человека.
price: 48900 # ~41730$ on mapinit + ~4170$ from 10% markup
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Shipyard/Civilian/lantern.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: lantern
parent: BaseVessel
name: LVHI Кадило
description: Среднегабаритный шаттл-церковь. Рекомендованный состав команды 2-3 человека.
price: 36125 # ~31020$ on mapinit + ~3100$ from 10% markup
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Shipyard/Civilian/legman.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: Legman
parent: BaseVessel
name: LVHI Интервьюер
description: Малогабаритный репортёрский шаттл. Рекомендованный размер команды 1 человек.
price: 13670 # 9700$ on mapinit + 970$ from 10% markup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: Liquidator
parent: BaseVessel
name: LVHI Подметатор
description: Малогабаритный уборочный шаттл. Рекомендованный размер команды 1 человек.
price: 29035 # ~25245$ on mapinit + 3785$ from 15% markup
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Shipyard/Civilian/loader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: Loader
parent: BaseVessel
name: NC Такелажник
description: Малогабаритный грузовой шаттл. Рекомендованный состав команды 1-2 человека.
price: 22000
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Corvax/Shipyard/Civilian/mcdelivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
# Discord: dvir01 (84770870936997888)

# Shuttle Notes:
#
#

- type: vessel
id: McDelivery
parent: BaseVessel
name: DC Курьер
description: Персональный малогабаритный шаттл доставки продуктов.
price: 10500
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Corvax/Shipyard/Civilian/mission.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
# - type: vessel
# id: Mission
# parent: BaseVessel
# name: NC Мессия
# description: Малогабаритный шаттл-церковь. Рекомендованный состав команды 1-2 человека.
# price: 19000
Expand All @@ -25,7 +26,7 @@
# mapName: 'NC Мессия'
# mapPath: /Maps/Corvax/Shuttles/Civilian/mission.yml
# minPlayers: 0
# stations:
# stations:
# Mission:
# stationProto: StandardFrontierVessel
# components:
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Shipyard/Civilian/pts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: PTS
parent: BaseVessel
name: NC Бомбила
description: Малогабаритный транспортный шаттл на 5 пассажиров. Рекомендованный состав команды 1-3 человека.
price: 20000
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Corvax/Shipyard/Civilian/stellaris.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- type: vessel
id: Stellaris
parent: BaseVessel
name: NT Межзвёздный
description: Среднегабаритный шаттл-ресторан с театром. Рекомендованный состав команды 2-5 человек.
price: 65000
Expand Down Expand Up @@ -28,4 +29,4 @@
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
Mercenary: [ 0, 0 ]
1 change: 1 addition & 0 deletions Resources/Prototypes/Corvax/Shipyard/Civilian/watchdog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

- type: vessel
id: Watchdog
parent: BaseVessel
name: SBI Сторожевой пёс
description: Обновленная и перекрашенная старая модель "Тамплиера" NSF, предназначенная для использования наемниками и "перепрофилированная" для станционной охраны
price: 20000
Expand Down
5 changes: 3 additions & 2 deletions Resources/Prototypes/Corvax/Shipyard/Civilian/waveshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
# - type: vessel
# id: WaveShot
# parent: BaseVessel
# name: NC Цунами
# description: Малогабаритный новостной шаттл. Рекомендованный состав команды 1+ человек.
# price: 37500 # 15% markup +4890
Expand All @@ -25,7 +26,7 @@
# mapName: 'NC Цунами'
# mapPath: /Maps/Corvax/Shuttles/Civilian/waveshot.yml
# minPlayers: 0
# stations:
# stations:
# WaveShot:
# stationProto: StandardFrontierVessel
# components:
Expand All @@ -38,4 +39,4 @@
# availableJobs:
# Contractor: [ 0, 0 ]
# Pilot: [ 0, 0 ]
# Mercenary: [ 0, 0 ]
# Mercenary: [ 0, 0 ]
3 changes: 2 additions & 1 deletion Resources/Prototypes/Corvax/Shipyard/Engineering/comet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: Comet
parent: BaseVessel
name: NT Комета
description: Среднегабаритный инженерный шаттл. Рекомендованный размер команды 3-6 человек.
price: 55000
Expand All @@ -26,7 +27,7 @@
mapName: 'NT Комета'
mapPath: /Maps/Corvax/Shuttles/Engineering/comet.yml
minPlayers: 0
stations:
stations:
Comet:
stationProto: StandardFrontierVessel
components:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- type: vessel
id: Construct
parent: BaseVessel
name: NT Каркас
description: Чисто технически это тоже шаттл. Не рекомендуется никому.
price: 10500
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
- type: vessel
id: Hammer
parent: BaseVessel
name: SBB Наковальня
description: Среднегабаритный инженерный шаттл. Рекомендованный состав команды 2-4 человека.
price: 46500 # ~28000 after purchase, ~13% markup
Expand Down
5 changes: 3 additions & 2 deletions Resources/Prototypes/Corvax/Shipyard/Expedition/ambition.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
# Discord: ???

# Shuttle Notes:
#
#
- type: vessel
id: Ambition
parent: BaseVessel
name: UAC Амбициозный
description: Промышленная газодобывающая платформа, расчитанная на экипаж 8+ человек.
price: 156000
Expand Down Expand Up @@ -39,4 +40,4 @@
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
Mercenary: [ 0, 0 ]
Loading
Loading