Skip to content
Closed
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
18 changes: 0 additions & 18 deletions Resources/Prototypes/_LuaM/Catalog/pdv_uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,6 @@
categories:
- UplinkPirateExplosives
conditions:
- !type:StoreWhitelistCondition
whitelist:
tags:
- PirateUplink

# Vouchers
# T1

- type: listing
id: UplinkSecurityT1VoucherScorpionLuaM
name: uplink-pdv-t1-scorpion-voucher-name
description: uplink-pdv-t1-scorpion-voucher-desc
productEntity: ShipVoucherScorpionLuaM
cost:
Doubloon: 100
categories:
- UplinkPdvVouchers
conditions:
- !type:StoreWhitelistCondition
whitelist:
tags:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +0,0 @@
- 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
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
39 changes: 0 additions & 39 deletions Resources/Prototypes/_LuaM/shipyard/PDV/scorpion.yml

This file was deleted.

28 changes: 14 additions & 14 deletions Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1345,20 +1345,20 @@
tags:
- PirateUplink # LuaM FactionStaticUplinkPdv > PirateUplink

#- type: listing # Commented by LuaM
# id: UplinkSecurityT1VoucherScorpion
# name: uplink-pdv-t1-scorpion-voucher-name
# description: uplink-pdv-t1-scorpion-voucher-desc
# productEntity: ShipVoucherScorpion
# cost:
# Doubloon: 120
# categories:
# - UplinkPdvVouchers
# conditions:
# - !type:StoreWhitelistCondition
# whitelist:
# tags:
# - PirateUplink # LuaM FactionStaticUplinkPdv > PirateUplink
- type: listing
id: UplinkSecurityT1VoucherScorpion
name: uplink-pdv-t1-scorpion-voucher-name
description: uplink-pdv-t1-scorpion-voucher-desc
productEntity: ShipVoucherScorpion
cost:
Doubloon: 100

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Doubloon: 100
Doubloon: 100 # LuaM: 120 > 100

categories:
- UplinkPdvVouchers
conditions:
- !type:StoreWhitelistCondition
whitelist:
tags:
- PirateUplink # LuaM FactionStaticUplinkPdv > PirateUplink

- type: listing
id: UplinkSecurityT1VoucherBastion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -439,30 +439,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
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
Expand Down
80 changes: 40 additions & 40 deletions Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml
Original file line number Diff line number Diff line change
@@ -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: 120000

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
price: 120000
price: 120000 # LuaM: 113200 > 120000

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

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Bananium
- 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 ]
Loading