Add filters to cutter machine (#34321)

* tiles

* lint

* categories

* blank line

* small base recipe change

* indent

* reorginize

diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl
index fde710bd78ff2133c2b86aa4b11f1e9461af8f17..0127c10e9cbaddc5596e89aba3951b093c2b1e39 100644 (file)
--- a/Resources/Locale/en-US/lathe/lathe-categories.ftl
+++ b/Resources/Locale/en-US/lathe/lathe-categories.ftl
@@ -5,6 +5,7 @@ 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
 
@@ -23,10 +24,18 @@ lathe-category-security = Security
 lathe-category-service = Service
 lathe-category-supply = Supply
 
+# Cutter
+lathe-category-concrete = Concrete
+lathe-category-dark = Dark
+lathe-category-maints = Maints
+lathe-category-steel = Steel
+lathe-category-white = White
+lathe-category-wood = Wood
+
 # Science
 lathe-category-mechs = Mechs
 
-# Sec
+# Security TechFab
 lathe-category-ammo = Ammo
 lathe-category-boxes = Boxes
 lathe-category-magazines = Magazines

diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml
index 7becbb58e4603dc251b17060d73131f6a28ea39a..a6439f9505c090bb23a38457b9289915680cb07e 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/categories.yml
+++ b/Resources/Prototypes/Recipes/Lathes/categories.yml
@@ -23,6 +23,10 @@
   id: Robotics
   name: lathe-category-robotics
 
+- type: latheCategory
+  id: Tiles
+  name: lathe-category-tiles
+
 - type: latheCategory
   id: Tools
   name: lathe-category-tools
@@ -77,12 +81,37 @@
   id: Supply
   name: lathe-category-supply
 
+# Cutter machine
+- type: latheCategory
+  id: Concrete
+  name: lathe-category-concrete
+
+- type: latheCategory
+  id: Dark
+  name: lathe-category-dark
+
+- type: latheCategory
+  id: Maints
+  name: lathe-category-maints
+
+- type: latheCategory
+  id: Steel
+  name: lathe-category-steel
+
+- type: latheCategory
+  id: White
+  name: lathe-category-white
+
+- type: latheCategory
+  id: Wood
+  name: lathe-category-wood
+
 # Science
 - type: latheCategory
   id: Mech
   name: lathe-category-mechs
 
-# Sec
+# Security TechFab
 - type: latheCategory
   id: Ammo
   name: lathe-category-ammo

diff --git a/Resources/Prototypes/Recipes/Lathes/tiles.yml b/Resources/Prototypes/Recipes/Lathes/tiles.yml
index b3ece2fe716b8de6149f3e2d4701d512ecb08424..3df6f2a9de2ff30efd5b43a49bb3ddaa54318f6d 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/tiles.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tiles.yml
@@ -1,188 +1,225 @@
-# Base Prototypes
+# Base prototypes
 
 - type: latheRecipe
   abstract: true
   id: BaseTileRecipe
   applyMaterialDiscount: false
+  categories:
+  - Tiles
   completetime: 0.5
-  materials:
-    Steel: 25
-
-- type: latheRecipe
-  abstract: true
-  parent: BaseTileRecipe
-  id: BaseWoodTileRecipe
-  materials:
-    Wood: 25
 
 - type: latheRecipe
   abstract: true
   parent: BaseTileRecipe
-  id: BaseConcreteTileRecipe
+  id: BaseSteelTileRecipe
+  categories:
+  - Steel
   materials:
     Steel: 25
-    Plastic: 25
-
-# Recipes
 
 - type: latheRecipe
-  parent: BaseTileRecipe
-  id: FloorTileItemDark
-  result: FloorTileItemDark
-
-- type: latheRecipe
-  parent: BaseTileRecipe
-  id: FloorTileItemDarkDiagonalMini
-  result: FloorTileItemDarkDiagonalMini
-
-- type: latheRecipe
-  parent: BaseTileRecipe
-  id: FloorTileItemDarkDiagonal
-  result: FloorTileItemDarkDiagonal
-
-- type: latheRecipe
-  parent: BaseTileRecipe
-  id: FloorTileItemDarkHerringbone
-  result: FloorTileItemDarkHerringbone
+  abstract: true
+  parent: BaseSteelTileRecipe
+  id: BaseDarkTileRecipe
+  categories:
+  - Dark
 
 - type: latheRecipe
-  parent: BaseTileRecipe
-  id: FloorTileItemDarkMini
-  result: FloorTileItemDarkMini
+  abstract: true
+  parent: BaseSteelTileRecipe
+  id: BaseWhiteTileRecipe
+  categories:
+  - White
 
 - type: latheRecipe
-  parent: BaseTileRecipe
-  id: FloorTileItemDarkMono
-  result: FloorTileItemDarkMono
+  abstract: true
+  parent: BaseSteelTileRecipe
+  id: BaseMaintTileRecipe
+  categories:
+  - Maints
 
 - type: latheRecipe
+  abstract: true
   parent: BaseTileRecipe
-  id: FloorTileItemDarkPavement
-  result: FloorTileItemDarkPavement
+  id: BaseWoodTileRecipe
+  categories:
+  - Wood
+  materials:
+    Wood: 25
 
 - type: latheRecipe
+  abstract: true
   parent: BaseTileRecipe
-  id: FloorTileItemDarkPavementVertical
-  result: FloorTileItemDarkPavementVertical
+  id: BaseConcreteTileRecipe
+  categories:
+  - Concrete
+  materials:
+    Steel: 25
+    Plastic: 25
 
-- type: latheRecipe
-  parent: BaseTileRecipe
-  id: FloorTileItemDarkOffset
-  result: FloorTileItemDarkOffset
+## Recipes
 
+# Steel tiles
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseSteelTileRecipe
   id: FloorTileItemSteelCheckerDark
   result: FloorTileItemSteelCheckerDark
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseSteelTileRecipe
+  id: FloorTileItemSteelCheckerLight
+  result: FloorTileItemSteelCheckerLight
+
+- type: latheRecipe
+  parent: BaseSteelTileRecipe
   id: FloorTileItemSteel
   result: FloorTileItemSteel
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseSteelTileRecipe
   id: FloorTileItemSteelOffset
   result: FloorTileItemSteelOffset
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseSteelTileRecipe
   id: FloorTileItemSteelDiagonalMini
   result: FloorTileItemSteelDiagonalMini
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseSteelTileRecipe
   id: FloorTileItemSteelDiagonal
   result: FloorTileItemSteelDiagonal
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseSteelTileRecipe
   id: FloorTileItemSteelHerringbone
   result: FloorTileItemSteelHerringbone
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseSteelTileRecipe
   id: FloorTileItemSteelMini
   result: FloorTileItemSteelMini
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseSteelTileRecipe
   id: FloorTileItemSteelMono
   result: FloorTileItemSteelMono
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseSteelTileRecipe
   id: FloorTileItemSteelPavement
   result: FloorTileItemSteelPavement
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseSteelTileRecipe
   id: FloorTileItemSteelPavementVertical
   result: FloorTileItemSteelPavementVertical
 
+# Dark tiles
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseDarkTileRecipe
+  id: FloorTileItemDark
+  result: FloorTileItemDark
+
+- type: latheRecipe
+  parent: BaseDarkTileRecipe
+  id: FloorTileItemDarkDiagonalMini
+  result: FloorTileItemDarkDiagonalMini
+
+- type: latheRecipe
+  parent: BaseDarkTileRecipe
+  id: FloorTileItemDarkDiagonal
+  result: FloorTileItemDarkDiagonal
+
+- type: latheRecipe
+  parent: BaseDarkTileRecipe
+  id: FloorTileItemDarkHerringbone
+  result: FloorTileItemDarkHerringbone
+
+- type: latheRecipe
+  parent: BaseDarkTileRecipe
+  id: FloorTileItemDarkMini
+  result: FloorTileItemDarkMini
+
+- type: latheRecipe
+  parent: BaseDarkTileRecipe
+  id: FloorTileItemDarkMono
+  result: FloorTileItemDarkMono
+
+- type: latheRecipe
+  parent: BaseDarkTileRecipe
+  id: FloorTileItemDarkPavement
+  result: FloorTileItemDarkPavement
+
+- type: latheRecipe
+  parent: BaseDarkTileRecipe
+  id: FloorTileItemDarkPavementVertical
+  result: FloorTileItemDarkPavementVertical
+
+- type: latheRecipe
+  parent: BaseDarkTileRecipe
+  id: FloorTileItemDarkOffset
+  result: FloorTileItemDarkOffset
+
+# White steel tiles
+- type: latheRecipe
+  parent: BaseWhiteTileRecipe
   id: FloorTileItemWhite
   result: FloorTileItemWhite
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseWhiteTileRecipe
   id: FloorTileItemWhiteOffset
   result: FloorTileItemWhiteOffset
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseWhiteTileRecipe
   id: FloorTileItemWhiteDiagonalMini
   result: FloorTileItemWhiteDiagonalMini
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseWhiteTileRecipe
   id: FloorTileItemWhiteDiagonal
   result: FloorTileItemWhiteDiagonal
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseWhiteTileRecipe
   id: FloorTileItemWhiteHerringbone
   result: FloorTileItemWhiteHerringbone
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseWhiteTileRecipe
   id: FloorTileItemWhiteMini
   result: FloorTileItemWhiteMini
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseWhiteTileRecipe
   id: FloorTileItemWhiteMono
   result: FloorTileItemWhiteMono
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseWhiteTileRecipe
   id: FloorTileItemWhitePavement
   result: FloorTileItemWhitePavement
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseWhiteTileRecipe
   id: FloorTileItemWhitePavementVertical
   result: FloorTileItemWhitePavementVertical
 
-- type: latheRecipe
-  parent: BaseTileRecipe
-  id: FloorTileItemSteelCheckerLight
-  result: FloorTileItemSteelCheckerLight
-
 # Other steel
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseMaintTileRecipe
   id: FloorTileItemGratingMaint
   result: FloorTileItemGratingMaint
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseMaintTileRecipe
   id: FloorTileItemTechmaint
   result: FloorTileItemTechmaint
 
 - type: latheRecipe
-  parent: BaseTileRecipe
+  parent: BaseMaintTileRecipe
   id: FloorTileItemSteelMaint
   result: FloorTileItemSteelMaint