diff --git a/Resources/Maps/_LuaM/Shuttles/PDV/Tier1/Scorpion.yml b/Resources/Maps/_LuaM/Shuttles/PDV/Scorpion.yml similarity index 100% rename from Resources/Maps/_LuaM/Shuttles/PDV/Tier1/Scorpion.yml rename to Resources/Maps/_LuaM/Shuttles/PDV/Scorpion.yml diff --git a/Resources/Prototypes/_LuaM/Entities/Objects/Devices/ship_vouchers.yml b/Resources/Prototypes/_LuaM/Entities/Objects/Devices/ship_vouchers.yml index bb52b49fcd9..2b9e374c353 100644 --- a/Resources/Prototypes/_LuaM/Entities/Objects/Devices/ship_vouchers.yml +++ b/Resources/Prototypes/_LuaM/Entities/Objects/Devices/ship_vouchers.yml @@ -1,30 +1,3 @@ -# Tier 1 - -- type: entity - parent: BaseShipLPC - id: ShipVoucherScorpion - name: PDV Scorpion LPC [T1] - description: The voucher provides an opportunity to sit at the "Scorpion" consoles, one of the fastest fighters in the flagship's reserves. - components: - - type: Sprite - sprite: _Mono/Objects/Misc/lpcnew.rsi - layers: - - state: icon - - state: screen - color: "#1eff00" - - state: screen6 - color: "#1eff00" - shader: unshaded - - type: ShipyardVoucher - destroyOnEmpty: false - cooldown: 7200 # one hour - consoleType: BlackMarket - companyName: PDV - vessels: - - ScorpionLuaM - - type: StaticPrice - vendPrice: 20000 - # Tier 2 - type: entity diff --git a/Resources/Prototypes/_LuaM/shipyard/PDV/scorpion.yml b/Resources/Prototypes/_LuaM/shipyard/PDV/scorpion.yml deleted file mode 100644 index f6148257f69..00000000000 --- a/Resources/Prototypes/_LuaM/shipyard/PDV/scorpion.yml +++ /dev/null @@ -1,39 +0,0 @@ -# Автор: almaz3200(discord) -# Вдохновлён шаттлом "scorpion" от Starch - -- type: vessel - id: ScorpionLuaM - parent: BaseVesselAntag - name: PDV Scorpion - description: Широко распространенный вариант маневренного судна для групповой работы по крупной цели, благодаря хорошо защищенным двигателям, дает шанс успешно слинять от противника в любой момент боя. - price: 120000 - purchasable: false # voucher only - category: Medium - group: BlackMarket - access: Pirate - shuttlePath: /Maps/_LuaM/Shuttles/PDV/Tier1/Scorpion.yml - class: - - Pirate - - Pursuit - - Corvette - engine: - - Bananium - -- type: gameMap - id: ScorpionLuaM - mapName: 'PDV Scorpion' - mapPath: /Maps/_LuaM/Shuttles/PDV/Tier1/Scorpion.yml - minPlayers: 0 - stations: - ScorpionLuaM: - stationProto: StandardFrontierVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Scorpion PDV{1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: - Pirate: [ 0, 0 ] - PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/ship_vouchers.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/ship_vouchers.yml index 7504ba78e29..9b9e66f9b0e 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/ship_vouchers.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/ship_vouchers.yml @@ -440,30 +440,30 @@ - type: StaticPrice vendPrice: 20000 -#- type: entity # Commented by LuaM -# parent: BaseShipLPC -# id: ShipVoucherScorpion -# name: PDV Scorpion LPC [T1] -# description: The voucher provides an opportunity to sit at the "Scorpion" consoles, one of the fastest fighters in the flagship's reserves. # LuaM An unusual variant from the same shipyards manufacturing Anacondas, using a mix of missile pods and 2 large-caliber cannons -# components: -# - type: Sprite -# sprite: _Mono/Objects/Misc/lpcnew.rsi -# layers: -# - state: icon -# - state: screen -# color: "#1eff00" -# - state: screen6 -# color: "#1eff00" -# shader: unshaded -# - type: ShipyardVoucher -# destroyOnEmpty: false -# cooldown: 7200 # one hour -# consoleType: BlackMarket -# companyName: PDV -# vessels: -# - Scorpion -# - type: StaticPrice -# vendPrice: 20000 +- type: entity + parent: BaseShipLPC + id: ShipVoucherScorpion + name: PDV Scorpion LPC [T1] + description: The voucher provides an opportunity to sit at the "Scorpion" consoles, one of the fastest fighters in the flagship's reserves. # LuaM An unusual variant from the same shipyards manufacturing Anacondas, using a mix of missile pods and 2 large-caliber cannons > The voucher provides an opportunity to sit at the "Scorpion" consoles, one of the fastest fighters in the flagship's reserves. + components: + - type: Sprite + sprite: _Mono/Objects/Misc/lpcnew.rsi + layers: + - state: icon + - state: screen + color: "#1eff00" + - state: screen6 + color: "#1eff00" + shader: unshaded + - type: ShipyardVoucher + destroyOnEmpty: false + cooldown: 7200 # one hour + consoleType: BlackMarket + companyName: PDV + vessels: + - Scorpion + - type: StaticPrice + vendPrice: 20000 - type: entity parent: BaseShipLPC diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml index 5d8cddb079d..c291bdac67e 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml @@ -1,40 +1,40 @@ -# Author: Starch(!) -# Commented by LuaM -# -#- type: vessel -# id: Scorpion -# parent: BaseVesselAntag -# name: PDV Scorpion -# description: An unusual variant from the same shipyards manufacturing Anacondas, using a mix of missile pods and 2 large-caliber cannons. -# price: 113200 -# purchasable: false # voucher only -# category: Medium -# group: BlackMarket -# access: Pirate -# shuttlePath: /Maps/_LuaM/Shuttles/PDV/skorpionLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/skorpion.yml -> /Maps/_LuaM/Shuttles/PDV/skorpionLuaM.yml -# guidebookPage: Null -# class: -# - Pirate -# - Pursuit -# - Corvette -# engine: -# - Uranium -# -#- type: gameMap -# id: Scorpion -# mapName: 'PDV Scorpion' -# mapPath: /Maps/_Mono/Shuttles/BlackMarket/sсorpion.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/skorpion.yml -> /Maps/_LuaM/Shuttles/PDV/skorpionLuaM.yml -# minPlayers: 0 -# stations: -# Scorpion: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Scorpion PDV{1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Pirate: [ 0, 0 ] -# PdvBorg: [ 0, 0 ] +# Автор: almaz3200(discord) +# Вдохновлён шаттлом "scorpion" от Starch + +- type: vessel + id: Scorpion + parent: BaseVesselAntag + name: PDV Scorpion + description: Широко распространенный вариант маневренного судна для групповой работы по крупной цели, благодаря хорошо защищенным двигателям, дает шанс успешно слинять от противника в любой момент боя. # LuaM An unusual variant from the same shipyards manufacturing Anacondas, using a mix of missile pods and 2 large-caliber cannons. > Широко распространенный вариант маневренного судна для групповой работы по крупной цели, благодаря хорошо защищенным двигателям, дает шанс успешно слинять от противника в любой момент боя. + price: 113200 + purchasable: false # voucher only + category: Medium + group: BlackMarket + access: Pirate + shuttlePath: /Maps/_LuaM/Shuttles/PDV/Scorpion.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/skorpion.yml -> /Maps/_LuaM/Shuttles/PDV/Scorpion.yml + guidebookPage: Null + class: + - Pirate + - Pursuit + - Corvette + engine: + - Bananium # LuaM Uranium > Bananium + +- type: gameMap + id: Scorpion + mapName: 'PDV Scorpion' + mapPath: /Maps/_LuaM/Shuttles/PDV/Scorpion.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/skorpion.yml -> /Maps/_LuaM/Shuttles/PDV/Scorpion.yml + minPlayers: 0 + stations: + Scorpion: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Scorpion PDV{1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: + Pirate: [ 0, 0 ] + PdvBorg: [ 0, 0 ]