From 20e18084c30c3a26c8a27046100226887556c662 Mon Sep 17 00:00:00 2001 From: Alexsey Bezyuk Date: Wed, 4 Jun 2025 15:34:09 +1000 Subject: [PATCH] Leather Working --- .../Structures/Furniture/workbenchs.yml | 2 +- .../Workbench/LeatherWorking/backpacks.yml | 8 ++-- .../LeatherWorking/backpacks_explorer.yml | 8 ++-- .../LeatherWorking/backpacks_satchels.yml | 8 ++-- .../Workbench/LeatherWorking/tanner.yml | 45 +++++++++++++------ .../_CP14/Recipes/Workbench/sewing_table.yml | 4 +- Resources/Prototypes/_CP14/tags.yml | 2 +- 7 files changed, 49 insertions(+), 28 deletions(-) diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index 29ec467ca3..4c4fe61211 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -122,5 +122,5 @@ collection: CP14Sawing #TODO recipeTags: - CP14RecipeSewing - - CP14RecipeTanner + - CP14RecipeLeatherWorking diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml index 2af9d2cb31..5d3bc71a86 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml @@ -1,7 +1,7 @@ # Backpacks (heavy on leather) - type: CP14Recipe id: CP14ClothingBackpackT0 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 4 requirements: - !type:StackResource @@ -18,7 +18,7 @@ - type: CP14Recipe id: CP14ClothingBackpackT1 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 4 requirements: - !type:StackResource @@ -35,7 +35,7 @@ - type: CP14Recipe id: CP14ClothingBackpackT2 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 6 requirements: - !type:StackResource @@ -52,7 +52,7 @@ - type: CP14Recipe id: CP14ClothingBackpackT3 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 10 requirements: - !type:StackResource diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml index c618f0d433..431367704c 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml @@ -1,7 +1,7 @@ # Explorer Backpacks (heavy on buckles) - type: CP14Recipe id: CP14ClothingExplorerBackpackT0 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 4 requirements: - !type:StackResource @@ -18,7 +18,7 @@ - type: CP14Recipe id: CP14ClothingExplorerBackpackT1 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 4 requirements: - !type:StackResource @@ -35,7 +35,7 @@ - type: CP14Recipe id: CP14ClothingExplorerBackpackT2 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 6 requirements: - !type:StackResource @@ -52,7 +52,7 @@ - type: CP14Recipe id: CP14ClothingExplorerBackpackT3 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 10 requirements: - !type:StackResource diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml index c7b7faaf92..10ee2a5aff 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml @@ -1,7 +1,7 @@ # Satchels (heavy on straps) - type: CP14Recipe id: CP14ClothingSatchelT0 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 4 requirements: - !type:StackResource @@ -18,7 +18,7 @@ - type: CP14Recipe id: CP14ClothingSatchelT1 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 4 requirements: - !type:StackResource @@ -35,7 +35,7 @@ - type: CP14Recipe id: CP14ClothingSatchelT2 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 6 requirements: - !type:StackResource @@ -52,7 +52,7 @@ - type: CP14Recipe id: CP14ClothingSatchelT3 - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 10 requirements: - !type:StackResource diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml index 091bedcb78..182803403b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml @@ -1,11 +1,11 @@ # ================ -# Leather +# Hide # ================ # Crafting Recipes # Leather Processing - type: CP14Recipe - id: CP14ThinLeatherRecipe - tag: CP14RecipeTanner + id: CP14ThinHideRecipe + tag: CP14RecipeLeatherWorking craftTime: 1 requirements: - !type:StackResource @@ -18,8 +18,8 @@ resultCount: 2 - type: CP14Recipe - id: CP14LeatherRecipe - tag: CP14RecipeTanner + id: CP14HideRecipe + tag: CP14RecipeLeatherWorking craftTime: 1 requirements: - !type:StackResource @@ -32,8 +32,8 @@ resultCount: 1 - type: CP14Recipe - id: CP14RoughLeatherRecipe - tag: CP14RecipeTanner + id: CP14RoughHideRecipe + tag: CP14RecipeLeatherWorking craftTime: 2 requirements: - !type:StackResource @@ -46,21 +46,40 @@ resultCount: 1 - type: CP14Recipe - id: CP14ScrapLeatherRecipe - tag: CP14RecipeTanner + id: CP14ScrapHideRecipe + tag: CP14RecipeLeatherWorking craftTime: 2 requirements: - !type:StackResource stack: CP14ScrapAnimalHide count: 3 + - !type:StackResource + stack: CP14String + count: 3 result: CP14AnimalHide resultCount: 1 +# ================ +# Leather Crafting +- type: CP14Recipe + id: CP14ThinToNormalLeatherRecipe + tag: CP14RecipeLeatherWorking + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14ThinLeather + count: 2 + - !type:StackResource + stack: CP14String + count: 4 + result: CP14Leather + resultCount: 1 + # ================ # Straps Crafting - type: CP14Recipe id: CP14ThinLeatherStrapRecipe - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 1 requirements: - !type:StackResource @@ -74,7 +93,7 @@ - type: CP14Recipe id: CP14LeatherStrapRecipe - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 1 requirements: - !type:StackResource @@ -85,7 +104,7 @@ - type: CP14Recipe id: CP14ReinforcedStrapRecipe - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 2 requirements: - !type:StackResource @@ -99,7 +118,7 @@ - type: CP14Recipe id: CP14ReinforcedRoughStrapRecipe - tag: CP14RecipeTanner + tag: CP14RecipeLeatherWorking craftTime: 2 requirements: - !type:StackResource diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index 2d01e11a00..85795d772f 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -17,6 +17,7 @@ protoId: CP14Cotton count: 1 result: CP14String + resultCount: 2 - type: CP14Recipe id: CP14ClothMaterialString @@ -37,6 +38,7 @@ protoId: CP14Web count: 2 result: CP14String + resultCount: 3 - type: CP14Recipe id: CP14StringCottonCloth @@ -47,7 +49,7 @@ stack: CP14Cloth count: 1 result: CP14String - resultCount: 2 + resultCount: 4 - type: CP14Recipe id: CP14ClothingShirtCottonBlue diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 1327a350aa..4596b8cb9b 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -53,7 +53,7 @@ id: CP14RecipeMeltingFurnace - type: Tag - id: CP14RecipeTanner + id: CP14RecipeLeatherWorking - type: Tag id: CP14Rabbit