Cleanup exosuit fab recipes, add modules category (#38069)

diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl
index 0127c10e9cbaddc5596e89aba3951b093c2b1e39..f36bbe1ae7f565fbe33259db15ab3bc37be4e85e 100644 (file)
--- a/Resources/Locale/en-US/lathe/lathe-categories.ftl
+++ b/Resources/Locale/en-US/lathe/lathe-categories.ftl
@@ -4,7 +4,6 @@ lathe-category-clothing = Clothing
 lathe-category-lights = Lights
 lathe-category-machines = Machines
 lathe-category-parts = Parts
-lathe-category-robotics = Robotics
 lathe-category-tiles = Tiles
 lathe-category-tools = Tools
 lathe-category-weapons = Weapons
@@ -34,6 +33,8 @@ lathe-category-wood = Wood
 
 # Science
 lathe-category-mechs = Mechs
+lathe-category-modules = Modules
+lathe-category-robotics = Robotics
 
 # Security TechFab
 lathe-category-ammo = Ammo

diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml
index a6439f9505c090bb23a38457b9289915680cb07e..44ab5dbe1bc1cd9baaf03b809b8b8ab9eb38cf1d 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/categories.yml
+++ b/Resources/Prototypes/Recipes/Lathes/categories.yml
@@ -19,10 +19,6 @@
   id: Parts
   name: lathe-category-parts
 
-- type: latheCategory
-  id: Robotics
-  name: lathe-category-robotics
-
 - type: latheCategory
   id: Tiles
   name: lathe-category-tiles
@@ -111,6 +107,14 @@
   id: Mech
   name: lathe-category-mechs
 
+- type: latheCategory
+  id: Modules
+  name: lathe-category-modules
+
+- type: latheCategory
+  id: Robotics
+  name: lathe-category-robotics
+
 # Security TechFab
 - type: latheCategory
   id: Ammo

diff --git a/Resources/Prototypes/Recipes/Lathes/mech_equipment.yml b/Resources/Prototypes/Recipes/Lathes/mech_equipment.yml
new file mode 100644 (file)
index 0000000..200e162
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/mech_equipment.yml
@@ -0,0 +1,35 @@
+# Base prototypes
+
+- type: latheRecipe
+  abstract: true
+  id: BaseMechEquipmentRecipe
+  categories:
+  - Mech
+  - Parts
+  completetime: 10
+  materials:
+    Steel: 500
+    Plastic: 200
+
+## Recipes
+
+- type: latheRecipe
+  parent: BaseMechEquipmentRecipe
+  id: MechEquipmentGrabber
+  result: MechEquipmentGrabber
+
+- type: latheRecipe
+  parent: BaseMechEquipmentRecipe
+  id: MechEquipmentGrabberSmall
+  result: MechEquipmentGrabberSmall
+  materials:
+    Steel: 400
+    Plastic: 100
+
+- type: latheRecipe
+  parent: BaseMechEquipmentRecipe
+  id: MechEquipmentHorn
+  result: MechEquipmentHorn
+  materials:
+    Steel: 500
+    Bananium: 200

diff --git a/Resources/Prototypes/Recipes/Lathes/mech_parts.yml b/Resources/Prototypes/Recipes/Lathes/mech_parts.yml
index 52d68e7c391bc5ef6d792c9e47d2040bdb454eaf..f6e09881e48fcf58e713da14e1c4564808b64f3b 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/mech_parts.yml
+++ b/Resources/Prototypes/Recipes/Lathes/mech_parts.yml
@@ -7,7 +7,32 @@
   - Mech
   completetime: 10
 
-# Recipes
+- type: latheRecipe
+  abstract: true
+  parent: BaseMechPartRecipe
+  id: BaseRipleyLimbRecipe
+  materials:
+    Steel: 1000
+    Glass: 750
+
+- type: latheRecipe
+  abstract: true
+  parent: BaseMechPartRecipe
+  id: BaseHonkerLimbRecipe
+  materials:
+    Steel: 2000
+    Glass: 750
+    Bananium: 250
+
+- type: latheRecipe
+  abstract: true
+  parent: BaseMechPartRecipe
+  id: BaseHamtrLimbRecipe
+  materials:
+    Steel: 800
+    Glass: 600
+
+## Recipes
 
 # Ripley
 - type: latheRecipe
@@ -19,36 +44,25 @@
     Glass: 1200
 
 - type: latheRecipe
-  parent: BaseMechPartRecipe
+  parent: BaseRipleyLimbRecipe
   id: RipleyLArm
   result: RipleyLArm
-  materials:
-    Steel: 1000
-    Glass: 750
 
 - type: latheRecipe
-  parent: RipleyLArm
+  parent: BaseRipleyLimbRecipe
   id: RipleyLLeg
   result: RipleyLLeg
 
 - type: latheRecipe
-  parent: RipleyLLeg
+  parent: BaseRipleyLimbRecipe
   id: RipleyRLeg
   result: RipleyRLeg
 
 - type: latheRecipe
-  parent: RipleyLArm
+  parent: BaseRipleyLimbRecipe
   id: RipleyRArm
   result: RipleyRArm
 
-- type: latheRecipe
-  parent: BaseMechPartRecipe
-  id: MechEquipmentGrabber
-  result: MechEquipmentGrabber
-  materials:
-    Steel: 500
-    Plastic: 200
-
 # H.O.N.K.
 - type: latheRecipe
   parent: BaseMechPartRecipe
@@ -60,37 +74,25 @@
     Bananium: 500
 
 - type: latheRecipe
-  parent: BaseMechPartRecipe
+  parent: BaseHonkerLimbRecipe
   id: HonkerLArm
   result: HonkerLArm
-  materials:
-    Steel: 2000
-    Glass: 750
-    Bananium: 250
 
 - type: latheRecipe
-  parent: HonkerLArm
+  parent: BaseHonkerLimbRecipe
   id: HonkerLLeg
   result: HonkerLLeg
 
 - type: latheRecipe
-  parent: HonkerLLeg
+  parent: BaseHonkerLimbRecipe
   id: HonkerRLeg
   result: HonkerRLeg
 
 - type: latheRecipe
-  parent: HonkerLArm
+  parent: BaseHonkerLimbRecipe
   id: HonkerRArm
   result: HonkerRArm
 
-- type: latheRecipe
-  parent: BaseMechPartRecipe
-  id: MechEquipmentHorn
-  result: MechEquipmentHorn
-  materials:
-    Steel: 500
-    Bananium: 200
-
 # HAMTR
 - type: latheRecipe
   parent: BaseMechPartRecipe
@@ -101,36 +103,25 @@
     Glass: 1000
 
 - type: latheRecipe
-  parent: BaseMechPartRecipe
+  parent: BaseHamtrLimbRecipe
   id: HamtrLArm
   result: HamtrLArm
-  materials:
-    Steel: 800
-    Glass: 600
 
 - type: latheRecipe
-  parent: HamtrLArm
+  parent: BaseHamtrLimbRecipe
   id: HamtrLLeg
   result: HamtrLLeg
 
 - type: latheRecipe
-  parent: HamtrLLeg
+  parent: BaseHamtrLimbRecipe
   id: HamtrRLeg
   result: HamtrRLeg
 
 - type: latheRecipe
-  parent: HamtrLArm
+  parent: BaseHamtrLimbRecipe
   id: HamtrRArm
   result: HamtrRArm
 
-- type: latheRecipe
-  parent: BaseMechPartRecipe
-  id: MechEquipmentGrabberSmall
-  result: MechEquipmentGrabberSmall
-  materials:
-    Steel: 400
-    Plastic: 100
-
 # Vim
 - type: latheRecipe
   parent: BaseMechPartRecipe

diff --git a/Resources/Prototypes/Recipes/Lathes/powercells.yml b/Resources/Prototypes/Recipes/Lathes/powercells.yml
index 9f800f397dd24593b6bbcc74ec65df04af3a0f84..1163e746cfc65634c45571079277ea65368d2243 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/powercells.yml
+++ b/Resources/Prototypes/Recipes/Lathes/powercells.yml
@@ -1,18 +1,27 @@
+# Base prototypes
+
 - type: latheRecipe
-  id: PowerCellSmall
-  result: PowerCellSmallPrinted
+  abstract: true
+  id: BasePowerCellRecipe
   categories:
   - Parts
+
+## Recipes
+
+# Power cells
+- type: latheRecipe
+  parent: BasePowerCellRecipe
+  id: PowerCellSmall
+  result: PowerCellSmallPrinted
   completetime: 1
   materials:
     Steel: 100
     Plastic: 50
 
 - type: latheRecipe
+  parent: BasePowerCellRecipe
   id: PowerCellMedium
   result: PowerCellMediumPrinted
-  categories:
-  - Parts
   completetime: 6
   materials:
     Steel: 300
@@ -21,10 +30,9 @@
     Gold: 10
 
 - type: latheRecipe
+  parent: BasePowerCellRecipe
   id: PowerCellHigh
   result: PowerCellHighPrinted
-  categories:
-  - Parts
   completetime: 10
   materials:
     Steel: 300
@@ -33,10 +41,9 @@
     Gold: 50
 
 - type: latheRecipe
+  parent: BasePowerCellRecipe
   id: PowerCellHyper
   result: PowerCellHyperPrinted
-  categories:
-  - Parts
   completetime: 10
   materials:
     Steel: 800
@@ -46,10 +53,9 @@
     Silver: 300
 
 - type: latheRecipe
+  parent: BasePowerCellRecipe
   id: PowerCellMicroreactor
   result: PowerCellMicroreactorPrinted
-  categories:
-  - Parts
   completetime: 10
   materials:
     Steel: 500
@@ -57,7 +63,9 @@
     Uranium: 200
     Gold: 100
 
+# Power cages
 - type: latheRecipe
+  parent: BasePowerCellRecipe
   id: PowerCageSmall
   result: PowerCageSmall
   completetime: 3
@@ -66,6 +74,7 @@
     Plastic: 100
 
 - type: latheRecipe
+  parent: BasePowerCellRecipe
   id: PowerCageMedium
   result: PowerCageMedium
   completetime: 6
@@ -76,6 +85,7 @@
     Gold: 40
 
 - type: latheRecipe
+  parent: BasePowerCellRecipe
   id: PowerCageHigh
   result: PowerCageHigh
   completetime: 10

diff --git a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
new file mode 100644 (file)
index 0000000..d7d112b
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
@@ -0,0 +1,70 @@
+- type: latheRecipe
+  abstract: true
+  id: BaseBorgModuleRecipe
+  categories:
+    - Modules
+  completetime: 3
+  materials:
+    Steel: 250
+    Glass: 250
+    Plastic: 250
+
+- type: latheRecipe
+  abstract: true
+  parent: BaseBorgModuleRecipe
+  id: BaseGoldBorgModuleRecipe
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Gold: 50
+
+## Recipes
+
+# Generic
+- type: latheRecipe
+  parent: BaseBorgModuleRecipe
+  id: BorgModuleTool
+  result: BorgModuleTool
+
+- type: latheRecipe
+  parent: BaseBorgModuleRecipe
+  id: BorgModuleCable
+  result: BorgModuleCable
+
+- type: latheRecipe
+  parent: BaseBorgModuleRecipe
+  id: BorgModuleFireExtinguisher
+  result: BorgModuleFireExtinguisher
+
+# Cargo Modules
+
+- type: latheRecipe
+  parent: BaseGoldBorgModuleRecipe
+  id: BorgModuleAdvancedMining
+  result: BorgModuleAdvancedMining
+
+# Engineering Modules
+
+- type: latheRecipe
+  parent: BaseGoldBorgModuleRecipe
+  id: BorgModuleAdvancedTool
+  result: BorgModuleAdvancedTool
+
+# Janitor Modules
+
+- type: latheRecipe
+  parent: BaseGoldBorgModuleRecipe
+  id: BorgModuleAdvancedCleaning
+  result: BorgModuleAdvancedCleaning
+
+# Medical Modules
+
+- type: latheRecipe
+  parent: BaseGoldBorgModuleRecipe
+  id: BorgModuleAdvancedChemical
+  result: BorgModuleAdvancedChemical
+
+# Science Modules
+
+# Service Modules

diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robot_parts.yml
similarity index 53%
rename from Resources/Prototypes/Recipes/Lathes/robotics.yml
rename to Resources/Prototypes/Recipes/Lathes/robot_parts.yml
index 3ad2da85969d464d9d95a36a7a98acfcea12a1b7..37f602b2e8201031a12161b9e8b6df6089b1d7b2 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robot_parts.yml
@@ -5,40 +5,29 @@
   id: BaseRoboticsRecipe
   categories:
   - Robotics
-  completetime: 2
+  completetime: 3
 
 - type: latheRecipe
   abstract: true
   parent: BaseRoboticsRecipe
   id: BaseBorgLimbRecipe
+  completetime: 2
   materials:
     Steel: 250
     Glass: 100
 
 - type: latheRecipe
   abstract: true
-  parent: BaseRoboticsRecipe
-  id: BaseBorgModuleRecipe
-  completetime: 3
-  materials:
-    Steel: 250
-    Glass: 250
-    Plastic: 250
-
-- type: latheRecipe
-  abstract: true
-  parent: BaseBorgModuleRecipe
-  id: BaseGoldBorgModuleRecipe
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 250
-    Gold: 50
+  id: BaseRoboticsPartRecipe
+  categories:
+  - Parts
+  completetime: 2
 
-# Recipes
+## Recipes
 
+# Parts
 - type: latheRecipe
-  parent: BaseRoboticsRecipe
+  parent: BaseRoboticsPartRecipe
   id: ProximitySensor
   result: ProximitySensor
   materials:
@@ -46,7 +35,7 @@
     Glass: 300
 
 - type: latheRecipe
-  parent: BaseRoboticsRecipe
+  parent: BaseRoboticsPartRecipe
   id: SciFlash
   result: SciFlash
   materials:
@@ -54,11 +43,11 @@
     Plastic: 200
     Steel: 100
 
+# Cyborg body
 - type: latheRecipe
   parent: BaseRoboticsRecipe
   id: CyborgEndoskeleton
   result: CyborgEndoskeleton
-  completetime: 3
   materials:
     Steel: 1500
 
@@ -92,13 +81,11 @@
   id: TorsoBorg
   result: TorsoBorg
 
-# Parts
-
+# Brains
 - type: latheRecipe
   parent: BaseRoboticsRecipe
   id: MMI
   result: MMI
-  completetime: 3
   icon:
     sprite: Objects/Specific/Robotics/mmi.rsi
     state: mmi_off
@@ -112,59 +99,9 @@
   parent: BaseRoboticsRecipe
   id: PositronicBrain
   result: PositronicBrain
-  completetime: 3
   materials:
     Steel: 500
     Plastic: 500
     Gold: 100
     Silver: 100
     Plasma: 1000
-
-# Modules
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleTool
-  result: BorgModuleTool
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleCable
-  result: BorgModuleCable
-
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleFireExtinguisher
-  result: BorgModuleFireExtinguisher
-
-# Cargo Modules
-
-- type: latheRecipe
-  parent: BaseGoldBorgModuleRecipe
-  id: BorgModuleAdvancedMining
-  result: BorgModuleAdvancedMining
-
-# Engineering Modules
-
-- type: latheRecipe
-  parent: BaseGoldBorgModuleRecipe
-  id: BorgModuleAdvancedTool
-  result: BorgModuleAdvancedTool
-
-# Janitor Modules
-
-- type: latheRecipe
-  parent: BaseGoldBorgModuleRecipe
-  id: BorgModuleAdvancedCleaning
-  result: BorgModuleAdvancedCleaning
-
-# Medical Modules
-
-- type: latheRecipe
-  parent: BaseGoldBorgModuleRecipe
-  id: BorgModuleAdvancedChemical
-  result: BorgModuleAdvancedChemical
-
-# Science Modules (if we add a advanced sci module that requires crafting)
-
-# Service Modules