Выполнение Преложки с нерфом дронов. Ввод новых 120 поинтовых серверов на кораблях. Нерф Дата центра. Возвращение Ледокола в продажу и его модулей. Ремап Бастиона, Европы, Сэнти, Альтаира, Сэнтинела, Бурана, Флиссы.

Resources/Maps/_LuaM/Shuttles/Expedition/Phoenix.yml

@@ -13295,7 +13295,7 @@ entities:
     - type: Transform
       pos: 17.5,32.5
       parent: 1
-- proto: GunneryServerUltra
+- proto: GunneryServerExtra
   entities:
   - uid: 1872
     components:

Resources/Prototypes/_Mono/Entities/World/Debris/drone.yml

@@ -241,7 +241,7 @@
   parent: SpawnDroneBase
   components:
   - type: GridSpawner
-    path: /Maps/_Mono/Shuttles/World/gust.yml
+    path: /Maps/_LuaM/Shuttles/World/gust.yml # LuaM: /Maps/_Mono/Shuttles/World/gust.yml > /Maps/_LuaM/Shuttles/World/gust.yml
     addComponents:
     - type: RandomMetadata
       nameSeparator: ""
@@ -363,7 +363,7 @@
   parent: SpawnDroneBase
   components:
   - type: GridSpawner
-    path: /Maps/_Mono/Shuttles/World/bracket.yml
+    path: /Maps/_LuaM/Shuttles/World/bracket.yml # LuaM: /Maps/_Mono/Shuttles/World/bracket.yml > /Maps/_LuaM/Shuttles/World/bracket.yml
     addComponents:
     - type: RandomMetadata
       nameSeparator: ""
@@ -405,7 +405,7 @@
   parent: SpawnDroneBase
   components:
   - type: GridSpawner
-    path: /Maps/_Mono/Shuttles/World/quake.yml
+    path: /Maps/_LuaM/Shuttles/World/quake.yml # LuaM: /Maps/_Mono/Shuttles/World/quake.yml > /Maps/_LuaM/Shuttles/World/quake.yml
     addComponents:
     - type: RandomMetadata
       nameSeparator: ""

Resources/Prototypes/_Mono/PointsOfInterest/Dungeon/hammeroftheunion.yml

@@ -11,8 +11,8 @@
   id: HammerOfTheUnion
   parent: [BaseMobilePOI, BaseRepairablePOI]
   name: 'Молот «Союза»' # LuaM:: 'Hammer Of The Union' > 'Молот «Союза»'
-  minimumDistance: 10000
-  maximumDistance: 15000
+  minimumDistance: 20000 # LuaM: 10000 > 20000
+  maximumDistance: 25000 # LuaM : 15000 > 25000
   spawnGroup: Required
   gridPath: /Maps/_Mono/POI/Dungeons/hammeroftheunion.yml
   addComponents:

Resources/Prototypes/_Mono/PointsOfInterest/jupiter.yml

@@ -12,8 +12,8 @@
   id: Jupiter
   parent: [BaseMobilePOI, BaseRepairablePOI]
   name: 'Крейсер AN-474 «Юпитер»' # LuaM: 'PDV Jupiter Class Carrier' > 'Крейсер AN-474 «Юпитер»'
-  minimumDistance: 17000
-  maximumDistance: 19000
+  minimumDistance: 10000 # LuaM : 17000 > 10000
+  maximumDistance: 12000 # LuaM : 19000 > 12000
   spawnGamePreset: [ NFAdventure, NFPirate, MonoStandard, MonoRogueTSF, MonoRogueUSSP, MonoADS, MonoChimera, MonoMixed, MonoAllAtOnce ]
   spawnGroup: Required
   gridPath: /Maps/_LuaM/POI/JupiterLuaM.yml # LuaM: /Maps/_Mono/POI/jupiter.yml > /Maps/_LuaM/POI/JupiterLuaM.yml

Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml

@@ -3,23 +3,23 @@
 - type: vessel
   id: Bastion
   parent: BaseVesselAntag
-  name: PDV Bastion
+  name: AN Bastion # LuaM: PDV Bastion > AN Bastion
   description: A long ranged design using 2 Hydra 220mm Cannons and 4 AK570 57mm autocannons, stand firm and sink the invaders.
   price: 95500
   purchasable: false # voucher only
   category: Medium
   group: BlackMarket
   access: Pirate
-  shuttlePath: /Maps/_Mono/Shuttles/BlackMarket/bastion.yml
+  shuttlePath: /Maps/_LuaM/Shuttles/PDV/bastionLuaM.yml
   guidebookPage: Null
   class:
   - Pirate
   engine:
-  - Uranium
+  - AME # LuaM: Uranium > AME
 
 - type: gameMap
   id: Bastion
-  mapName: 'PDV Bastion'
+  mapName: 'AN Bastion' # LuaM: 'PDV Bastion' > 'AN Bastion'
   mapPath: /Maps/_Mono/Shuttles/BlackMarket/bastion.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml

@@ -3,7 +3,7 @@
 - type: vessel
   id: Carrion
   parent: BaseVesselAntag
-  name: ELH Carrion
+  name: AN Carrion # LuaM: ELH Carrion > AN Carrion
   description: A fighter armed with 4x 90mm DRAVON autocannons and a GPOB-L bomb bay, built for reconnaissance and extreme-speed skirmishing.
   price: 29000 #Appraised at 26000-ish
   category: Small
@@ -19,7 +19,7 @@
 
 - type: gameMap
   id: Carrion
-  mapName: 'ELH Carrion'
+  mapName: 'AN Carrion' # LuaM: ELH 'Carrion' > 'AN Carrion'
   mapPath: /Maps/_Mono/Shuttles/BlackMarket/carrion.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml

@@ -3,7 +3,7 @@
 - type: vessel
   id: Europa
   parent: BaseVesselAntag
-  name: IDY Europa
+  name: AN Europa # LuaM: IDY Europa > AN Europa
   description: A repurposed interdyne medical frigate, with a focus on broadside firepower and armor.
   limit: 3
   price: 280650
@@ -18,10 +18,11 @@
   - frigate
   engine:
   - AME
+  - Uranium # LuaM add
 
 - type: gameMap
   id: Europa
-  mapName: 'PDV Europa'
+  mapName: 'AN Europa' # LuaM: 'IDY Europa' > AN 'Europa'
   mapPath: /Maps/_LuaM/Shuttles/PDV/europaLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/europa.yml -> /Maps/_LuaM/Shuttles/PDV/europaLuaM.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml

@@ -3,7 +3,7 @@
 - type: vessel
   id: Fenrir
   parent: BaseVesselAntag
-  name: BT-Y Fenrir
+  name: AN Fenrir # LuaM: BT-Y Fenrir > AN Fenrir
   description: A versalite support destroyer armed with an M381 Mass Driver, 2 Dravons, 2 Scattercannons, 4 20mm autocannons and outfitted with 2 Medium Size Mechbays capable of deploying S-2 and S-1 Mechs but does not come with Mechs. Well armored but slow.
   price: 150750
   purchasable: false # voucher only
@@ -20,7 +20,7 @@
 
 - type: gameMap
   id: Fenrir
-  mapName: 'PDV Fenrir'
+  mapName: 'AN Fenrir' # LuaM: 'BT-Y Fenrir' > 'AN Fenrir'
   mapPath: /Maps/_LuaM/Shuttles/PDV/FenrirLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/Fenrir.yml -> /Maps/_LuaM/Shuttles/PDV/FenrirLuaM.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml

@@ -3,7 +3,7 @@
 - type: vessel
   id: Garm
   parent: BaseVesselAntag
-  name: WEN Garm
+  name: AN Garm # LuaM: WEN Garm > AN Garm
   description: Gruff hull with 3 GPOL's and long-range Bofors artillery for station bombardments and fleet support.
   price: 105200 # 86700 appraisegrid
   purchasable: false # voucher only
@@ -19,7 +19,7 @@
 
 - type: gameMap
   id: Garm
-  mapName: 'WEN Garm'
+  mapName: 'AN Garm' # LuaM: 'WEN Garm' > 'AN Garm'
   mapPath: /Maps/_Mono/Shuttles/BlackMarket/garm.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml

@@ -3,7 +3,7 @@
 - type: vessel
   id: Hazel
   parent: BaseVesselAntag
-  name: BT-Y Hazel
+  name: AN Hazel # LuaM: BT-Y Hazel > AN Hazel
   description: A small, cramped shuttle featuring a Syndicate 3 barreled 220mm Battery and 2 ASM-302s, well armored for its size. Does not have an FTL drive. A cheap option but realiability is questionable.
   price: 67000
   category: Small
@@ -19,7 +19,7 @@
 
 - type: gameMap
   id: Hazel
-  mapName: 'BT-Y Hazel'
+  mapName: 'AN Hazel' # LuaM: 'BT-Y Hazel' > 'AN Hazel'
   mapPath: /Maps/_Mono/Shuttles/BlackMarket/hazel.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml

@@ -3,7 +3,7 @@
 - type: vessel
   id: MotleyAnne
   parent: BaseVesselAntag
-  name: PDV-IED Motley Anne
+  name: AN-IED Motley Anne # LuaM: PDV-IED Motley Anne > AN-IED Motley Anne
   description: A support mothership designed to reinforce an engagements back-line with mech and drone ensemble or closer resupplies.
   price: 280000
   limit: 2
@@ -21,7 +21,7 @@
 
 - type: gameMap
   id: MotleyAnne
-  mapName: 'PDV Motley Anne'
+  mapName: 'AN Motley Anne' # LuaM: 'PDV-IED Motley Anne' > 'AN-IED Motley Anne'
   mapPath: /Maps/_Mono/Shuttles/BlackMarket/motleyanne.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml

@@ -3,7 +3,7 @@
 - type: vessel
   id: Neptune
   parent: BaseVesselAntag
-  name: PDW Neptune
+  name: AN Neptune # LuaM: PDW Neptune > AN Neptune
   description: Equipped with heavy frontal armor, 6 Fang heavy 90mms, and 2 Trident torpedoes. Good for dealing with heavier targets in head on brawls, but it lacks capabilities to fight nimble and small targets.
   price: 153555 #126k appraisal
   purchasable: false # voucher only
@@ -21,7 +21,7 @@
 
 - type: gameMap
   id: Neptune
-  mapName: 'PDV Neptune'
+  mapName: 'AN Neptune' # LuaM: 'PDW Neptune' > 'AN Neptune'
   mapPath: /Maps/_Mono/Shuttles/BlackMarket/neptune.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml

@@ -3,7 +3,7 @@
 - type: vessel
   id: Saintie
   parent: BaseVesselAntag
-  name: PDW Saintie
+  name: AN Saintie # LuaM: PDW Saintie > AN Saintie
   description: An expensive Frigate designed by the Phaethon Divine Shipworks, utilised by imperial vanguard for swift ambush attacks against enemy fleets.
   limit: 2
   price: 345000
@@ -16,11 +16,11 @@
   - Pirate
   - Frigate
   engine:
-  - AME
+  - Plasma # LuaM: AME > Plasma
 
 - type: gameMap
   id: Saintie
-  mapName: 'Saintie'
+  mapName: 'AN Saintie' # LuaM: 'PDW Saintie' > 'AN Saintie'
   mapPath: /Maps/_LuaM/Shuttles/PDV/santieLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/santie.yml -> /Maps/_LuaM/Shuttles/PDV/santieLuaM.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml

@@ -1,10 +1,10 @@
-# Автор: almaz3200(discord) 
+# Автор: almaz3200(discord)
 # Вдохновлён шаттлом "scorpion" от Starch
 
 - type: vessel
   id: Scorpion
   parent: BaseVesselAntag
-  name: PDV Scorpion
+  name: AN Scorpion # LuaM: PDV Scorpion > AN 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
@@ -22,7 +22,7 @@
 
 - type: gameMap
   id: Scorpion
-  mapName: 'PDV Scorpion'
+  mapName: 'AN Scorpion' # LuaM: 'PDV Scorpion' > 'AN Scorpion'
   mapPath: /Maps/_LuaM/Shuttles/PDV/Scorpion.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/skorpion.yml -> /Maps/_LuaM/Shuttles/PDV/Scorpion.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/spyglassmk2.yml

@@ -3,7 +3,7 @@
 - type: vessel
   id: SpyglassMKII
   parent: BaseVesselAntag
-  name: PDV Spyglass MKII
+  name: AN Spyglass MKII # LuaM: PDV Spyglass MKII > AN Spyglass MKII
   description: One of salvage ships you'll see from the Phaethon Dynasty. This baby is capable of Xenoarcheology and salvage work.
   price: 62500
   category: Small
@@ -19,7 +19,7 @@
 
 - type: gameMap
   id: SpyglassMKII
-  mapName: 'PDV Spyglass MKII'
+  mapName: 'AN Spyglass MKII' # LuaM: 'PDV Spyglass MKII' > 'AN Spyglass MKII'
   mapPath: /Maps/_LuaM/Shuttles/PDV/SpyglassMK2LuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/spyglassmk2.yml -> /Maps/_LuaM/Shuttles/PDV/SpyglassMK2LuaM.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml

@@ -3,7 +3,7 @@
 - type: vessel
   id: Tethys
   parent: BaseVesselAntag
-  name: PDV Tethys
+  name: AN Tethys # LuaM: PDV Tethys > AN Tethys
   description: A medical Phaethon Dynasty shuttle. It comes equipped with 4 90mm turrets and 2 tovek missile launchers. Hot damn.
   price: 72000
   category: Medium
@@ -18,7 +18,7 @@
 
 - type: gameMap
   id: Tethys
-  mapName: 'PDV Tethys'
+  mapName: 'AN Tethys' # LuaM: 'PDV Tethys' > 'AN Tethys'
   mapPath: /Maps/_LuaM/Shuttles/PDV/TethysLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/Tethys.yml -> /Maps/_LuaM/Shuttles/PDV/TethysLuaM.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml

@@ -3,7 +3,7 @@
 - type: vessel
   id: Vulture
   parent: BaseVesselAntag
-  name: UI Vulture
+  name: AN Vulture # LuaM: UI Vulture > AN Vulture
   description: A heavy material reclaiming ship manufacted by Ullman industries originally for deep-space mining and planet cracking, but has been up-gunned and sold to the Phaethon Dynasty in recent days. Equiped with a full array or PTKs and 3, 255mm Bofors cannons.
   limit: 2
   price: 285580
@@ -21,7 +21,7 @@
 
 - type: gameMap
   id: Vulture
-  mapName: 'Vulture'
+  mapName: 'AN Vulture' # LuaM: 'UI Vulture' > 'AN Vulture'
   mapPath: /Maps/_LuaM/Shuttles/PDV/VultureLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/vulture.yml -> /Maps/_LuaM/Shuttles/PDV/vultureLuaM.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml

@@ -12,14 +12,14 @@
   shuttlePath: /Maps/_LuaM/Shuttles/TSFMC/flyssa.yml # LuaM: /Maps/_Mono/Shuttles/Capitals/flyssa.yml > /Maps/_LuaM/Shuttles/TSFMC/flyssa.yml
   guidebookPage: Null
   class:
-  - Capital
+  # - Capital # Commented by LuaM
   - Destroyer
   - Medical
   - Chemistry
   - Pursuit
   - Patrol
   engine:
-  - AME
+  - Plasma # LuaM: AME > Plasma
 
 - type: gameMap
   id: Flyssa

Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml

@@ -9,7 +9,7 @@
 - type: vessel
   id: Saturn
   parent: BaseVesselAntag
-  name: PDW-HSS Saturn
+  name: AN-HSS Saturn # LuaM: PDW-HSS Saturn > AN-HSS Saturn
   description: Commissioned by the Sultanate for dire need for heavy firepower against the Federation on their borders. A one of a kind ship, specifically designed with the vanguard stationed in Helios.
   limit: 1
   price: 1540950
@@ -21,7 +21,7 @@
   guidebookPage: Null
   class:
   - Pirate
-  - Capital
+  # - Capital # Commented by LuaM
   - Destroyer
   - Medical
   - Chemistry
@@ -32,7 +32,7 @@
 
 - type: gameMap
   id: Saturn
-  mapName: 'PDW-HSS Saturn'
+  mapName: 'AN-HSS Saturn' # LuaM: 'PDW-HSS Saturn' > 'AN-HSS Saturn'
   mapPath: /Maps/_Mono/Shuttles/Capitals/saturn.yml
   minPlayers: 0
   stations:

Resources/Prototypes/_Mono/Shipyard/USSP/Rams/kopye.yml

@@ -4,7 +4,7 @@
   name: BYP Kopye
   description: A thin, pointed ram made to fit the connection port of the Ledokol.
   price: 45000
-  purchasable: false # voucher only
+  purchasable: true # voucher only # LuaM: false > true
   category: Large
   group: Custom
   access: USSP

Resources/Prototypes/_Mono/Shipyard/USSP/Rams/molotok.yml

@@ -4,7 +4,7 @@
   name: BYP Molotok
   description: A broad-headed ram made to fit the connection port of the Ledokol.
   price: 60000
-  purchasable: false # voucher only
+  purchasable: true # voucher only # LuaM: false > true
   category: Large
   group: Custom
   access: USSP

Resources/Prototypes/_Mono/Shipyard/USSP/buran.yml

@@ -14,7 +14,7 @@
   class:
   - Frigate
   engine:
-  - NFR
+  - AME # LuaM: NFR > AME
 
 - type: gameMap
   id: Buran