clean up tools lathe recipes (#31521)

* clean up tools lathe recipes * add medical and cooking tools * add result * add result to others * review * engine --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-11-02 13:24:08 +00:00
parent 131e492e6f
commit 11f0dc420f
4 changed files with 120 additions and 172 deletions
--- a/Resources/Prototypes/Recipes/Lathes/botany.yml
+++ b/Resources/Prototypes/Recipes/Lathes/botany.yml
@@ -1,39 +1,39 @@
+# Base prototypes
+
 - type: latheRecipe
-  id: MiniHoe
-  result: HydroponicsToolMiniHoe
-  completetime: 2
+  abstract: true
+  parent: BaseToolRecipe
+  id: BaseHydroToolRecipe
  materials:
    Steel: 200
    Plastic: 100

+# Recipes
+
 - type: latheRecipe
+  parent: BaseHydroToolRecipe
+  id: HydroponicsToolMiniHoe
+  result: HydroponicsToolMiniHoe
+
+- type: latheRecipe
+  parent: BaseHydroToolRecipe
  id: HydroponicsToolScythe
  result: HydroponicsToolScythe
-  completetime: 2
  materials:
    Steel: 300
    Plastic: 200

 - type: latheRecipe
+  parent: BaseHydroToolRecipe
  id: HydroponicsToolHatchet
  result: HydroponicsToolHatchet
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 100

 - type: latheRecipe
-  id: Spade
+  parent: BaseHydroToolRecipe
+  id: HydroponicsToolSpade
  result: HydroponicsToolSpade
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 100
-    
+
 - type: latheRecipe
-  id: Clippers
+  parent: BaseHydroToolRecipe
+  id: HydroponicsToolClippers
  result: HydroponicsToolClippers
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 100
--- a/Resources/Prototypes/Recipes/Lathes/cooking.yml
+++ b/Resources/Prototypes/Recipes/Lathes/cooking.yml
@@ -1,67 +1,65 @@
 - type: latheRecipe
+  parent: BaseToolRecipe
  id: ButchCleaver
  result: ButchCleaver
-  completetime: 2
  materials:
    Steel: 300
    Plastic: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: KitchenKnife
  result: KitchenKnife
-  completetime: 2
  materials:
    Steel: 200
    Plastic: 50

 - type: latheRecipe
-  id: DrinkMug
-  result: DrinkMug
+  abstract: true
+  id: BaseGlasswareRecipe
  completetime: 0.8
  materials:
    Glass: 100

 - type: latheRecipe
+  parent: BaseGlasswareRecipe
+  id: DrinkMug
+  result: DrinkMug
+
+- type: latheRecipe
+  parent: DrinkMug
  id: DrinkMugMetal
  result: DrinkMugMetal
-  completetime: 0.8
  materials:
    Steel: 100

 - type: latheRecipe
+  parent: DrinkMug
  id: DrinkGlass
  result: DrinkGlass
-  completetime: 0.8
-  materials:
-    Glass: 100

 - type: latheRecipe
+  parent: DrinkMug
  id: DrinkShotGlass
  result: DrinkShotGlass
  completetime: 0.4
-  materials:
-    Glass: 100

 - type: latheRecipe
+  parent: DrinkMug
  id: DrinkGlassCoupeShaped
  result: DrinkGlassCoupeShaped
-  completetime: 0.8
-  materials:
-    Glass: 100

- type: latheRecipe 
-  id: CustomDrinkJug 
-  result: CustomDrinkJug 
-  completetime: 2 
-  materials: 
-    Plastic: 200
-    
 - type: latheRecipe
+  id: CustomDrinkJug
+  result: CustomDrinkJug
+  completetime: 2
+  materials:
+    Plastic: 200
+
+- type: latheRecipe
+  parent: BaseGlasswareRecipe
  id: FoodPlate
  result: FoodPlate
-  completetime: 0.8
-  materials:
-    Glass: 100

 - type: latheRecipe
  id: FoodPlateSmall
@@ -71,25 +69,23 @@
    Glass: 50

 - type: latheRecipe
+  parent: FoodPlate
  id: FoodPlatePlastic
  result: FoodPlatePlastic
-  completetime: 0.8
  materials:
    Plastic: 100

 - type: latheRecipe
+  parent: FoodPlateSmall
  id: FoodPlateSmallPlastic
  result: FoodPlateSmallPlastic
-  completetime: 0.4
  materials:
    Plastic: 50

 - type: latheRecipe
+  parent: FoodPlate
  id: FoodBowlBig
  result: FoodBowlBig
-  completetime: 0.8
-  materials:
-    Glass: 100

 - type: latheRecipe
  id: FoodPlateTin
@@ -99,9 +95,9 @@
    Steel: 100

 - type: latheRecipe
+  parent: FoodPlateTin
  id: FoodPlateMuffinTin
  result: FoodPlateMuffinTin
-  completetime: 0.4
  materials:
    Steel: 50

--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -1,51 +1,46 @@
+# Base prototypes
+
 - type: latheRecipe
+  abstract: true
+  parent: BaseToolRecipe
+  id: BaseSurgicalRecipe
+  materials:
+    Steel: 200
+
+# Recipes
+
+- type: latheRecipe
+  parent: BaseSurgicalRecipe
  id: Scalpel
  result: Scalpel
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200

 - type: latheRecipe
+  parent: BaseSurgicalRecipe
  id: Retractor
  result: Retractor
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200

 - type: latheRecipe
+  parent: BaseSurgicalRecipe
  id: Cautery
  result: Cautery
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Drill
  result: Drill
-  category: Tools
-  completetime: 2
  materials:
    Steel: 200
    Plastic: 100

 - type: latheRecipe
+  parent: BaseSurgicalRecipe
  id: Saw
  result: Saw
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200

 - type: latheRecipe
+  parent: BaseSurgicalRecipe
  id: Hemostat
  result: Hemostat
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200

 - type: latheRecipe
  id: BodyBag
@@ -140,66 +135,51 @@
    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitBurn
  result: MedkitBurn
  name: lathe-recipe-MedkitBurn-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitToxin
  result: MedkitToxin
  name: lathe-recipe-MedkitToxin-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitO2
  result: MedkitO2
  name: lathe-recipe-MedkitO2-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitBrute
  result: MedkitBrute
  name: lathe-recipe-MedkitBrute-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitAdvanced
  result: MedkitAdvanced
  name: lathe-recipe-MedkitAdvanced-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitRadiation
  result: MedkitRadiation
  name: lathe-recipe-MedkitRadiation-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitCombat
  result: MedkitCombat
  name: lathe-recipe-MedkitCombat-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: HandLabeler
  result: HandLabeler
-  category: Tools
-  completetime: 2
  materials:
    Plastic: 100

@@ -219,20 +199,14 @@
    Plastic: 300

 - type: latheRecipe
+  parent: RollerBedSpawnFolded
  id: CheapRollerBedSpawnFolded
  result: CheapRollerBedSpawnFolded
-  completetime: 1
-  materials:
-    Steel: 600
-    Plastic: 300

 - type: latheRecipe
+  parent: RollerBedSpawnFolded
  id: EmergencyRollerBedSpawnFolded
  result: EmergencyRollerBedSpawnFolded
-  completetime: 1
-  materials:
-    Steel: 600
-    Plastic: 300

 - type: latheRecipe
  id: WhiteCane
--- a/Resources/Prototypes/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -1,40 +1,51 @@
+# Base prototypes
+
 - type: latheRecipe
+  abstract: true
+  id: BaseToolRecipe
+  category: Tools
+  completetime: 2
+  materials:
+    Steel: 200
+    Plastic: 50
+
+- type: latheRecipe
+  abstract: true
+  parent: BaseToolRecipe
+  id: BaseBigToolRecipe
+  materials:
+    Steel: 800
+    Glass: 300
+
+# Recipes
+
+- type: latheRecipe
+  parent: BaseToolRecipe
  id: Wirecutter
+  result: Wirecutter
  icon:
    sprite: Objects/Tools/wirecutters.rsi
    state: cutters-map
-  result: Wirecutter
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Screwdriver
+  result: Screwdriver
  icon:
    sprite: Objects/Tools/screwdriver.rsi
    state: screwdriver-map
-  result: Screwdriver
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Welder
  result: Welder
-  category: Tools
-  completetime: 2
  materials:
    Steel: 400

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Wrench
  result: Wrench
-  category: Tools
-  completetime: 2
  materials:
    Steel: 200

@@ -42,155 +53,122 @@
  id: CableStack
  result: CableApcStack1
  category: Parts
-  completetime: 2
+  completetime: 0.1
  materials:
    Steel: 30

 - type: latheRecipe
+  parent: CableStack
  id: CableMVStack
  result: CableMVStack1
-  category: Parts
-  completetime: 2
-  materials:
-    Steel: 30

 - type: latheRecipe
+  parent: CableStack
  id: CableHVStack
  result: CableHVStack1
-  category: Parts
-  completetime: 2
-  materials:
-    Steel: 30

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: CrowbarGreen
  result: CrowbarGreen
-  category: Tools
-  completetime: 2
  materials:
    Steel: 200

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Pickaxe
  result: Pickaxe
-  category: Tools
  completetime: 4
  materials:
    Steel: 1000
    Wood: 500

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Shovel
  result: Shovel
-  category: Tools
-  completetime: 2
  materials:
    Steel: 200
    Wood: 100

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Multitool
  result: Multitool
-  category: Tools
-  completetime: 2
  materials:
    Steel: 200
    Plastic: 200

 - type: latheRecipe
+  parent: Multitool
  id: NetworkConfigurator
  result: NetworkConfigurator
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 200

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: PowerDrill
  result: PowerDrill
-  category: Tools
-  completetime: 2
  materials:
    Steel: 600
    Plastic: 200

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: RCD
  result: RCDEmpty
-  category: Tools
  completetime: 4
  materials:
    Steel: 1000
    Plastic: 300

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: RCDAmmo
  result: RCDAmmo
-  category: Tools
-  completetime: 2.4
  materials:
    Steel: 500
    Plastic: 250

 - type: latheRecipe
+  parent: BaseBigToolRecipe
  id: HandHeldMassScanner
  result: HandHeldMassScannerEmpty
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 800
-    Glass: 300

 - type: latheRecipe
+  parent: BaseBigToolRecipe
  id: HandheldGPSBasic
  result: HandheldGPSBasic
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 800
-    Glass: 300

 - type: latheRecipe
+  parent: BaseBigToolRecipe
  id: TRayScanner
  result: trayScanner
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 800
-    Glass: 300

 - type: latheRecipe
+  parent: BaseBigToolRecipe
  id: GasAnalyzer
  result: GasAnalyzer
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 800
-    Glass: 300

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: SprayPainter
  result: SprayPainter
-  category: Tools
-  completetime: 2
  materials:
    Steel: 300
    Plastic: 100

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: UtilityBelt
  result: ClothingBeltUtility
-  category: Tools
-  completetime: 2
  materials:
    Cloth: 100
    Steel: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: HolofanProjector
  result: HolofanProjectorEmpty
-  category: Tools
  completetime: 8
  materials:
    Steel: 300
@@ -198,18 +176,18 @@
    Plastic: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: WelderExperimental
  result: WelderExperimental
-  category: Tools
  completetime: 6
  materials:
    Steel: 800
    Plasma: 200

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: JawsOfLife
  result: JawsOfLife
-  category: Tools
  completetime: 6
  materials:
    Steel: 1000
@@ -218,9 +196,9 @@
    Gold: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: HoloprojectorField
  result: HoloprojectorFieldEmpty
-  category: Tools
  completetime: 3
  materials:
    Steel: 500
@@ -228,9 +206,9 @@
    Glass: 100

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: WeaponParticleDecelerator
  result: WeaponParticleDecelerator
-  category: Tools
  completetime: 6
  materials:
    Steel: 750