up2

space-syndicate · Nov 20, 2024 · d67a76a · d67a76a
1 parent 152eb69
commit d67a76a
Show file tree

Hide file tree

Showing 30 changed files with 344 additions and 307 deletions.
diff --git a/Resources/Locale/en-US/_corvaxnext/research/armory_technologies.ftl b/Resources/Locale/en-US/_corvaxnext/research/armory_technologies.ftl
@@ -1,4 +1,3 @@
-next-research-technology-anomaly-harnessing = Militarized anomalies
 next-research-technology-draconic-ammunition = Incendiary ammunition
 next-research-technology-nonlethal-ammunition = Non-lethal ammunition
 next-research-technology-uranium-ammunition = Uranium ammunition

diff --git a/Resources/Locale/en-US/_corvaxnext/research/scientific_technologies.ftl b/Resources/Locale/en-US/_corvaxnext/research/scientific_technologies.ftl
@@ -1,4 +1,5 @@
 next-research-technology-gravity-manipulation = Gravity manipulation
+next-research-technology-anomaly-harnessing = Anomaly harnessing
 next-research-technology-quantum-leaping = Quantum weaving
 next-research-technology-bluespace-storage = Bluespace storage
 next-research-technology-anomalous-research = Anomalous research

diff --git a/Resources/Locale/en-US/_corvaxnext/research/shuttle_technologies.ftl b/Resources/Locale/en-US/_corvaxnext/research/shuttle_technologies.ftl
@@ -1,3 +1,6 @@
-next-research-technology-shuttle-weapon = Combat shuttle equipment
+next-research-technology-shuttle-weapon = Combat shuttle
+next-research-technology-shuttle-weapon-advanced = Advanced combat shuttle
+
+next-research-technology-shuttle-weapon-machines = Combat shuttle equipment
 next-research-technology-shuttle-weapon-advanced = Advanced combat shuttle equipment
-next-research-technology-shuttlecraft = Basic shuttle construction
+next-research-technology-shuttlecraft = Basic shuttle construction equipment
diff --git a/Resources/Locale/ru-RU/_corvaxnext/research/armory_technologies.ftl b/Resources/Locale/ru-RU/_corvaxnext/research/armory_technologies.ftl
@@ -1,4 +1,3 @@
-next-research-technology-anomaly-harnessing = Военизированные аномалии
 next-research-technology-draconic-ammunition = Поджигающие боеприпасы
 next-research-technology-nonlethal-ammunition = Нелетальные боеприпасы
 next-research-technology-uranium-ammunition = Урановые боеприпасы

diff --git a/Resources/Locale/ru-RU/_corvaxnext/research/scientific_technologies.ftl b/Resources/Locale/ru-RU/_corvaxnext/research/scientific_technologies.ftl
@@ -1,4 +1,5 @@
 next-research-technology-gravity-manipulation = Гравитационные манипуляции
+next-research-technology-anomaly-harnessing = Аномальное воздействие
 next-research-technology-quantum-leaping = Квантовое плетение
 next-research-technology-bluespace-storage = Блюспейс хранилище
 next-research-technology-anomalous-research = Исследование аномалий

diff --git a/Resources/Locale/ru-RU/_corvaxnext/research/shuttle_technologies.ftl b/Resources/Locale/ru-RU/_corvaxnext/research/shuttle_technologies.ftl
@@ -1,3 +1,6 @@
-next-research-technology-shuttle-weapon = Оборудование боевых шаттлов
+next-research-technology-shuttle-weapon = Боевые шаттлы
+next-research-technology-shuttle-weapon-advanced = Продвинутые боевые шаттлы
+
+next-research-technology-shuttle-weapon-machines = Оборудование боевых шаттлов
 next-research-technology-shuttle-weapon-advanced = Продвинутое оборудование боевых шаттлов
-next-research-technology-shuttlecraft = Базовое шаттлостроение
+next-research-technology-shuttlecraft = Базовое конструкции шаттлостроения
diff --git a/...entities/objects/tools/mech_equipment.ftl → ...entities/objects/tools/mech_equipment.ftl b/...entities/objects/tools/mech_equipment.ftl → ...entities/objects/tools/mech_equipment.ftl
diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml
@@ -13,7 +13,7 @@
       - state: server_o
         map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: ResearchServer
-  - type: TechnologyDatabase # Corvax-Next-RNDResearch
+  - type: TechnologyDatabase # Corvax-Next-EDIT-RNDResearch
 #    supportedDisciplines:
 #    - Industrial
 #    - Arsenal
@@ -75,6 +75,7 @@
     - AtmosphericMachines
 # <-- SCIENTIFIC -->
     - GravityManipulation
+    - AnomalyCoreHarnessing
     - QuantumLeaping
     - BluespaceStorage
     - AnomalousResearch
@@ -101,22 +102,21 @@
     - RiotControl
     - WarCrimes
 # <-- ARMORY -->
-    - AnomalyCoreHarnessing
-    - DraconicAmmunition
-    - UraniumAmmunition
+    - Ammunition
     - Explosive
     - CombatLaser
     - CombatLaserConcentrated
     - CombatLaserWaveHarnessing
     - CombatLaserExperimental
 # <-- SERVICE -->
-    - EntertainmentAdvanced
-    - EntertainmentAdvancedMachines
+    - Hydroponics
     - FauxAstroTiles
+    - EntertainmentAdvanced
     - CleaningAdvanced
     - SprayAdvanced
     - HydroponicsMachines
     - MeatManipulationMachine
+    - EntertainmentAdvancedMachines
 # <-- SHAFT -->
     - SalvageWeapons
     - SalvageEquipment
@@ -128,10 +128,11 @@
 # <-- CARGO -->
     - BluespaceCargoTransportMachines
 # <-- MEDICAL -->
+    - Chemistry
     - CrewMonitoring
+    - BodyBags
     - BiochemicalStasis
     - BiochemicalStasisMachines
-    - Chemistry
 # <-- EQUIPMENT -->
     - MagneticBoots
     - QuantumMagneticBoots

diff --git a/Resources/Prototypes/_CorvaxNext/Research/Disciplines/armory_disciplines.yml b/Resources/Prototypes/_CorvaxNext/Research/Disciplines/armory_disciplines.yml
@@ -1,35 +1,5 @@
 - type: techDiscipline
-  id: AnomalyCoreHarnessing
-  name: next-research-discipline-armory
-  color: "#dc373b"
-  icon:
-    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
-    state: weapon
-  tierPrerequisites:
-    1: 0
-
-- type: techDiscipline
-  id: DraconicAmmunition
-  name: next-research-discipline-armory
-  color: "#dc373b"
-  icon:
-    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
-    state: weapon
-  tierPrerequisites:
-    1: 0
-
-- type: techDiscipline
-  id: NonlethalAmmunition
-  name: next-research-discipline-armory
-  color: "#dc373b"
-  icon:
-    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
-    state: weapon
-  tierPrerequisites:
-    1: 0
-
-- type: techDiscipline
-  id: UraniumAmmunition
+  id: Ammunition
   name: next-research-discipline-armory
   color: "#dc373b"
   icon:

diff --git a/Resources/Prototypes/_CorvaxNext/Research/Disciplines/engineering_disciplines.yml b/Resources/Prototypes/_CorvaxNext/Research/Disciplines/engineering_disciplines.yml
@@ -8,25 +8,25 @@
   tierPrerequisites:
     1: 0
 
-- type: techDiscipline
-  id: EngineeringDevices
-  name: next-research-discipline-engineering
-  color: "#eeac34"
-  icon:
-    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
-    state: engineering
-  tierPrerequisites:
-    1: 0
+#- type: techDiscipline
+#  id: EngineeringDevices
+#  name: next-research-discipline-engineering
+#  color: "#eeac34"
+#  icon:
+#    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
+#    state: engineering
+#  tierPrerequisites:
+#    1: 0
 
-- type: techDiscipline
-  id: AtmosphericDevices
-  name: next-research-discipline-engineering
-  color: "#eeac34"
-  icon:
-    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
-    state: engineering
-  tierPrerequisites:
-    1: 0
+#- type: techDiscipline
+#  id: AtmosphericDevices
+#  name: next-research-discipline-engineering
+#  color: "#eeac34"
+#  icon:
+#    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
+#    state: engineering
+#  tierPrerequisites:
+#    1: 0
 
 - type: techDiscipline
   id: EngineeringAdvancedTools

diff --git a/Resources/Prototypes/_CorvaxNext/Research/Disciplines/scientific_disciplines.yml b/Resources/Prototypes/_CorvaxNext/Research/Disciplines/scientific_disciplines.yml
@@ -8,6 +8,16 @@
   tierPrerequisites:
     1: 0
 
+- type: techDiscipline
+  id: AnomalyCoreHarnessing
+  name: next-research-discipline-armory
+  color: "#dc373b"
+  icon:
+    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
+    state: scientific
+  tierPrerequisites:
+    1: 0
+
 - type: techDiscipline
   id: QuantumLeaping
   name: next-research-discipline-scientific

diff --git a/Resources/Prototypes/_CorvaxNext/Research/Disciplines/security_disciplines.yml b/Resources/Prototypes/_CorvaxNext/Research/Disciplines/security_disciplines.yml
@@ -8,16 +8,6 @@
   tierPrerequisites:
     1: 0
 
-- type: techDiscipline
-  id: GripsGloves
-  name: next-research-discipline-security
-  color: "#dc373b"
-  icon:
-    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
-    state: security
-  tierPrerequisites:
-    1: 0
-
 - type: techDiscipline
   id: WarCrimes
   name: next-research-discipline-security

diff --git a/Resources/Prototypes/_CorvaxNext/Research/Disciplines/service_disciplines.yml b/Resources/Prototypes/_CorvaxNext/Research/Disciplines/service_disciplines.yml
@@ -78,22 +78,22 @@
   tierPrerequisites:
     1: 0
 
-- type: techDiscipline
-  id: TranslationDevice
-  name: next-research-discipline-service
-  color: "#7ecd48"
-  icon:
-    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
-    state: service
-  tierPrerequisites:
-    1: 0
+#- type: techDiscipline
+#  id: TranslationDevice
+#  name: next-research-discipline-service
+#  color: "#7ecd48"
+#  icon:
+#    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
+#    state: service
+#  tierPrerequisites:
+#    1: 0
 
-- type: techDiscipline
-  id: TranslationImplanter
-  name: next-research-discipline-service
-  color: "#7ecd48"
-  icon:
-    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
-    state: service
-  tierPrerequisites:
-    1: 0
+#- type: techDiscipline
+#  id: TranslationImplanter
+#  name: next-research-discipline-service
+#  color: "#7ecd48"
+#  icon:
+#    sprite: _CorvaxNext/Interface/Misc/research_disciplines.rsi
+#    state: service
+#  tierPrerequisites:
+#    1: 0