Merge branch 'Corvax-Frontier:master' into Шаттл-кудза

Corvax-Frontier · Sep 16, 2024 · 0d8e791 · 0d8e791
2 parents 0a46d92 + f9fb39c
commit 0d8e791
Show file tree

Hide file tree

Showing 7 changed files with 25,434 additions and 2 deletions.
diff --git a/Resources/Maps/Corvax/Shuttles/Expedition/ZaryaAssault.yml b/Resources/Maps/Corvax/Shuttles/Expedition/ZaryaAssault.yml
diff --git a/Resources/Maps/Corvax/Shuttles/Expedition/ZaryaResearch.yml b/Resources/Maps/Corvax/Shuttles/Expedition/ZaryaResearch.yml
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/rubber_stamp.yml
@@ -0,0 +1,12 @@
+- type: entity
+  name: Печать Vitezstvi
+  parent: RubberStampBase
+  id: RubberStampVitezstvi
+  suffix: НЕ МАППИТЬ!
+  components:
+  - type: Stamp
+    stampedName: Vitezstvi
+    stampedColor: "#5e1010"
+    stampState: "paper_stamp-warden"
+  - type: Sprite
+    state: stamp-warden
diff --git a/Resources/Prototypes/Corvax/Events/events_bluespace.yml b/Resources/Prototypes/Corvax/Events/events_bluespace.yml
@@ -24,7 +24,7 @@
       - /Maps/Corvax/Bluespace/RuinedCrescent.yml #Corvax-Frontier
       - /Maps/Corvax/Bluespace/RuinedInv.yml #Corvax-Frontier
       - /Maps/Corvax/Bluespace/RuinedSprinter.yml #Corvax-Frontier
-    rewardFactor: 0.5 # Filler to make the bank go up
+    rewardFactor: 0.1 # Filler to make the bank go up
 
 - type: entity
   id: BluespaceSyndicateFTLRepeater
@@ -45,4 +45,4 @@
   - type: BluespaceErrorRule
     gridPaths:
       - /Maps/Corvax/Bluespace/epsilon.yml
-    rewardFactor: 0.3 # Filler to make the bank go up
+    rewardFactor: 0.01 # Filler to make the bank go up
diff --git a/Resources/Prototypes/Corvax/Shipyard/Expedition/zaryaA.yml b/Resources/Prototypes/Corvax/Shipyard/Expedition/zaryaA.yml
@@ -0,0 +1,28 @@
+- type: vessel
+  id: ZaryaА
+  name: VT-A Заря # Vitezstvi Military Force
+  description: Боевое судно Заря, произведено частной военно-производственной компаний Vitezstvi. Рекомендуемый состав команды 3-8 человек.
+  price: 157500 # 50% tax
+  category: Large
+  group: Expedition
+  shuttlePath: /Maps/Corvax/Shuttles/Expedition/ZaryaAssault.yml
+
+- type: gameMap
+  id: ZaryaА
+  mapName: 'VT-A Заря'
+  mapPath: /Maps/Corvax/Shuttles/Expedition/ZaryaAssault.yml
+  minPlayers: 0
+  stations:
+    ZaryaА:
+      stationProto: StandardFrontierExpeditionVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'VT-A Заря {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/Corvax/Shipyard/Expedition/zaryaR.yml b/Resources/Prototypes/Corvax/Shipyard/Expedition/zaryaR.yml
@@ -0,0 +1,28 @@
+- type: vessel
+  id: ZaryaR
+  name: VT-R Заря # Vitezstvi Military Force
+  description: Исследовательское версия боевого шаттла Заря. Рекомендуемый состав команды 3-8 человек.
+  price: 125000 # 35% tax
+  category: Large
+  group: Expedition
+  shuttlePath: /Maps/Corvax/Shuttles/Expedition/ZaryaResearch.yml
+
+- type: gameMap
+  id: ZaryaR
+  mapName: 'VT-R Заря'
+  mapPath: /Maps/Corvax/Shuttles/Expedition/ZaryaResearch.yml
+  minPlayers: 0
+  stations:
+    ZaryaR:
+      stationProto: StandardFrontierExpeditionVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'VT-R Заря {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -842,6 +842,9 @@
       - MagazineVector45Empty
       - MagazineVector22
       - MagazineVector22Empty
+      - ClothingOuterHardsuitSecurity
+      - ClothingOuterHardsuitWarden
+      - ClothingOuterHardsuitBrigmedic
       #Corvax-Frontier End
       - ThrusterSecurityMachineCircuitboard # Frontier
       - ClothingOuterSuitEmergency # Frontier