Corvax-Frontier · Vonsant · Jun 10, 2024 · Jun 9, 2024 · Jun 9, 2024 · Jun 9, 2024
diff --git a/Resources/Maps/CorvaxFrontier/POI/charlie.yml b/Resources/Maps/CorvaxFrontier/POI/charlie.yml
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/QueenAnnesRevenge.yml b/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/QueenAnnesRevenge.yml
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/Sunset.yml b/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/Sunset.yml
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml b/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/Pot.yml b/Resources/Maps/CorvaxFrontier/Shuttles/Pot.yml
@@ -2318,41 +2318,48 @@ entities:
     - type: Transform
       pos: 3.5,-3.5
       parent: 1
-- proto: SpawnPointLatejoin
+- proto: SpawnPointContractor
   entities:
-  - uid: 395
+  - uid: 376
     components:
     - type: Transform
-      pos: 2.5,-11.5
+      pos: 5.5,-11.5
       parent: 1
-- proto: SpawnPointPilot
-  entities:
-  - uid: 375
+  - uid: 377
     components:
     - type: Transform
-      pos: 2.5,-6.5
+      pos: 6.5,-10.5
       parent: 1
-- proto: SpawnPointSalvageSpecialist
-  entities:
-  - uid: 376
+  - uid: 378
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
+  - uid: 379
     components:
     - type: Transform
       pos: -0.5,-10.5
       parent: 1
-  - uid: 377
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 395
     components:
     - type: Transform
-      pos: 0.5,-11.5
+      pos: 2.5,-11.5
       parent: 1
-  - uid: 378
+- proto: SpawnPointMercenary
+  entities:
+  - uid: 396
     components:
     - type: Transform
-      pos: 5.5,-11.5
+      pos: 4.5,-6.5
       parent: 1
-  - uid: 379
+- proto: SpawnPointPilot
+  entities:
+  - uid: 375
     components:
     - type: Transform
-      pos: 6.5,-10.5
+      pos: 2.5,-6.5
       parent: 1
 - proto: SubstationWallBasic
   entities:

diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/hercules.yml b/Resources/Maps/CorvaxFrontier/Shuttles/hercules.yml
@@ -295,60 +295,58 @@ entities:
       data:
         tiles:
           0,0:
-            0: 61103
-            1: 64
-          0,-2:
-            0: 65535
+            0: 1
+            1: 52424
           0,-1:
-            0: 65535
+            1: 61167
           0,1:
-            0: 14
+            0: 2
           1,0:
-            0: 13111
+            1: 4368
+            0: 4
+          1,-1:
+            1: 13111
+            0: 2176
           1,1:
-            0: 3
+            0: 2
           0,-4:
-            0: 65535
+            1: 4095
+          -1,-4:
+            1: 2184
           0,-3:
-            0: 65535
+            1: 65535
+          -1,-3:
+            1: 51400
+          0,-2:
+            1: 65535
+          -1,-2:
+            1: 34952
+          -1,-1:
+            0: 2180
           1,-4:
-            0: 65535
+            1: 20479
           1,-3:
-            0: 65535
+            1: 65535
           1,-2:
-            0: 65535
-          1,-1:
-            0: 32767
-          2,-4:
-            0: 4369
+            1: 65535
           2,-3:
-            0: 4369
-          2,-2:
-            0: 4369
+            1: 4112
           2,-1:
             0: 1
-          0,-5:
-            0: 65280
-          1,-5:
-            0: 65280
           2,-5:
             0: 4096
+          0,-5:
+            0: 3584
           -1,-5:
-            0: 51200
-          -1,-4:
-            0: 52428
-          -1,-3:
-            0: 52428
-          -1,-2:
-            0: 52428
-          -1,-1:
-            0: 2188
+            0: 18432
+          1,-5:
+            0: 2816
         uniqueMixes:
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
-          - 21.824879
-          - 82.10312
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -360,10 +358,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
+          temperature: 293.15
           moles:
-          - 20.078888
-          - 75.53487
+          - 21.824879
+          - 82.10312
           - 0
           - 0
           - 0
@@ -2394,7 +2392,7 @@ entities:
     - type: Transform
       pos: 4.5048676,3.221777
       parent: 1
-- proto: SpawnPointCargoTechnician
+- proto: SpawnPointContractor
   entities:
   - uid: 395
     components:
@@ -2404,12 +2402,12 @@ entities:
   - uid: 396
     components:
     - type: Transform
-      pos: 2.5,-8.5
+      pos: 4.5,-8.5
       parent: 1
   - uid: 397
     components:
     - type: Transform
-      pos: 4.5,-8.5
+      pos: 2.5,-8.5
       parent: 1
   - uid: 398
     components:
@@ -2419,9 +2417,19 @@ entities:
   - uid: 399
     components:
     - type: Transform
-      pos: 2.5,-4.5
+      pos: 2.5,-6.5
       parent: 1
   - uid: 400
+    components:
+    - type: Transform
+      pos: 4.5,-6.5
+      parent: 1
+  - uid: 408
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 409
     components:
     - type: Transform
       pos: 4.5,-4.5
@@ -2434,6 +2442,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-6.5
       parent: 1
+- proto: SpawnPointMercenary
+  entities:
+  - uid: 410
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 1
+  - uid: 411
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 1
+  - uid: 412
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
 - proto: SpawnPointPilot
   entities:
   - uid: 401

diff --git a/Resources/Prototypes/CorvaxFrontier/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/CorvaxFrontier/Entities/Objects/Weapons/Guns/turrets.yml
@@ -0,0 +1,57 @@
+- type: entity
+  parent: BaseWeaponTurret
+  name: баллистическая турель
+  id: WeaponTurretSyndicateAntiMateriel
+  suffix: Синдикат .60калибр
+  components:
+    - type: NpcFactionMember
+      factions:
+        - Syndicate
+    - type: Gun
+      fireRate: 3
+      selectedMode: FullAuto
+      availableModes:
+        - FullAuto
+      soundGunshot: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg
+    - type: BallisticAmmoProvider
+      proto: CartridgeAntiMateriel
+      capacity: 500
+
+- type: entity
+  parent: BaseWeaponTurret
+  name: баллистическая турель
+  id: WeaponTurretSyndicateMagnumAP
+  suffix: Синдикат .45калибрББ 
+  components:
+    - type: NpcFactionMember
+      factions:
+        - Syndicate
+    - type: Gun
+      fireRate: 1
+      selectedMode: FullAuto
+      availableModes:
+        - FullAuto
+      soundGunshot: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg
+    - type: BallisticAmmoProvider
+      proto: CartridgeMagnumAP
+      capacity: 500
+
+- type: entity
+  parent: BaseWeaponTurret
+  name: баллистическая турель
+  id: WeaponTurretSyndicateShotgun
+  suffix: Синдикат .50дробь
+  components:
+    - type: NpcFactionMember
+      factions:
+        - Syndicate
+    - type: Gun
+      fireRate: 4
+      selectedMode: FullAuto
+      availableModes:
+        - FullAuto
+      soundGunshot: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg
+    - type: BallisticAmmoProvider
+      proto: ShellShotgun
+      capacity: 500
+
diff --git a/Resources/Prototypes/CorvaxFrontier/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/CorvaxFrontier/Entities/Structures/Walls/walls.yml
@@ -0,0 +1,24 @@
+- type: entity
+  parent: WallPlastitaniumIndestructible
+  id: WallPlastitaniumShuttle
+  name: пластитановая стена
+  suffix: "ослабленная"
+  components:
+    - type: Tag
+      tags:
+        - Wall
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 600
+          behaviors:
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                Girder:
+                  min: 1
+                  max: 1
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+#    - type: Reflect # Frontier
+#      reflectProb: 0.15 # Frontier
diff --git a/Resources/Prototypes/CorvaxFrontier/Shipyard/BlackMarket/QueenAnnesRevenge.yml b/Resources/Prototypes/CorvaxFrontier/Shipyard/BlackMarket/QueenAnnesRevenge.yml
@@ -0,0 +1,27 @@
+- type: vessel
+  id: QueenAnnesRevenge
+  name: Месть Королевы Анны
+  description: Среднегабаритный пиратский шаттл. Рекомендованный состав команды 2-8 человека.
+  price: 100000
+  category: Medium
+  group: BlackMarket
+  shuttlePath: /Maps/CorvaxFrontier/Shuttles/BlackMarket/QueenAnnesRevenge.yml
+
+- type: gameMap
+  id: QueenAnnesRevenge
+  mapName: 'QueenAnnesRevenge'
+  mapPath: /Maps/CorvaxFrontier/Shuttles/BlackMarket/QueenAnnesRevenge.yml
+  minPlayers: 0
+  stations:
+    QueenAnnesRevenge:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Месть Королевы Анны {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          overflowJobs: []
+          availableJobs:
+            Pirate: [ 0, 0 ]
diff --git a/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/Sunset.yml b/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/Sunset.yml
@@ -0,0 +1,29 @@
+- type: vessel
+  id: Sunset
+  name: NLE Закат
+  description: Крупногабаритный экспедиционный шаттл, ранее был использовался для выполнения разведывательных задач. Рекомендуемый состав команды 3-8 человек.
+  price: 145000 # 33% tax
+  category: Large
+  group: Expedition
+  shuttlePath: /Maps/CorvaxFrontier/Shuttles/Expedition/Sunset.yml
+
+- type: gameMap
+  id: Sunset
+  mapName: 'NLE Закат'
+  mapPath: /Maps/CorvaxFrontier/Shuttles/Expedition/Sunset.yml
+  minPlayers: 0
+  stations:
+    Sunset:
+      stationProto: StandardFrontierExpeditionVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Закат {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          overflowJobs: []
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml b/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml
@@ -2,8 +2,8 @@
   id: Zarya
   name: VMF Заря # Vitezstvi Military Force
   description: Штурмовое судно Zarya, произведено частной военно-производственной компаний Vitezstvi. Рекомендуемый состав команды 3-8 человек.
-  price: 125000 # 33% tax
-  category: Medium
+  price: 140000 # 33% tax
+  category: Large
   group: Expedition
   shuttlePath: /Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml