From d67a76aaa039ef1dd5b3d61b77993f3f1c07d642 Mon Sep 17 00:00:00 2001 From: PuroSlavKing Date: Wed, 20 Nov 2024 22:03:43 +0300 Subject: [PATCH] up2 --- .../research/armory_technologies.ftl | 1 - .../research/scientific_technologies.ftl | 1 + .../research/shuttle_technologies.ftl | 7 +- .../research/armory_technologies.ftl | 1 - .../research/scientific_technologies.ftl | 1 + .../research/shuttle_technologies.ftl | 7 +- .../entities/objects/tools/mech_equipment.ftl | 0 .../Entities/Structures/Machines/research.yml | 15 +-- .../Disciplines/armory_disciplines.yml | 32 +----- .../Disciplines/engineering_disciplines.yml | 36 +++---- .../Disciplines/scientific_disciplines.yml | 10 ++ .../Disciplines/security_disciplines.yml | 10 -- .../Disciplines/service_disciplines.yml | 36 +++---- .../_CorvaxNext/Research/armory.yml | 100 ++++++++++-------- .../_CorvaxNext/Research/engineering.yml | 20 ++-- .../_CorvaxNext/Research/equipment.yml | 8 +- .../_CorvaxNext/Research/machines_cargo.yml | 2 +- .../Research/machines_engineering.yml | 10 +- .../Research/machines_robotics.yml | 4 +- .../Research/machines_scientific.yml | 2 + .../_CorvaxNext/Research/machines_shaft.yml | 7 +- .../_CorvaxNext/Research/machines_shuttle.yml | 56 +++++----- .../Research/machines_telecommunications.yml | 14 +-- .../_CorvaxNext/Research/medical.yml | 24 ++--- .../_CorvaxNext/Research/robotics.yml | 87 +++++++-------- .../_CorvaxNext/Research/scientific.yml | 38 ++++--- .../_CorvaxNext/Research/security.yml | 24 ++--- .../_CorvaxNext/Research/service.yml | 44 ++++---- .../Prototypes/_CorvaxNext/Research/shaft.yml | 22 ++-- .../_CorvaxNext/Research/shuttle.yml | 32 ++++++ 30 files changed, 344 insertions(+), 307 deletions(-) rename Resources/Locale/ru-RU/ss14-ru/prototypes/{_ataraxia => _corvaxnext}/entities/objects/tools/mech_equipment.ftl (100%) create mode 100644 Resources/Prototypes/_CorvaxNext/Research/shuttle.yml diff --git a/Resources/Locale/en-US/_corvaxnext/research/armory_technologies.ftl b/Resources/Locale/en-US/_corvaxnext/research/armory_technologies.ftl index ca0943d0622..dbf3828c422 100644 --- 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 index 1f49eb74d88..b00f9473466 100644 --- 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 index bd01e768a0f..5159f66a762 100644 --- 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 index 85f8752755a..da6dc5091ac 100644 --- 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 index be1eff9c089..fc31cab46a7 100644 --- 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 index 5551d340ef9..e9021a5fb8e 100644 --- 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/Resources/Locale/ru-RU/ss14-ru/prototypes/_ataraxia/entities/objects/tools/mech_equipment.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/tools/mech_equipment.ftl similarity index 100% rename from Resources/Locale/ru-RU/ss14-ru/prototypes/_ataraxia/entities/objects/tools/mech_equipment.ftl rename to Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/tools/mech_equipment.ftl diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml index 10be5b962ff..bd90f4cce86 100644 --- 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 index 88e88e766f0..6b8b2fbbc35 100644 --- 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 index 4d991af60d5..6d9eecb5939 100644 --- 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 index 3113d0eb322..0a52b9cf512 100644 --- 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 index bce82cf6e46..a503dc207fa 100644 --- 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 index 1471fc49f6c..7f2d98b4502 100644 --- 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 diff --git a/Resources/Prototypes/_CorvaxNext/Research/armory.yml b/Resources/Prototypes/_CorvaxNext/Research/armory.yml index e733979dc2b..9b2b85ebf0b 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/armory.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/armory.yml @@ -1,14 +1,18 @@ - type: technology - id: AnomalyCoreHarnessing - name: next-research-technology-anomaly-harnessing + id: NonlethalAmmunition + name: next-research-technology-nonlethal-ammunition icon: - sprite: Objects/Weapons/Melee/gorilla.rsi - state: icon - discipline: AnomalyCoreHarnessing + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: beanbag + discipline: Ammunition tier: 1 - cost: 10000 + cost: 7500 recipeUnlocks: - - WeaponGauntletGorilla + - MagazineShotgunBeanbag + - BoxShellTranquilizer + - BoxBeanbag + technologyPrerequisites: + - RiotControl - type: technology id: DraconicAmmunition @@ -16,22 +20,23 @@ icon: sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi state: incendiarydisplay - discipline: DraconicAmmunition + discipline: Ammunition tier: 1 cost: 10000 recipeUnlocks: - - BoxShotgunIncendiary - - MagazineRifleIncendiary - - MagazinePistolIncendiary - - MagazineLightRifleIncendiary - - SpeedLoaderMagnumIncendiary - - MagazineShotgunIncendiary - - MagazineBoxPistolIncendiary - - MagazineBoxMagnumIncendiary - - MagazineBoxLightRifleIncendiary - - MagazineBoxRifleIncendiary + - BoxShotgunIncendiary + - MagazineRifleIncendiary + - MagazinePistolIncendiary + - MagazineLightRifleIncendiary + - SpeedLoaderMagnumIncendiary + - MagazineShotgunIncendiary + - MagazineBoxPistolIncendiary + - MagazineBoxMagnumIncendiary + - MagazineBoxLightRifleIncendiary + - MagazineBoxRifleIncendiary technologyPrerequisites: - - RiotControl # TODO: NonlethalAmmunition + - RiotControl + - NonlethalAmmunition - type: technology id: UraniumAmmunition @@ -39,21 +44,22 @@ icon: sprite: Objects/Materials/Sheets/other.rsi state: uranium - discipline: UraniumAmmunition + discipline: Ammunition tier: 1 - cost: 7500 + cost: 9000 recipeUnlocks: - - MagazineRifleUranium - - MagazinePistolUranium - - MagazineLightRifleUranium - - SpeedLoaderMagnumUranium - - MagazineBoxPistolUranium - - MagazineBoxMagnumUranium - - MagazineBoxLightRifleUranium - - MagazineBoxRifleUranium - - BoxShotgunUranium + - MagazineRifleUranium + - MagazinePistolUranium + - MagazineLightRifleUranium + - SpeedLoaderMagnumUranium + - MagazineBoxPistolUranium + - MagazineBoxMagnumUranium + - MagazineBoxLightRifleUranium + - MagazineBoxRifleUranium + - BoxShotgunUranium technologyPrerequisites: - - RiotControl # TODO: NonlethalAmmunition + - RiotControl + - NonlethalAmmunition - type: technology id: Explosive @@ -63,15 +69,15 @@ state: payload-explosive-armed discipline: Explosive tier: 1 - cost: 10000 + cost: 8000 recipeUnlocks: - - SignallerAdvanced - - SignalTrigger - - VoiceTrigger - - TimerTrigger - - FlashPayload - - ExplosivePayload - - ChemicalPayload + - SignallerAdvanced + - SignalTrigger + - VoiceTrigger + - TimerTrigger + - FlashPayload + - ExplosivePayload + - ChemicalPayload - type: technology id: CombatLaser @@ -83,7 +89,9 @@ tier: 1 cost: 7500 recipeUnlocks: - - WeaponLaserCarbine + - WeaponLaserCarbine + technologyPrerequisites: + - NonlethalAmmunition - type: technology id: CombatLaserAdvanced @@ -95,8 +103,8 @@ tier: 1 cost: 15000 recipeUnlocks: - - WeaponAdvancedLaser - - PortableRecharger + - WeaponAdvancedLaser + - PortableRecharger technologyPrerequisites: - CombatLaser - CombatLaserConcentrated @@ -111,7 +119,7 @@ tier: 1 cost: 10000 recipeUnlocks: - - WeaponLaserCannon + - WeaponLaserCannon technologyPrerequisites: - CombatLaser @@ -123,9 +131,9 @@ state: icon discipline: CombatLaserWaveHarnessing tier: 1 - cost: 10000 + cost: 12000 recipeUnlocks: - - WeaponXrayCannon + - WeaponXrayCannon technologyPrerequisites: - CombatLaser @@ -139,6 +147,6 @@ tier: 1 cost: 5000 recipeUnlocks: - - WeaponLaserSvalinn + - WeaponLaserSvalinn technologyPrerequisites: - CombatLaser diff --git a/Resources/Prototypes/_CorvaxNext/Research/engineering.yml b/Resources/Prototypes/_CorvaxNext/Research/engineering.yml index add98c6fd69..5c8d9dc424e 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/engineering.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/engineering.yml @@ -8,7 +8,7 @@ tier: 1 cost: 7500 recipeUnlocks: - - PowerCellHigh + - PowerCellHigh - type: technology id: PortableFission @@ -20,7 +20,7 @@ tier: 1 cost: 10000 recipeUnlocks: - - PowerCellMicroreactor + - PowerCellMicroreactor technologyPrerequisites: - AdvancedPowercells @@ -34,7 +34,7 @@ # tier: 1 # cost: 10000 # recipeUnlocks: -# - RCDRecipe +# - RCDRecipe #- type: technology # Because need port # id: AtmosphericDevices @@ -46,7 +46,7 @@ # tier: 1 # cost: 7500 # recipeUnlocks: -# - RapidPipeDispenserRecipe +# - RapidPipeDispenserRecipe - type: technology id: EngineeringAdvancedTools @@ -56,11 +56,13 @@ state: icon discipline: EngineeringAdvancedTools tier: 1 - cost: 10000 + cost: 12000 recipeUnlocks: - - WelderExperimental - - PowerDrill - - JawsOfLife + - WelderExperimental + - PowerDrill + - JawsOfLife + technologyPrerequisites: + - EngineeringAdvancedMachines # Because dont have basic tools - type: technology id: AtmosphericTools @@ -72,4 +74,4 @@ tier: 1 cost: 7500 recipeUnlocks: - - HolofanProjector + - HolofanProjector diff --git a/Resources/Prototypes/_CorvaxNext/Research/equipment.yml b/Resources/Prototypes/_CorvaxNext/Research/equipment.yml index 1f00efc0391..c904f317409 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/equipment.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/equipment.yml @@ -8,8 +8,8 @@ tier: 1 cost: 5500 recipeUnlocks: - - ClothingShoesBootsMagSci - - ClothingShoesBootsMoon + - ClothingShoesBootsMagSci + - ClothingShoesBootsMoon - type: technology id: QuantumMagneticBoots @@ -19,9 +19,9 @@ state: icon discipline: QuantumMagneticBoots tier: 1 - cost: 10000 + cost: 12000 recipeUnlocks: - - ClothingShoesBootsSpeed + - ClothingShoesBootsSpeed technologyPrerequisites: - MagneticBoots - GravityManipulation diff --git a/Resources/Prototypes/_CorvaxNext/Research/machines_cargo.yml b/Resources/Prototypes/_CorvaxNext/Research/machines_cargo.yml index b8db22d4cf5..9b9c5cf7056 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/machines_cargo.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/machines_cargo.yml @@ -8,4 +8,4 @@ tier: 1 cost: 12000 recipeUnlocks: - - CargoTelepadMachineCircuitboard + - CargoTelepadMachineCircuitboard diff --git a/Resources/Prototypes/_CorvaxNext/Research/machines_engineering.yml b/Resources/Prototypes/_CorvaxNext/Research/machines_engineering.yml index 99a6282e540..ae617df9dcb 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/machines_engineering.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/machines_engineering.yml @@ -24,7 +24,7 @@ state: portgen0 discipline: PowerGeneration tier: 1 - cost: 7500 + cost: 8500 recipeUnlocks: - TurboItemRechargerCircuitboard - PortableGeneratorSuperPacmanMachineCircuitboard @@ -39,9 +39,11 @@ state: base discipline: MechanicalCompressionMachines tier: 1 - cost: 10000 + cost: 8500 recipeUnlocks: - FlatpackerMachineCircuitboard + technologyPrerequisites: + - EngineeringAdvancedMachines - type: technology id: EngineeringAdvancedMachines @@ -51,12 +53,14 @@ state: building discipline: EngineeringMachines tier: 1 - cost: 10000 + cost: 12000 recipeUnlocks: - AutolatheHyperConvectionMachineCircuitboard - ProtolatheHyperConvectionMachineCircuitboard - CircuitImprinterHyperConvectionMachineCircuitboard - SheetifierMachineCircuitboard + technologyPrerequisites: + - PowerGenerationMachines - type: technology id: AtmosphericMachines diff --git a/Resources/Prototypes/_CorvaxNext/Research/machines_robotics.yml b/Resources/Prototypes/_CorvaxNext/Research/machines_robotics.yml index e2ae63c68ed..2fbe37b5584 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/machines_robotics.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/machines_robotics.yml @@ -6,8 +6,8 @@ state: fab-idle discipline: RoboticsMachines tier: 1 - cost: 5000 + cost: 5500 recipeUnlocks: - - ExosuitFabricatorMachineCircuitboard + - ExosuitFabricatorMachineCircuitboard technologyPrerequisites: - Robotics diff --git a/Resources/Prototypes/_CorvaxNext/Research/machines_scientific.yml b/Resources/Prototypes/_CorvaxNext/Research/machines_scientific.yml index a79754a5e01..f08251ac386 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/machines_scientific.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/machines_scientific.yml @@ -66,3 +66,5 @@ cost: 5000 recipeUnlocks: - ArtifactCrusherMachineCircuitboard + technologyPrerequisites: + - AnomalyResearchAdvancedMachines diff --git a/Resources/Prototypes/_CorvaxNext/Research/machines_shaft.yml b/Resources/Prototypes/_CorvaxNext/Research/machines_shaft.yml index e9dd573a496..a98bbce7ef4 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/machines_shaft.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/machines_shaft.yml @@ -6,7 +6,7 @@ state: ptk-800 discipline: SalvageWeaponsMachines tier: 1 - cost: 5000 + cost: 7000 recipeUnlocks: - ShuttleGunKineticCircuitboard technologyPrerequisites: @@ -20,9 +20,10 @@ state: inserting discipline: SalvageEquipmentMachines tier: 1 - cost: 5000 + cost: 5200 recipeUnlocks: - OreProcessorIndustrialMachineCircuitboard + - SalvageExpeditionsComputerCircuitBoard # Corvax-Cringe technologyPrerequisites: - SalvageEquipment @@ -34,7 +35,7 @@ state: icon discipline: SpaceScanningMachines tier: 1 - cost: 5000 + cost: 3500 recipeUnlocks: - RadarConsoleCircuitboard technologyPrerequisites: diff --git a/Resources/Prototypes/_CorvaxNext/Research/machines_shuttle.yml b/Resources/Prototypes/_CorvaxNext/Research/machines_shuttle.yml index 5197b7a8318..682ef3f79d8 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/machines_shuttle.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/machines_shuttle.yml @@ -1,44 +1,39 @@ - type: technology - id: ShuttleWeapon - name: next-research-technology-shuttle-weapon + id: ShuttleWeaponMachines + name: next-research-technology-shuttle-weapon-machines icon: - sprite: Structures/Power/cage_recharger.rsi - state: full + sprite: Objects/Weapons/Guns/Shuttles/launcher.rsi + state: exp-320g discipline: ShuttleWeapon tier: 1 - cost: 10500 + cost: 7500 recipeUnlocks: - - PowerCageRechargerCircuitboard - - PowerCageSmall - - PowerCageMedium - - MagazineGrenadeEmpty - - GrenadeFlash - - GrenadeBlast - - ShuttleGunSvalinnMachineGunCircuitboard - - ShuttleGunPerforatorCircuitboard - - ShuttleGunFriendshipCircuitboard + - PowerCageRechargerCircuitboard + - ShuttleGunSvalinnMachineGunCircuitboard + - ShuttleGunPerforatorCircuitboard + - ShuttleGunFriendshipCircuitboard technologyPrerequisites: - SalvageWeapons + - ShuttleWeapon - type: technology - id: ShuttleWeaponAdvanced - name: next-research-technology-shuttle-weapon-advanced + id: ShuttleWeaponAdvancedMachines + name: next-research-technology-shuttle-weapon-advanced-machines icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi - state: icon + sprite: Objects/Weapons/Guns/Shuttles/launcher.rsi + state: exp-2100g discipline: ShuttleWeapon tier: 1 - cost: 15000 + cost: 9500 recipeUnlocks: - - GrenadeEMP - - PowerCageHigh - - ShuttleGunDusterCircuitboard + - ShuttleGunDusterCircuitboard technologyPrerequisites: - - ShuttleWeapon + - ShuttleWeaponMachines + - ShuttleWeaponAdvanced - type: technology - id: Shuttlecraft - name: next-research-technology-shuttlecraft + id: ShuttlecraftMachines + name: next-research-technology-shuttlecraft-machines icon: sprite: Structures/Shuttles/gyroscope.rsi state: base @@ -46,7 +41,10 @@ tier: 1 cost: 10000 recipeUnlocks: - - ShuttleConsoleCircuitboard - - ThrusterMachineCircuitboard - - GyroscopeMachineCircuitboard - - MiniGravityGeneratorCircuitboard + - ShuttleConsoleCircuitboard + - ThrusterMachineCircuitboard + - GyroscopeMachineCircuitboard + - MiniGravityGeneratorCircuitboard + technologyPrerequisites: + - PowerGenerationMachines + - PowerGenerationMachines diff --git a/Resources/Prototypes/_CorvaxNext/Research/machines_telecommunications.yml b/Resources/Prototypes/_CorvaxNext/Research/machines_telecommunications.yml index a5011c8cf43..94070f085f2 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/machines_telecommunications.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/machines_telecommunications.yml @@ -8,10 +8,10 @@ tier: 1 cost: 5000 recipeUnlocks: - - SurveillanceCameraRouterCircuitboard - - SurveillanceCameraWirelessRouterCircuitboard - - SurveillanceWirelessCameraMovableCircuitboard - - SurveillanceWirelessCameraAnchoredCircuitboard - - SurveillanceCameraMonitorCircuitboard - - SurveillanceWirelessCameraMonitorCircuitboard - - TelecomServerCircuitboard + - SurveillanceCameraRouterCircuitboard + - SurveillanceCameraWirelessRouterCircuitboard + - SurveillanceWirelessCameraMovableCircuitboard + - SurveillanceWirelessCameraAnchoredCircuitboard + - SurveillanceCameraMonitorCircuitboard + - SurveillanceWirelessCameraMonitorCircuitboard + - TelecomServerCircuitboard diff --git a/Resources/Prototypes/_CorvaxNext/Research/medical.yml b/Resources/Prototypes/_CorvaxNext/Research/medical.yml index 7320b4b1147..11022f9e610 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/medical.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/medical.yml @@ -6,9 +6,9 @@ state: scanner discipline: CrewMonitoring tier: 1 - cost: 10000 + cost: 18000 recipeUnlocks: - - HandheldCrewMonitor + - HandheldCrewMonitor - type: technology id: BiochemicalStasis @@ -20,8 +20,8 @@ tier: 1 cost: 7500 recipeUnlocks: - - CryostasisBeaker - - SyringeCryostasis + - CryostasisBeaker + - SyringeCryostasis - type: technology id: BodyBags @@ -33,9 +33,9 @@ tier: 1 cost: 5000 recipeUnlocks: - - NTBodyBag - - PrisonerBodyBag - - RadiationBodyBag + - NTBodyBag + - PrisonerBodyBag + - RadiationBodyBag - type: technology id: BodyBagsBluespace @@ -45,9 +45,9 @@ state: bluespacebag_folded discipline: BodyBags tier: 1 - cost: 8000 + cost: 9500 recipeUnlocks: - - BluespaceBodyBag + - BluespaceBodyBag technologyPrerequisites: - BodyBags @@ -59,7 +59,7 @@ state: beakerbluespace discipline: Chemistry tier: 1 # CORVAX NEXT TODO: BASE CHEMISTRY - cost: 10000 + cost: 12000 recipeUnlocks: - - BluespaceBeaker - - SyringeBluespace + - BluespaceBeaker + - SyringeBluespace diff --git a/Resources/Prototypes/_CorvaxNext/Research/robotics.yml b/Resources/Prototypes/_CorvaxNext/Research/robotics.yml index 57e80d6fc1b..6e4a0adf3a2 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/robotics.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/robotics.yml @@ -8,7 +8,8 @@ tier: 1 cost: 5000 recipeUnlocks: - - ProximitySensor + - ProximitySensor +# - PersonalAI # TODO: Add - type: technology id: CritterMech @@ -20,15 +21,15 @@ tier: 1 cost: 7500 recipeUnlocks: - - HamtrHarness - - HamtrLArm - - HamtrRArm - - HamtrLLeg - - HamtrRLeg - - HamtrCentralElectronics - - HamtrPeripheralsElectronics - - MechEquipmentGrabberSmall - - VimHarness + - HamtrHarness + - HamtrLArm + - HamtrRArm + - HamtrLLeg + - HamtrRLeg + - HamtrCentralElectronics + - HamtrPeripheralsElectronics + - MechEquipmentGrabberSmall + - VimHarness technologyPrerequisites: - Robotics @@ -42,15 +43,15 @@ tier: 1 cost: 7500 recipeUnlocks: - - HonkerHarness - - HonkerLArm - - HonkerRArm - - HonkerLLeg - - HonkerRLeg - - HonkerCentralElectronics - - HonkerPeripheralsElectronics - - HonkerTargetingElectronics - - MechEquipmentHorn + - HonkerHarness + - HonkerLArm + - HonkerRArm + - HonkerLLeg + - HonkerRLeg + - HonkerCentralElectronics + - HonkerPeripheralsElectronics + - HonkerTargetingElectronics + - MechEquipmentHorn technologyPrerequisites: - Robotics @@ -64,14 +65,14 @@ tier: 1 cost: 7500 recipeUnlocks: - - RipleyHarness - - RipleyLArm - - RipleyRArm - - RipleyLLeg - - RipleyRLeg - - RipleyCentralElectronics - - RipleyPeripheralsElectronics - - MechEquipmentGrabber + - RipleyHarness + - RipleyLArm + - RipleyRArm + - RipleyLLeg + - RipleyRLeg + - RipleyCentralElectronics + - RipleyPeripheralsElectronics + - MechEquipmentGrabber technologyPrerequisites: - Robotics @@ -85,8 +86,8 @@ tier: 1 cost: 8000 recipeUnlocks: - - BorgModuleAdvancedTreatment - - BorgModuleDefibrillator + - BorgModuleAdvancedTreatment + - BorgModuleDefibrillator technologyPrerequisites: - Robotics @@ -100,7 +101,7 @@ tier: 1 cost: 8000 recipeUnlocks: - - BorgModuleGrapplingGun + - BorgModuleGrapplingGun technologyPrerequisites: - Robotics - Grappling @@ -115,7 +116,7 @@ tier: 1 cost: 7500 recipeUnlocks: - - BorgModuleGPS + - BorgModuleGPS technologyPrerequisites: - Robotics - SpaceScanning @@ -130,8 +131,8 @@ tier: 1 cost: 10000 recipeUnlocks: - - BorgModuleAdvancedTool - - BorgModuleRCD + - BorgModuleAdvancedTool + - BorgModuleRCD technologyPrerequisites: - Robotics - EngineeringAdvancedTools @@ -146,8 +147,8 @@ tier: 1 cost: 5000 recipeUnlocks: - - BorgModuleGardening - - BorgModuleHarvesting + - BorgModuleGardening + - BorgModuleHarvesting technologyPrerequisites: - Robotics @@ -161,8 +162,8 @@ tier: 1 cost: 7500 recipeUnlocks: - - BorgModuleMusique - - BorgModuleClowning + - BorgModuleMusique + - BorgModuleClowning technologyPrerequisites: - Robotics - EntertainmentAdvanced @@ -177,8 +178,8 @@ tier: 1 cost: 10000 recipeUnlocks: - - BorgModuleMining - - MechEquipmentDrill + - BorgModuleMining + - MechEquipmentDrill technologyPrerequisites: - Robotics - SalvageEquipment @@ -193,8 +194,8 @@ tier: 1 cost: 5000 recipeUnlocks: - - BorgModuleLightReplacer - - BorgModuleAdvancedCleaning + - BorgModuleLightReplacer + - BorgModuleAdvancedCleaning technologyPrerequisites: - Robotics @@ -208,8 +209,8 @@ tier: 1 cost: 5000 recipeUnlocks: - - BorgModuleArtifact - - BorgModuleAnomaly + - BorgModuleArtifact + - BorgModuleAnomaly technologyPrerequisites: - Robotics - XenoArcheologyMachines diff --git a/Resources/Prototypes/_CorvaxNext/Research/scientific.yml b/Resources/Prototypes/_CorvaxNext/Research/scientific.yml index d9364d767e5..67a4235f364 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/scientific.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/scientific.yml @@ -8,8 +8,22 @@ tier: 1 cost: 15000 recipeUnlocks: - - WeaponForceGun - - WeaponTetherGun + - WeaponForceGun + - WeaponTetherGun + technologyPrerequisites: + - AnomalousResearchAdvanced + +- type: technology + id: AnomalyCoreHarnessing + name: next-research-technology-anomaly-harnessing + icon: + sprite: Objects/Weapons/Melee/gorilla.rsi + state: icon + discipline: AnomalyCoreHarnessing + tier: 1 + cost: 10000 + recipeUnlocks: + - WeaponGauntletGorilla technologyPrerequisites: - AnomalousResearchAdvanced @@ -23,7 +37,7 @@ tier: 1 cost: 10000 recipeUnlocks: - - DeviceQuantumSpinInverter + - DeviceQuantumSpinInverter technologyPrerequisites: - GravityManipulation @@ -35,11 +49,11 @@ state: holding discipline: BluespaceStorage tier: 1 - cost: 18000 + cost: 22000 recipeUnlocks: - - ClothingBackpackHolding - - ClothingBackpackSatchelHolding - - ClothingBackpackDuffelHolding + - ClothingBackpackHolding + - ClothingBackpackSatchelHolding + - ClothingBackpackDuffelHolding technologyPrerequisites: - QuantumLeaping - PortableFission @@ -56,9 +70,9 @@ tier: 1 cost: 5000 recipeUnlocks: - - AnomalyScanner - - AnomalyLocator - - NodeScanner + - AnomalyScanner + - AnomalyLocator + - NodeScanner - type: technology id: AnomalousResearchAdvanced @@ -70,7 +84,7 @@ tier: 1 cost: 8000 recipeUnlocks: - - AnomalyLocatorWide - - WeaponPistolCHIMP + - AnomalyLocatorWide + - WeaponPistolCHIMP technologyPrerequisites: - AnomalousResearch diff --git a/Resources/Prototypes/_CorvaxNext/Research/security.yml b/Resources/Prototypes/_CorvaxNext/Research/security.yml index 200ab497123..0be460631e6 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/security.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/security.yml @@ -6,12 +6,10 @@ state: base discipline: RiotControl tier: 1 - cost: 7500 + cost: 5500 recipeUnlocks: - - WeaponDisabler - - HoloprojectorField - - MagazineShotgunBeanbag - - BoxBeanbag + - WeaponDisabler + - HoloprojectorField - type: technology id: RiotControlAdvanced @@ -23,11 +21,11 @@ tier: 1 cost: 8000 recipeUnlocks: - - Truncheon - - TelescopicShield - - HoloprojectorSecurity - - BoxShellTranquilizer - - WeaponDisablerSMG + - Truncheon + - TelescopicShield + - HoloprojectorSecurity + - WeaponDisablerSMG + - PortableRecharger technologyPrerequisites: - RiotControl @@ -39,9 +37,9 @@ state: icon discipline: WarCrimes tier: 1 - cost: 5000 + cost: 7000 recipeUnlocks: - - ClothingBackpackElectropack - - WeaponParticleDecelerator + - ClothingBackpackElectropack + - WeaponParticleDecelerator technologyPrerequisites: - RiotControlAdvanced diff --git a/Resources/Prototypes/_CorvaxNext/Research/service.yml b/Resources/Prototypes/_CorvaxNext/Research/service.yml index af4c9274022..5a1e987007a 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/service.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/service.yml @@ -8,7 +8,7 @@ tier: 1 cost: 3500 recipeUnlocks: - - SynthesizerInstrument + - SynthesizerInstrument - type: technology id: FauxAstroTiles @@ -20,11 +20,11 @@ tier: 1 cost: 5000 recipeUnlocks: - - FauxTileAstroGrass - - FauxTileMowedAstroGrass - - FauxTileJungleAstroGrass - - FauxTileAstroIce - - FauxTileAstroSnow + - FauxTileAstroGrass + - FauxTileMowedAstroGrass + - FauxTileJungleAstroGrass + - FauxTileAstroIce + - FauxTileAstroSnow - type: technology id: CleaningAdvanced @@ -36,8 +36,8 @@ tier: 1 cost: 10000 recipeUnlocks: - - AdvMopItem - - MegaSprayBottle + - AdvMopItem + - MegaSprayBottle - type: technology id: SprayAdvanced @@ -49,8 +49,8 @@ tier: 1 cost: 10000 recipeUnlocks: - - WeaponSprayNozzle - - ClothingBackpackWaterTank + - WeaponSprayNozzle + - ClothingBackpackWaterTank technologyPrerequisites: - CleaningAdvanced @@ -64,7 +64,7 @@ # tier: 1 # cost: 10000 # recipeUnlocks: -# - BasicGalaticCommonTranslatorImplanter +# - BasicGalaticCommonTranslatorImplanter #- type: technology # id: TranslationImplanter @@ -76,7 +76,7 @@ # tier: 1 # cost: 7500 # recipeUnlocks: -# - BasicGalaticCommonTranslatorImplanter +# - BasicGalaticCommonTranslatorImplanter # technologyPrerequisites: # - TranslationDevice @@ -90,8 +90,8 @@ # tier: 1 # cost: 12000 # recipeUnlocks: -# - XenoTranslator -# - AnimalTranslator +# - XenoTranslator +# - AnimalTranslator # technologyPrerequisites: # - CleaningAdvanced @@ -105,14 +105,14 @@ # tier: 1 # cost: 15000 # recipeUnlocks: -# - MofficTranslatorImplanter -# - AdvancedGalaticCommonTranslatorImplanter -# - BubblishTranslatorImplanter -# - NekomimeticTranslatorImplanter -# - DraconicTranslatorImplanter -# - CanilunztTranslatorImplanter -# - SolCommonTranslatorImplanter -# - RootSpeakTranslatorImplanter +# - MofficTranslatorImplanter +# - AdvancedGalaticCommonTranslatorImplanter +# - BubblishTranslatorImplanter +# - NekomimeticTranslatorImplanter +# - DraconicTranslatorImplanter +# - CanilunztTranslatorImplanter +# - SolCommonTranslatorImplanter +# - RootSpeakTranslatorImplanter # technologyPrerequisites: # - TranslationDevice # - TranslationImplanter diff --git a/Resources/Prototypes/_CorvaxNext/Research/shaft.yml b/Resources/Prototypes/_CorvaxNext/Research/shaft.yml index 42536282cbb..4e9c36f9b39 100644 --- a/Resources/Prototypes/_CorvaxNext/Research/shaft.yml +++ b/Resources/Prototypes/_CorvaxNext/Research/shaft.yml @@ -8,7 +8,7 @@ tier: 1 cost: 3500 recipeUnlocks: - - WeaponProtoKineticAccelerator + - WeaponProtoKineticAccelerator - type: technology id: SalvageEquipment @@ -20,10 +20,10 @@ tier: 1 cost: 7500 recipeUnlocks: -# - WeaponPlasmaCutter - - MiningDrill - - MineralScannerEmpty - - ClothingMaskWeldingGas +# - WeaponPlasmaCutter + - MiningDrill + - MineralScannerEmpty + - ClothingMaskWeldingGas - type: technology id: SalvageEquipmentAdvanced @@ -35,10 +35,10 @@ tier: 1 cost: 7500 recipeUnlocks: -# - WeaponPlasmaCutterAdvanced - - OreBagOfHolding - - AdvancedMineralScannerEmpty - - MiningDrillDiamond +# - WeaponPlasmaCutterAdvanced + - OreBagOfHolding + - AdvancedMineralScannerEmpty + - MiningDrillDiamond technologyPrerequisites: - SalvageEquipment @@ -52,7 +52,7 @@ tier: 1 cost: 5000 recipeUnlocks: - - WeaponGrapplingGun + - WeaponGrapplingGun technologyPrerequisites: - SalvageEquipment @@ -66,4 +66,4 @@ tier: 1 cost: 7500 recipeUnlocks: - - HandHeldMassScanner + - HandHeldMassScanner diff --git a/Resources/Prototypes/_CorvaxNext/Research/shuttle.yml b/Resources/Prototypes/_CorvaxNext/Research/shuttle.yml new file mode 100644 index 00000000000..e44222c2e4d --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Research/shuttle.yml @@ -0,0 +1,32 @@ +- type: technology + id: ShuttleWeapon + name: next-research-technology-shuttle-weapon + icon: + sprite: Objects/Power/power_cages.rsi + state: medium + discipline: ShuttleWeapon + tier: 1 + cost: 5000 + recipeUnlocks: + - PowerCageSmall + - PowerCageMedium + - MagazineGrenadeEmpty + - GrenadeFlash + - GrenadeBlast + technologyPrerequisites: + - SalvageWeapons + +- type: technology + id: ShuttleWeaponAdvanced + name: next-research-technology-shuttle-weapon-advanced + icon: + sprite: Objects/Power/power_cages.rsi + state: small + discipline: ShuttleWeapon + tier: 1 + cost: 6000 + recipeUnlocks: + - GrenadeEMP + - PowerCageHigh + technologyPrerequisites: + - ShuttleWeapon