From bdd7e5ea65bfc056ff13c790dabe4439209a1143 Mon Sep 17 00:00:00 2001 From: Alexsey Bezyuk <41479614+PhantornRU@users.noreply.github.com> Date: Sat, 9 Aug 2025 20:21:26 +1000 Subject: [PATCH] Leather rework (#1638) * remove salt * crafting rework * Stacks * corrected count * linter fix * Bellt crafts * delete leather * resize * Hide in belt * Sprites fix * linter fix * remove static price from backpacks base * explosive resistance * belt cost * Lets fix cost warnings * satchels static price for balance with backpacks * ScrapHideRecipe cost * lets try increase leather units in hide * return scrap recipe back * Lets FINISH that costs! * hide suffix * trying to fix stack warning * placeholder suffix * Hide => Leather * Lets try again!!!! * name and description * another * Update Resources/Prototypes/_CP14/Entities/Objects/Ingredients/ingredients.yml * Update Resources/Prototypes/_CP14/Materials/simple.yml * Update Resources/Prototypes/_CP14/Entities/Objects/Ingredients/ingredients.yml --- .../en-US/_CP14/materials/materials.ftl | 1 + .../Locale/en-US/_CP14/stack/materials.ftl | 6 +- .../ru-RU/_CP14/materials/materials.ftl | 1 + .../Locale/ru-RU/_CP14/stack/materials.ftl | 5 +- .../Entities/Clothing/Back/backpacks.yml | 104 +++++------ .../Clothing/Back/backpacks_explorer.yml | 19 +- .../Clothing/Back/backpacks_satchels.yml | 73 ++++---- .../Entities/Clothing/Back/container_base.yml | 2 - .../_CP14/Entities/Clothing/Belt/pouch.yml | 5 +- .../_CP14/Entities/Clothing/Belt/quiver.yml | 5 +- .../_CP14/Entities/Mobs/NPC/animals.yml | 20 +- .../_CP14/Entities/Mobs/NPC/dinosaurs.yml | 8 +- .../_CP14/Entities/Mobs/NPC/mole.yml | 6 +- .../_CP14/Entities/Mobs/NPC/watcher.yml | 4 +- .../Entities/Objects/Ingredients/hide.yml | 140 ++++++++++++-- .../Entities/Objects/Ingredients/leather.yml | 106 ----------- .../_CP14/Entities/Objects/Materials/misc.yml | 45 ----- .../Prototypes/_CP14/Materials/simple.yml | 11 +- .../Workbench/LeatherWorking/backpacks.yml | 89 +++++---- .../LeatherWorking/backpacks_explorer.yml | 97 ++++------ .../LeatherWorking/backpacks_satchels.yml | 85 ++++----- .../Workbench/LeatherWorking/belts.yml | 34 ++++ .../Workbench/LeatherWorking/tanner.yml | 175 ++---------------- .../Prototypes/_CP14/Stacks/materials.yml | 24 ++- .../_CP14/Trading/BuyPositions/butchers.yml | 19 +- .../Trading/BuyPositions/dwarf_mining.yml | 11 -- .../hide.rsi/{hide.png => hide1.png} | Bin .../Objects/Ingredients/hide.rsi/hide2.png | Bin 0 -> 2464 bytes .../Objects/Ingredients/hide.rsi/hide3.png | Bin 0 -> 2570 bytes .../Objects/Ingredients/hide.rsi/meta.json | 46 +++-- .../{rugged_hide.png => rugged_hide1.png} | Bin .../Ingredients/hide.rsi/rugged_hide2.png | Bin 0 -> 2605 bytes .../Ingredients/hide.rsi/rugged_hide3.png | Bin 0 -> 2669 bytes .../{thin_hide.png => thin_hide1.png} | Bin .../Ingredients/hide.rsi/thin_hide2.png | Bin 0 -> 2340 bytes .../Ingredients/hide.rsi/thin_hide3.png | Bin 0 -> 2377 bytes 36 files changed, 480 insertions(+), 661 deletions(-) delete mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Ingredients/leather.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/belts.yml rename Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/{hide.png => hide1.png} (100%) create mode 100644 Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide2.png create mode 100644 Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide3.png rename Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/{rugged_hide.png => rugged_hide1.png} (100%) create mode 100644 Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide2.png create mode 100644 Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide3.png rename Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/{thin_hide.png => thin_hide1.png} (100%) create mode 100644 Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide2.png create mode 100644 Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide3.png diff --git a/Resources/Locale/en-US/_CP14/materials/materials.ftl b/Resources/Locale/en-US/_CP14/materials/materials.ftl index cbf1977e65..1e70d0d666 100644 --- a/Resources/Locale/en-US/_CP14/materials/materials.ftl +++ b/Resources/Locale/en-US/_CP14/materials/materials.ftl @@ -13,3 +13,4 @@ cp14-material-coal = hard coal cp14-material-lucens-planks = lucens planks cp14-material-flora = flora material cp14-material-ash = ash +cp14-material-leather = leather diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index f46d65b085..9b2f4c69ca 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -20,8 +20,6 @@ cp14-stack-iron-ore = iron ore cp14-stack-gold-ore = gold ore cp14-stack-mithril-ore = mithril ore -cp14-stack-salt-stone = salt stone - cp14-stack-wallpaper = rolls of wallpaper cp14-stack-glass-sheet = glass @@ -29,3 +27,7 @@ cp14-stack-glass-sheet = glass cp14-stack-ash-pile = pile of ashes cp14-stack-group-wooden-planks-any = planks (any) + +cp14-stack-hide-thin = thin hide +cp14-stack-hide = coarse hide +cp14-stack-hide-rugged = rugged hide \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl index 53b46f5efd..e75f242a51 100644 --- a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl @@ -13,3 +13,4 @@ cp14-material-coal = каменный уголь cp14-material-lucens-planks = люценсовые доски cp14-material-flora = растительный материал cp14-material-ash = пепел +cp14-material-leather = кожа \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl index 7cd0d44a60..841140405a 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -20,14 +20,15 @@ cp14-stack-iron-ore = железная руда cp14-stack-gold-ore = золотая руда cp14-stack-mithril-ore = мифриловая руда -cp14-stack-salt-stone = соляной камень - cp14-stack-wallpaper = рулон обоев cp14-stack-glass-sheet = стекло cp14-stack-ash-pile = кучка пепла +cp14-stack-hide-thin = тонкая шкура +cp14-stack-hide = грубая шкура +cp14-stack-hide-rugged = прочная шкура cp14-stack-group-wooden-planks-any = доски (любые) diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml index f04cb61fda..a4878d5ec0 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml @@ -34,9 +34,8 @@ - 0,0,4,2 # 5*3=15 - type: PhysicalComposition materialComposition: - CP14Cloth: 120 # 100u CP14Cloth (10x10u) + 20u CP14String (4x5u) - CP14Iron: 2 # 2u CP14IronBuckle (1x2u) - # Cost: (120×0.3) + (2×2) = 36 + 4 = 40 copper coins + CP14Cloth: 60 # 50u CP14Cloth (10x10u) + 10u CP14String + # Cost: (60×0.3) = 18 copper coins - type: entity parent: CP14ClothingBackBackpackT0 @@ -55,21 +54,18 @@ - 0,0,5,3 # 6*4=24 - type: PhysicalComposition materialComposition: - CP14Leather: 46 # 40u CP14Leather (8x5u) + 6u CP14LeatherStrap (2x3u) - CP14SaltStone: 46 # 40u (8x5u) + 6u (2x3u) + CP14Leather: 18 # 20u CP14Leather (4x5u) ~~~ and -2u for cost balance CP14Iron: 2 # 2u CP14IronBuckle (1x2u) - # Cost: (46×1.2) + (46×0.4) + (2×2) = 55.2 + 18.4 + 4 = 77.6 copper coins + # Cost: (20×1.2) + (2×2) = 24 + 4 = 28 copper coins - type: Armor modifiers: coefficients: - Blunt: 0.94 - Slash: 0.98 - Heat: 0.94 - Caustic: 0.94 - - type: ClothingSpeedModifier - walkModifier: 0.95 - sprintModifier: 0.95 - - type: HeldSpeedModifier + Blunt: 0.95 + Slash: 0.95 + Heat: 0.90 + Caustic: 0.90 + - type: ExplosionResistance + damageCoefficient: 0.9 - type: entity parent: CP14ClothingBackBackpackT1 @@ -87,21 +83,22 @@ - 11,1,12,3 #2*3=6 - type: PhysicalComposition materialComposition: - CP14Leather: 92 # 80u CP14Leather (8x10u) + 12u CP14LeatherStrap (4x3u) - CP14SaltStone: 92 # 80u (8x10u) + 12u (4x3u) + CP14Leather: 60 # 20u thin (4x5u) + 40u regular (4x10u) CP14Iron: 4 # 4u CP14IronBuckle (2x2u) - # Cost: (92×1.2) + (92×0.4) + (4×2) = 110.4 + 36.8 + 8 = 155.2 copper coins + # Cost: (60×1.2) + (4×2) = 72 + 8 = 80 copper coins - type: Armor modifiers: coefficients: - Blunt: 0.90 - Slash: 0.94 - Heat: 0.90 - Caustic: 0.90 + Blunt: 0.85 + Slash: 0.90 + Piercing: 0.95 + Heat: 0.85 + Caustic: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.8 - type: ClothingSpeedModifier - walkModifier: 0.80 - sprintModifier: 0.80 - - type: HeldSpeedModifier + sprintModifier: 0.95 + - type: HeldSpeedModifier # Slow down when hold - type: entity parent: CP14ClothingBackBackpackT2 @@ -119,22 +116,22 @@ - 0,3,9,6 # 10*4=40 - type: PhysicalComposition materialComposition: - CP14Leather: 224 # 200u CP14Leather (8x25u) + 24u CP14RuggedStrap (4x6u) - CP14SaltStone: 180 # 160u (8x20u) + 20u (4x5u) + CP14Leather: 115 # 40u regular (4x10u) + 75u rugged (3x25u) CP14Iron: 4 # 4u CP14IronBuckle (2x2u) - # Cost: (224×1.2) + (180×0.4) + (4×2) = 268.8 + 72 + 8 = 348.8 copper coins + # Cost: (115×1.2) + (4×2) = 138 + 8 = 146 copper coins - type: Armor modifiers: coefficients: - Blunt: 0.86 - Slash: 0.90 - Piercing: 0.98 - Heat: 0.86 - Caustic: 0.86 + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.90 + Heat: 0.70 + Caustic: 0.70 + - type: ExplosionResistance + damageCoefficient: 0.7 - type: ClothingSpeedModifier - walkModifier: 0.70 - sprintModifier: 0.70 - - type: HeldSpeedModifier + sprintModifier: 0.90 + - type: HeldSpeedModifier # Slow down when hold - type: Clothing equipDelay: 1.2 unequipDelay: 0.8 @@ -162,21 +159,22 @@ - 4,6,5,6 # 2*1=2 - type: PhysicalComposition materialComposition: - CP14Leather: 110 # 80u CP14Leather (8x10u) + 30u CP14LeatherStrap (10x3u) - CP14SaltStone: 110 # 80u (8x10u) + 30u (10x3u) - CP14Iron: 8 # 8u CP14IronBuckle (4x2u) - # Cost: (110×1.2) + (110×0.4) + (8×2) = 132 + 44 + 16 = 192 copper coins + CP14Leather: 60 # 20u thin (4x5u) + 40u regular (4x10u) + CP14Iron: 24 # 20u + 4u CP14IronBuckle (2x2u) + # Cost: (60×1.2) + (24×2) = 72 + 48 = 120 copper coins - type: Armor modifiers: coefficients: - Blunt: 0.86 - Slash: 0.92 - Piercing: 0.95 - Heat: 0.92 + Blunt: 0.85 + Slash: 0.80 + Piercing: 0.90 + Heat: 0.85 + Caustic: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.70 - type: ClothingSpeedModifier - walkModifier: 0.82 - sprintModifier: 0.82 - - type: HeldSpeedModifier + sprintModifier: 0.94 + - type: HeldSpeedModifier # Slow down when hold - type: entity parent: CP14ClothingBackBackpackT2 @@ -196,11 +194,11 @@ - 1,6,6,6 # 6*1=6 - type: PhysicalComposition materialComposition: - CP14Leather: 96 # 60u CP14Leather (6x10u) + 36u CP14LeatherStrap (12x3u) - CP14SaltStone: 96 # 60u (6x10u) + 36u (12x3u) - CP14Iron: 12 # 12u CP14IronBuckle (6x2u) - # Cost: (96×1.2) + (96×0.4) + (12×2) = 115.2 + 38.4 + 24 = 177.6 copper coins + CP14Leather: 80 # 20 + 20u thin (4x5u) + 40u regular (4x10u) + CP14Iron: 4 # 4u CP14IronBuckle (2x2u) + # Cost: (80×1.2) + (4×2) = 96 + 8 = 104 copper coins + - type: ExplosionResistance + damageCoefficient: 0.85 - type: ClothingSpeedModifier - walkModifier: 0.84 - sprintModifier: 0.84 - - type: HeldSpeedModifier + sprintModifier: 0.97 + - type: HeldSpeedModifier # Slow down when hold diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_explorer.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_explorer.yml index 710aa92c78..8bb96fb26a 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_explorer.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_explorer.yml @@ -38,9 +38,9 @@ # - 13,2,14,2 # 2x1=2 # - type: PhysicalComposition # materialComposition: -# CP14Cloth: 80 # 60u CP14Cloth (6x10u) + 20u CP14String (4x5u) +# CP14Cloth: 30 # 30u CP14Cloth (3x10u) # CP14Iron: 16 # 16u CP14IronBuckle (8x2u) -# # Cost: (80×0.3) + (16×2) = 24 + 32 = 56 copper coins +# # Cost: (30×0.3) + (16×2) = 9 + 32 = 41 copper coins # - type: entity # parent: CP14ClothingBackExplorerBackpackT0 @@ -62,10 +62,9 @@ # - 5,3,7,4 # 3x2=6 # - type: PhysicalComposition # materialComposition: -# CP14Leather: 36 # 30u CP14Leather (6x5u) + 6u CP14LeatherStrap (2x3u) -# CP14SaltStone: 36 # 30u (6x5u) + 6u (2x3u) +# CP14Leather: 15 # 15u CP14Leather (3x5u) # CP14Iron: 20 # 20u CP14IronBuckle (10x2u) -# # Cost: (36×1.2) + (36×0.4) + (20×2) = 43.2 + 14.4 + 40 = 97.6 copper coins +# # Cost: (15×1.2) + (20×2) = 18 + 40 = 58 copper coins # - type: entity # parent: CP14ClothingBackExplorerBackpackT1 @@ -91,10 +90,9 @@ # - 11,3,12,5 # 2x3=6 # - type: PhysicalComposition # materialComposition: -# CP14Leather: 72 # 60u CP14Leather (6x10u) + 12u CP14LeatherStrap (4x3u) -# CP14SaltStone: 72 # 60u (6x10u) + 12u (4x3u) +# CP14Leather: 45 # 15u thin (3x5u) + 30u regular (3x10u) # CP14Iron: 24 # 24u CP14IronBuckle (12x2u) -# # Cost: (72×1.2) + (72×0.4) + (24×2) = 86.4 + 28.8 + 48 = 163.2 copper coins +# # Cost: (45×1.2) + (24×2) = 54 + 48 = 102 copper coins # - type: entity # parent: CP14ClothingBackExplorerBackpackT2 @@ -122,7 +120,6 @@ # - 16,4,16,6 # 1x3=3 # - type: PhysicalComposition # materialComposition: -# CP14Leather: 174 # 150u CP14Leather (6x25u) + 24u CP14RuggedStrap (4x6u) -# CP14SaltStone: 140 # 120u (6x20u) + 20u (4x5u) +# CP14Leather: 80 # 30u regular (3x10u) + 50u rugged (2x25u) # CP14Iron: 24 # 24u CP14IronBuckle (12x2u) -# # Cost: (174×1.2) + (140×0.4) + (24×2) = 208.8 + 56 + 48 = 312.8 copper coins +# # Cost: (80×1.2) + (24×2) = 96 + 48 = 144 copper coins \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_satchels.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_satchels.yml index c9dfe2296c..b9d9f4b5f3 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_satchels.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_satchels.yml @@ -49,9 +49,9 @@ - 7,1,8,2 # 2x2=4 - type: PhysicalComposition materialComposition: - CP14Cloth: 120 # 80u CP14Cloth (8x10u) + 40u CP14String (8x5u) - CP14Iron: 6 # 6u CP14IronBuckle (3x2u) - # Cost: (120×0.3) + (6×2) = 36 + 12 = 48 copper coins + CP14Cloth: 50 # 40u CP14Cloth (8x10u) + 10u CP14String + CP14Iron: 2 # 2u CP14Iron + # Cost: (50×0.3) + (2×2) = 19 copper coins - type: entity parent: CP14ClothingBackSatchelT0 @@ -75,13 +75,12 @@ - 11,1,12,3 # 2x3=6 - type: PhysicalComposition materialComposition: - CP14Leather: 60 # 30u CP14Leather (6x5u) + 30u CP14LeatherStrap (10x3u) - CP14SaltStone: 60 # 30u (6x5u) + 30u (10x3u) - CP14Iron: 8 # 8u CP14IronBuckle (4x2u) - # Cost: (60×1.2) + (60×0.4) + (8×2) = 72 + 24 + 16 = 112 copper coins - - type: ClothingSpeedModifier - sprintModifier: 0.97 - - type: HeldSpeedModifier + CP14Leather: 15 # 15u CP14Leather (3x5u) + CP14Iron: 6 # 6u CP14IronBuckle (3x2u) + CP14Cloth: 50 # 40u CP14Cloth (8x10u) + 10u CP14String ~~~ 15 additional coppers + # Cost: (15×1.2) + (6×2) = 18 + 12 = 30 copper coins + - type: StaticPrice + price: 15 # Balance with backpack - type: entity parent: CP14ClothingBackSatchelT1 @@ -105,18 +104,17 @@ - 11,3,12,4 # 2x2=4 - type: PhysicalComposition materialComposition: - CP14Leather: 96 # 60u CP14Leather (6x10u) + 36u CP14LeatherStrap (12x3u) - CP14SaltStone: 96 # 60u (6x10u) + 36u (12x3u) + CP14Leather: 45 # 15u thin (3x5u) + 30u regular (3x10u) CP14Iron: 12 # 12u CP14IronBuckle (6x2u) - # Cost: (96×1.2) + (96×0.4) + (12×2) = 115.2 + 38.4 + 24 = 177.6 copper coins + CP14Cloth: 50 # 40u CP14Cloth (8x10u) + 10u CP14String ~~~ 15 additional coppers + # Cost: (45×1.2) + (12×2) = 54 + 24 = 78 copper coins - type: Armor modifiers: coefficients: - Heat: 0.98 - Caustic: 0.96 - - type: ClothingSpeedModifier - sprintModifier: 0.85 - - type: HeldSpeedModifier + Blunt: 0.95 + Slash: 0.95 + - type: StaticPrice + price: 30 # Balance with backpack - type: entity parent: CP14ClothingBackSatchelBase @@ -137,20 +135,22 @@ - 11,3,12,6 # 2x4=8 - type: PhysicalComposition materialComposition: - CP14Leather: 222 # 150u CP14Leather (6x25u) + 72u CP14RuggedStrap (12x6u) - CP14SaltStone: 180 # 120u (6x20u) + 60u (12x5u) + CP14Leather: 80 # 30u regular (3x10u) + 50u rugged (2x25u) CP14Iron: 12 # 12u CP14IronBuckle (6x2u) - # Cost: (222×1.2) + (180×0.4) + (12×2) = 266.4 + 72 + 24 = 362.4 copper coins + CP14Cloth: 50 # 40u CP14Cloth (8x10u) + 10u CP14String ~~~ 15 additional coppers + # Cost: (80×1.2) + (12×2) = 96 + 24 = 120 copper coins - type: Armor modifiers: coefficients: - Blunt: 0.96 - Slash: 0.96 - Heat: 0.94 - Caustic: 0.90 + Blunt: 0.90 + Slash: 0.90 + - type: ExplosionResistance + damageCoefficient: 0.9 - type: ClothingSpeedModifier - sprintModifier: 0.75 - - type: HeldSpeedModifier + sprintModifier: 0.95 + - type: HeldSpeedModifier # Slow down when hold + - type: StaticPrice + price: 60 # Balance with backpack # ======================== # Special @@ -177,17 +177,14 @@ - 5,5,7,5 # 3x1=3 - type: PhysicalComposition materialComposition: - CP14Leather: 102 # 60u CP14Leather (6x10u) + 42u CP14LeatherStrap (14x3u) - CP14SaltStone: 102 # 60u (6x10u) + 42u (14x3u) - CP14Iron: 12 # 12u CP14IronBuckle (6x2u) - # Cost: (102×1.2) + (102×0.4) + (12×2) = 122.4 + 40.8 + 24 = 187.2 copper coins + CP14Leather: 45 # 15u thin (3x5u) + 30u regular (3x10u) + CP14Iron: 32 # 20 + 12u CP14IronBuckle (6x2u) + # Cost: (45×1.2) + (32×2) = 54 + 64 = 118 copper coins - type: Armor modifiers: coefficients: - Blunt: 0.91 - Slash: 0.94 - Piercing: 0.97 - Heat: 0.98 - - type: ClothingSpeedModifier - sprintModifier: 0.88 - - type: HeldSpeedModifier + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.95 + - type: ExplosionResistance + damageCoefficient: 0.85 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml index fb7100419f..71eab00b54 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml @@ -34,5 +34,3 @@ interfaces: enum.StorageUiKey.Key: type: StorageBoundUserInterface - - type: StaticPrice - price: 30 # for crafting diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/pouch.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/pouch.yml index fca7525cc6..cf99c7f531 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/pouch.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/pouch.yml @@ -33,7 +33,6 @@ fillBaseName: fill- - type: PhysicalComposition materialComposition: - CP14Leather: 19 # 10u CP14Leather (1x10u) + 9u CP14LeatherStrap (3x3u) - CP14SaltStone: 19 # 10u (1x10u) + 9u (3x3u) + CP14Leather: 10 # 10u CP14Leather CP14Cloth: 20 # 20u CP14String (4x5u) - # Cost: (19×1.2) + (19×0.4) + (20×0.3) = 22.8 + 7.6 + 6 = 36.4 copper coins \ No newline at end of file + # Cost: (10×1.2) + (20×0.3) = 12 + 6 = 18 copper coins diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml index d26495d83c..3db1e03fa2 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml @@ -33,10 +33,9 @@ fillBaseName: fill- - type: PhysicalComposition materialComposition: - CP14Leather: 36 # 30u CP14Leather (3x10u) + 6u CP14LeatherStrap (2x3u) - CP14SaltStone: 36 # 30u (3x10u) + 6u (2x3u) + CP14Leather: 20 # 20u CP14Leather (2x10u) CP14Cloth: 20 # 20u CP14String (4x5u) - # Cost: (36×1.2) + (36×0.4) + (20×0.3) = 43.2 + 14.4 + 6 = 63.6 copper coins + # Cost: (20×1.2) + (20×0.3) = 24 + 6 = 30 copper coins - type: entity parent: CP14ClothingBeltQuiver diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml index 0e987ebe54..7ae35d0980 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml @@ -69,7 +69,7 @@ spawned: - id: CP14FoodMeatRabbit amount: 4 - - id: CP14ThinAnimalHide + - id: CP14ThinLeather1 amount: 1 maxAmount: 2 - id: CP14Fur @@ -161,7 +161,7 @@ - id: CP14FoodMeatPigLeg amount: 1 prob: 0.3 - - id: CP14AnimalHide + - id: CP14Leather1 amount: 1 maxAmount: 3 - type: Bloodstream @@ -211,14 +211,14 @@ spawned: - id: CP14FoodMeatBoar amount: 4 - - id: CP14AnimalHide + - id: CP14Leather1 amount: 2 maxAmount: 4 - - id: CP14ScrapAnimalHide + - id: CP14ScrapLeather amount: 1 maxAmount: 3 prob: 0.5 - - id: CP14RuggedAnimalHide + - id: CP14RuggedLeather1 amount: 1 prob: 0.1 - id: CP14CheapFur @@ -315,7 +315,7 @@ spawned: - id: CP14FoodMeatFrogLeg amount: 2 - - id: CP14ScrapAnimalHide + - id: CP14ScrapLeather amount: 1 prob: 0.5 - type: MeleeWeapon @@ -434,10 +434,10 @@ - id: CP14String # As long as there are no mechanics to shearing wool, the only way to get string. amount: 4 maxAmount: 16 - - id: CP14ThinAnimalHide + - id: CP14ThinLeather1 amount: 2 maxAmount: 5 - - id: CP14ScrapAnimalHide + - id: CP14ScrapLeather amount: 1 maxAmount: 5 prob: 0.3 @@ -524,10 +524,10 @@ spawned: - id: CP14FoodMeatBoar # TODO amount: 5 - - id: CP14RuggedAnimalHide + - id: CP14RuggedLeather1 amount: 2 maxAmount: 5 - - id: CP14ScrapAnimalHide + - id: CP14ScrapLeather amount: 2 maxAmount: 6 prob: 0.5 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml index f647c45d2a..8b65eb593e 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml @@ -94,11 +94,11 @@ spawned: - id: CP14FoodMeatDino amount: 4 - - id: CP14RuggedAnimalHide + - id: CP14RuggedLeather1 amount: 1 maxAmount: 2 prob: 0.2 - - id: CP14AnimalHide + - id: CP14Leather1 amount: 2 maxAmount: 4 - type: Bloodstream @@ -173,10 +173,10 @@ spawned: - id: CP14FoodMeatHydra amount: 2 - - id: CP14AnimalHide + - id: CP14Leather1 amount: 1 prob: 0.5 - - id: CP14ScrapAnimalHide + - id: CP14ScrapLeather amount: 1 maxAmount: 3 prob: 0.75 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml index 422258a83d..c2e2655492 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml @@ -79,13 +79,13 @@ - id: CP14FoodMeatMonsterLeg amount: 1 prob: 0.6 - - id: CP14RuggedAnimalHide + - id: CP14RuggedLeather1 amount: 1 prob: 0.2 - - id: CP14AnimalHide + - id: CP14Leather1 amount: 1 maxAmount: 4 - - id: CP14ScrapAnimalHide + - id: CP14ScrapLeather amount: 1 maxAmount: 2 prob: 0.5 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml index 094cbbe8db..c8540f3526 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml @@ -107,7 +107,7 @@ - id: CP14ModularInlayQuartzWater amount: 1 prob: 0.1 - - id: CP14ScrapAnimalHide + - id: CP14ScrapLeather amount: 1 maxAmount: 3 prob: 0.5 @@ -142,7 +142,7 @@ - id: CP14ModularInlayQuartzFire amount: 1 prob: 0.1 - - id: CP14ScrapAnimalHide + - id: CP14ScrapLeather amount: 1 maxAmount: 3 prob: 0.5 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/hide.yml b/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/hide.yml index 1df8655e83..f0e68a2d47 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/hide.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/hide.yml @@ -1,3 +1,11 @@ +# T0 - Rawhide Leather [None] +# T1 - Thin Leather [By PhantomRU] +# T2 - Coarse Leather [By PhantomRU] +# T3 - Rugged Leather [By PhantomRU] +# T4 - Thick Leather [None] +# T5 - Hardened Leather [None] +# Rough Leather ? + - type: entity id: CP14HideBase parent: BaseItem @@ -5,63 +13,165 @@ categories: [ ForkFiltered ] components: - type: Item - size: Normal + size: Small + shape: + - 0,0,1,0 # 2x1 - type: Sprite sprite: _CP14/Objects/Ingredients/hide.rsi # ================ # Hide Types + +# Thin - type: entity - id: CP14ThinAnimalHide + id: CP14ThinLeather1 parent: CP14HideBase - name: thin animal hide + name: thin hide description: Untreated thin animal hide. It seems you can push it with your finger! + suffix: leather T1 (1) components: + - type: Appearance + - type: Item + size: Normal - type: Sprite - state: thin_hide + sprite: _CP14/Objects/Ingredients/hide.rsi + layers: + - state: thin_hide1 + map: ["base"] + - type: Stack + stackType: CP14ThinLeather + count: 1 + baseLayer: base + layerStates: + - thin_hide1 + - thin_hide2 + - thin_hide3 + - type: Material - type: PhysicalComposition materialComposition: - CP14Leather: 10 # 5*2 ~~~ Gives 2 leather when crafted on a tanner table (LeatherWorking/tanner.yml) + CP14Leather: 5 - type: entity - id: CP14AnimalHide + id: CP14ThinLeather3 + parent: CP14ThinLeather1 + suffix: leather T1 (3) + components: + - type: Stack + count: 2 + +- type: entity + id: CP14ThinLeather5 + parent: CP14ThinLeather1 + suffix: leather T1 (5) + components: + - type: Stack + count: 5 + +# Coarse +- type: entity + id: CP14Leather1 parent: CP14HideBase - name: animal hide + name: coarse hide description: Untreated animal hide. It would make a great pouch. + suffix: leather T2 (1) components: + - type: Appearance + - type: Item + size: Normal + shape: + - 0,0,1,1 # 2x2 - type: Sprite - state: hide + sprite: _CP14/Objects/Ingredients/hide.rsi + layers: + - state: hide1 + map: ["base"] + - type: Stack + stackType: CP14Leather + count: 1 + baseLayer: base + layerStates: + - hide1 + - hide2 + - hide3 + - type: Material - type: PhysicalComposition materialComposition: - CP14Leather: 20 # 10*2 ~~~ Gives 2 leather when crafted on a tanner table (LeatherWorking/tanner.yml) + CP14Leather: 12 # 10 + 2 additional - type: entity - id: CP14RuggedAnimalHide + id: CP14Leather3 + parent: CP14Leather1 + suffix: leather T2 (3) + components: + - type: Stack + count: 3 + +- type: entity + id: CP14Leather5 + parent: CP14Leather1 + suffix: leather T2 (5) + components: + - type: Stack + count: 5 + +# Rugged +- type: entity + id: CP14RuggedLeather1 parent: CP14HideBase name: rugged hide description: Durable animal hide. It would make great expensive boots or even protect against cuts. + suffix: leather T3 (1) components: + - type: Appearance - type: Item size: Normal shape: - 0,0,2,1 # 3x2 - type: Sprite - state: rugged_hide + sprite: _CP14/Objects/Ingredients/hide.rsi + layers: + - state: rugged_hide1 + map: ["base"] + - type: Stack + stackType: CP14RuggedLeather + count: 1 + baseLayer: base + layerStates: + - rugged_hide1 + - rugged_hide2 + - rugged_hide3 + - type: Material - type: PhysicalComposition materialComposition: - CP14Leather: 50 # 25*2 ~~~ Gives 2 leather when crafted on a tanner table (LeatherWorking/tanner.yml) + CP14Leather: 27 # 25 + 3 additional + +- type: entity + id: CP14RuggedLeather3 + parent: CP14RuggedLeather1 + suffix: leather T3 (3) + components: + - type: Stack + count: 3 + +- type: entity + id: CP14RuggedLeather5 + parent: CP14RuggedLeather1 + suffix: leather T3 (5) + components: + - type: Stack + count: 5 # Pieces of hide to assemble whole hide. - type: entity - id: CP14ScrapAnimalHide + id: CP14ScrapLeather parent: CP14HideBase name: scraps of hide description: Scraps of skin, someone cut it off carelessly! components: - type: Item - size: Tiny + size: Tiny # 1x1 - type: Sprite state: scrap_hide - type: PhysicalComposition materialComposition: - CP14Leather: 3 \ No newline at end of file + CP14Leather: 3 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/leather.yml b/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/leather.yml deleted file mode 100644 index 5dfcb83ccc..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/leather.yml +++ /dev/null @@ -1,106 +0,0 @@ -# T0 - Rawhide Leather [None] -# T1 - Thin Leather [By PhantomRU] -# T2 - Coarse Leather [By PhantomRU] -# T3 - Rugged Leather [By PhantomRU] -# T4 - Thick Leather [None] -# T5 - Hardened Leather [None] -# Rough Leather ? - -- type: entity - id: CP14LeatherBase - parent: BaseItem - abstract: true - categories: [ ForkFiltered ] - components: - - type: Item - size: Small - - type: Sprite - sprite: _CP14/Objects/Ingredients/leather.rsi - -# ================ -# Leather Types -- type: entity - id: CP14ThinLeather - parent: CP14LeatherBase - name: thin leather - description: Soft and flexible leather, perfect for lightweight items. - components: - - type: Sprite - sprite: _CP14/Objects/Ingredients/leather.rsi - state: thin_leather - - type: PhysicalComposition - materialComposition: - CP14Leather: 5 # x0.5 Leather from hide - CP14SaltStone: 5 # x0.5 Salt - -- type: entity - id: CP14Leather - parent: CP14LeatherBase - name: coarse leather - description: Standard quality leather for various crafts. - components: - - type: Item - size: Normal - - type: Sprite - sprite: _CP14/Objects/Ingredients/leather.rsi - state: leather - - type: PhysicalComposition - materialComposition: - CP14Leather: 10 # x1 Leather from hide - CP14SaltStone: 10 # x1 Salt - -- type: entity - id: CP14RuggedLeather - parent: CP14LeatherBase - name: rugged leather - description: Thick and durable leather. - components: - - type: Item - size: Normal - - type: Sprite - sprite: _CP14/Objects/Ingredients/leather.rsi - state: rugged_leather - - type: PhysicalComposition - materialComposition: - CP14Leather: 25 # x2.5 Leather from hide - CP14SaltStone: 20 # x2 Salt - -# ================ -# Straps -- type: entity - id: CP14LeatherStrap - parent: CP14LeatherBase - name: leather strap - description: A flexible strap made of leather, used in various crafts. - components: - - type: Item - size: Small - shape: - - 0,0,1,0 # 2x1 - - type: Sprite - sprite: _CP14/Objects/Ingredients/leather.rsi - state: strap - - type: PhysicalComposition - materialComposition: - CP14Leather: 3 # 2.5 ~~~ 1/4 leather (10u) - CP14SaltStone: 3 # 1/4 Salt (10u) - CP14Cloth: 3 # 2.5 ~~~ 1/2 CP14String (5u) - -- type: entity - id: CP14RuggedStrap - parent: CP14LeatherBase - name: reinforced strap - description: A sturdy strap reinforced with additional layers. - components: - - type: Item - size: Small - shape: - - 0,0,1,0 # 2x1 - - type: Sprite - sprite: _CP14/Objects/Ingredients/leather.rsi - state: rugged_strap - - type: PhysicalComposition - materialComposition: - CP14Leather: 6 # 6.25 or 1/4 rugged leather (25u) - CP14SaltStone: 5 # 1/4 Salt (20u) - CP14Cloth: 5 # 1x CP14String (5u) \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml index 77df4f3130..28d229152f 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml @@ -118,48 +118,3 @@ components: - type: Stack count: 10 - -# Salt -- type: entity - id: CP14SaltStone1 - parent: BaseItem - name: Salt - description: A crystalline mineral used to season and preserve food. - categories: [ ForkFiltered ] - components: - - type: Item - size: Normal - - type: Appearance - - type: Sprite - sprite: _CP14/Objects/Materials/salt_stone.rsi - layers: - - state: salt1 - map: ["base"] - - type: Stack - stackType: CP14SaltStone - count: 1 - baseLayer: base - layerStates: - - salt1 - - salt2 - - salt3 - - type: Material - - type: PhysicalComposition - materialComposition: - CP14SaltStone: 10 - -- type: entity - id: CP14SaltStone5 - parent: CP14SaltStone1 - suffix: 5 - components: - - type: Stack - count: 5 - -- type: entity - id: CP14SaltStone10 - parent: CP14SaltStone1 - suffix: 10 - components: - - type: Stack - count: 10 diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml index 94af6c0611..9bf48754fa 100644 --- a/Resources/Prototypes/_CP14/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Materials/simple.yml @@ -131,18 +131,9 @@ color: "#2d313c" price: 0 -- type: material - id: CP14SaltStone - stackEntity: CP14SaltStone1 - name: cp14-material-salt - unit: cp14-materials-unit-pile - icon: { sprite: _CP14/Objects/Materials/salt_stone.rsi, state: salt1 } - color: "#85a6a8" - price: 0.4 - - type: material id: CP14Leather - #stackEntity: CP14Leather + stackEntity: CP14Leather1 name: cp14-material-leather unit: materials-unit-roll icon: { sprite: _CP14/Objects/Ingredients/leather.rsi, state: leather } diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml index a213688f10..a7cd193e75 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml @@ -6,13 +6,10 @@ requirements: - !type:StackResource stack: CP14Cloth - count: 10 # 100u CP14Cloth ~~~ CP14Cloth (10u) + count: 5 # 50u CP14Cloth ~~~ CP14Cloth (10u) - !type:ProtoIdResource protoId: CP14String - count: 4 # 20u CP14Cloth ~~~ 1/2 CP14Cloth (5u) - - !type:ProtoIdResource - protoId: CP14IronBuckle - count: 1 # 2u CP14Iron ~~~ 1/5 iron bar (10u) + count: 2 # 10u CP14Cloth ~~~ 1/2 CP14Cloth (5u) result: CP14ClothingBackBackpackT0 - type: CP14Recipe @@ -20,103 +17,103 @@ tag: CP14RecipeLeatherWorking craftTime: 4 requirements: - - !type:ProtoIdResource - protoId: CP14ThinLeather - count: 8 # 40u CP14Leather ~~~ 1/2 CP14Leather (5u) - - !type:ProtoIdResource - protoId: CP14LeatherStrap - count: 2 # 6u CP14Leather ~~~ 1/4 CP14Leather (2.5u) + - !type:StackResource + stack: CP14ThinLeather + count: 4 # 20u CP14Leather ~~~ 1/2 CP14Leather (5u) - !type:ProtoIdResource protoId: CP14IronBuckle count: 1 # 2u CP14Iron ~~~ 1/5 iron bar (10u) result: CP14ClothingBackBackpackT1 + # Total Leather: 20u (4x thin hide) - type: CP14Recipe id: CP14ClothingBackBackpackT2 tag: CP14RecipeLeatherWorking craftTime: 6 requirements: - - !type:ProtoIdResource - protoId: CP14Leather - count: 8 # 80u CP14Leather ~~~ CP14Leather (10u) - - !type:ProtoIdResource - protoId: CP14LeatherStrap - count: 4 # 12u CP14Leather ~~~ 1/4 CP14Leather (2.5u) + - !type:StackResource + stack: CP14ThinLeather + count: 4 # 20u CP14Leather ~~~ 1/2 CP14Leather (5u) + - !type:StackResource + stack: CP14Leather + count: 4 # 40u CP14Leather ~~~ CP14Leather (10u) - !type:ProtoIdResource protoId: CP14IronBuckle count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u) result: CP14ClothingBackBackpackT2 + # Total Leather: 60u (20u thin + 40u regular) - type: CP14Recipe id: CP14ClothingBackBackpackT3 tag: CP14RecipeLeatherWorking craftTime: 10 requirements: - - !type:ProtoIdResource - protoId: CP14RuggedLeather - count: 8 # 200u CP14Leather ~~~ CP14RuggedLeather (25u) - - !type:ProtoIdResource - protoId: CP14RuggedStrap - count: 4 # 24u CP14Leather ~~~ 1/4 CP14RuggedLeather (6.25u) + - !type:StackResource + stack: CP14Leather + count: 4 # 40u CP14Leather ~~~ CP14Leather (10u) + - !type:StackResource + stack: CP14RuggedLeather + count: 3 # 75u CP14Leather ~~~ CP14RuggedLeather (25u) - !type:ProtoIdResource protoId: CP14IronBuckle - count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u) + count: 3 # 6u CP14Iron ~~~ 1/5 iron bar (10u) result: CP14ClothingBackBackpackT3 + # Total Leather: 105u (40u regular + 75u rugged) # ====================================== # Upgrade Recipes with Material Tracking # ====================================== -# Backpack T1 Upgrade (Precise Leather Calculation) +# Backpack T1 Upgrade - type: CP14Recipe id: CP14ClothingBackBackpackT1_Upgrade tag: CP14RecipeLeatherWorking craftTime: 6 requirements: - !type:ProtoIdResource - protoId: CP14ClothingBackBackpackT0 # Contains 100u CP14Cloth (10u) + protoId: CP14ClothingBackBackpackT0 # Base backpack count: 1 - - !type:ProtoIdResource - protoId: CP14Leather # +20u CP14Leather (2x10u) + - !type:StackResource + stack: CP14ThinLeather # +10u CP14Leather (2x5u) count: 2 - !type:ProtoIdResource - protoId: CP14LeatherStrap # 6u CP14Leather (2x3u) - count: 2 + protoId: CP14IronBuckle + count: 1 # 2u CP14Iron result: CP14ClothingBackBackpackT1 - # Total Leather: 100u (cloth) + 20u + 6u = 36u vs original 40u+6u=46u + # Total Materials: 50u cloth + 10u leather -# Backpack T2 Upgrade (Exact Leather Carryover) +# Backpack T2 Upgrade - type: CP14Recipe id: CP14ClothingBackBackpackT2_Upgrade tag: CP14RecipeLeatherWorking craftTime: 8 requirements: - !type:ProtoIdResource - protoId: CP14ClothingBackBackpackT1 # 40u (thin) + 6u (straps) + protoId: CP14ClothingBackBackpackT1 # Contains 20u leather count: 1 - - !type:ProtoIdResource - protoId: CP14Leather # +40u CP14Leather (4x10u) + - !type:StackResource + stack: CP14Leather # +30u CP14Leather (3x10u) count: 4 - !type:ProtoIdResource - protoId: CP14LeatherStrap # 12u CP14Leather (4x3u) - count: 4 + protoId: CP14IronBuckle + count: 1 # Additional 2u iron result: CP14ClothingBackBackpackT2 - # Total Leather: 40u+6u + 40u+12u = 98u vs original 80u+12u=92u + # Total Materials: 50u leather (20u + 30u) -# Backpack T3 Upgrade (Rugged Conversion) +# Backpack T3 Upgrade - type: CP14Recipe id: CP14ClothingBackBackpackT3_Upgrade tag: CP14RecipeLeatherWorking craftTime: 12 requirements: - !type:ProtoIdResource - protoId: CP14ClothingBackBackpackT2 # 80u + 12u = 92u (46u rugged equiv) + protoId: CP14ClothingBackBackpackT2 # Contains 60u leather count: 1 + - !type:StackResource + stack: CP14RuggedLeather # +50u CP14Leather (2x25u) + count: 2 - !type:ProtoIdResource - protoId: CP14RuggedLeather # 100u CP14Leather (4x25u) - count: 4 - - !type:ProtoIdResource - protoId: CP14RuggedStrap # 24u CP14Leather (4x6u) - count: 4 + protoId: CP14IronBuckle + count: 1 # Additional 2u iron result: CP14ClothingBackBackpackT3 - # Total Leather: 92u + 100u + 24u = 216u (108u rugged equiv) vs original 200u+24u=224u \ No newline at end of file + # Total Materials: 110u leather (60u + 50u) diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml index 0d1c4a4b9f..3a7e2e0205 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml @@ -6,13 +6,7 @@ # requirements: # - !type:StackResource # stack: CP14Cloth -# count: 6 # 60u CP14Cloth ~~~ CP14Cloth (10u) -# - !type:StackResource -# stack: CP14String -# count: 4 # 20u CP14Cloth ~~~ CP14Cloth (5u) -# - !type:ProtoIdResource -# protoId: CP14IronBuckle -# count: 8 # 16u CP14Iron ~~~ 1/5 iron bar (10u) +# count: 3 # 30u CP14Cloth ~~~ CP14Cloth (10u) # result: CP14ClothingBackExplorerBackpackT0 # - type: CP14Recipe @@ -20,15 +14,12 @@ # tag: CP14RecipeLeatherWorking # craftTime: 4 # requirements: -# - !type:ProtoIdResource -# protoId: CP14ThinLeather -# count: 6 # 30u CP14Leather ~~~ CP14ThinLeather (5u) -# - !type:ProtoIdResource -# protoId: CP14LeatherStrap -# count: 2 # 6u CP14Leather ~~~ CP14LeatherStrap (3u) +# - !type:StackResource +# stack: CP14ThinLeather +# count: 3 # 15u CP14Leather ~~~ CP14ThinLeather (5u) # - !type:ProtoIdResource # protoId: CP14IronBuckle -# count: 10 # 20u CP14Iron ~~~ 1/5 iron bar (10u) +# count: 8 # 16u CP14Iron ~~~ 1/5 iron bar (10u) # result: CP14ClothingBackExplorerBackpackT1 # - type: CP14Recipe @@ -36,15 +27,15 @@ # tag: CP14RecipeLeatherWorking # craftTime: 6 # requirements: -# - !type:ProtoIdResource -# protoId: CP14Leather -# count: 6 # 60u CP14Leather ~~~ CP14Leather (10u) -# - !type:ProtoIdResource -# protoId: CP14LeatherStrap -# count: 4 # 12u CP14Leather ~~~ CP14LeatherStrap (3u) +# - !type:StackResource +# stack: CP14ThinLeather +# count: 3 # 15u CP14Leather ~~~ CP14ThinLeather (5u) +# - !type:StackResource +# stack: CP14Leather +# count: 3 # 30u CP14Leather ~~~ CP14Leather (10u) # - !type:ProtoIdResource # protoId: CP14IronBuckle -# count: 12 # 24u CP14Iron ~~~ 1/5 iron bar (10u) +# count: 10 # 20u CP14Iron ~~~ 1/5 iron bar (10u) # result: CP14ClothingBackExplorerBackpackT2 # - type: CP14Recipe @@ -52,15 +43,15 @@ # tag: CP14RecipeLeatherWorking # craftTime: 10 # requirements: -# - !type:ProtoIdResource -# protoId: CP14RuggedLeather -# count: 6 # 150u CP14Leather ~~~ CP14RuggedLeather (25u) -# - !type:ProtoIdResource -# protoId: CP14RuggedStrap -# count: 4 # 24u CP14Leather ~~~ CP14RuggedStrap (6u) +# - !type:StackResource +# stack: CP14Leather +# count: 3 # 30u CP14Leather ~~~ CP14Leather (10u) +# - !type:StackResource +# stack: CP14RuggedLeather +# count: 2 # 50u CP14Leather ~~~ CP14RuggedLeather (25u) # - !type:ProtoIdResource # protoId: CP14IronBuckle -# count: 12 # 24u CP14Iron ~~~ 1/5 iron bar (10u) +# count: 10 # 20u CP14Iron ~~~ 1/5 iron bar (10u) # result: CP14ClothingBackExplorerBackpackT3 # # ====================================== @@ -74,19 +65,16 @@ # craftTime: 6 # requirements: # - !type:ProtoIdResource -# protoId: CP14ClothingBackExplorerBackpackT0 # 60u cloth + 20u string = 80u (8u leather equiv) +# protoId: CP14ClothingBackExplorerBackpackT0 # 60u cloth (6u) +# count: 1 +# - !type:StackResource +# stack: CP14ThinLeather # +15u CP14Leather (3x5u) # count: 1 # - !type:ProtoIdResource -# protoId: CP14ThinLeather # +15u CP14Leather (3x5u) -# count: 3 -# - !type:ProtoIdResource -# protoId: CP14IronBuckle # +16u CP14Iron (8x2u) -# count: 8 +# protoId: CP14IronBuckle +# count: 8 # 16u CP14Iron ~~~ 1/5 iron bar (10u) # result: CP14ClothingBackExplorerBackpackT1 -# # Leather Logic: -# # T0 provides 3 leather, needs 6 total (3 new thin = 1.5 normal) -# # Net 4.5/6 leather (75%) since buckles are main cost -# # Total Leather: 8u + 15u = 23u vs original 30u +# # Total Leather: 60u (cloth) + 15u = 75u # # Explorer T2 Upgrade (Leather Accumulation) # - type: CP14Recipe @@ -95,20 +83,16 @@ # craftTime: 8 # requirements: # - !type:ProtoIdResource -# protoId: CP14ClothingBackExplorerBackpackT1 # 30u + 6u = 36u +# protoId: CP14ClothingBackExplorerBackpackT1 # 15u (thin) # count: 1 -# - !type:ProtoIdResource -# protoId: CP14Leather # +30u CP14Leather (3x10u) +# - !type:StackResource +# stack: CP14Leather # +30u CP14Leather (3x10u) # count: 3 # - !type:ProtoIdResource -# protoId: CP14IronBuckle # +20u CP14Iron (10x2u) -# count: 10 +# protoId: CP14IronBuckle +# count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u) # result: CP14ClothingBackExplorerBackpackT2 -# # Progression: -# # T1 provides 4.5/6 leather (75%) -# # T2 adds 3/6 (50%) for total 7.5/12 (62.5%) -# # Buckles reduced by 16% to compensate -# # Total Leather: 36u + 30u = 66u vs original 60u +# # Total Leather: 15u + 30u = 45u # # Explorer T3 Upgrade (Rugged Premium) # - type: CP14Recipe @@ -117,17 +101,10 @@ # craftTime: 12 # requirements: # - !type:ProtoIdResource -# protoId: CP14ClothingBackExplorerBackpackT2 # 60u + 12u = 72u (36u rugged equiv) +# protoId: CP14ClothingBackExplorerBackpackT2 # 15u + 30u = 45u # count: 1 -# - !type:ProtoIdResource -# protoId: CP14RuggedLeather # +75u CP14Leather (3x25u) -# count: 3 -# - !type:ProtoIdResource -# protoId: CP14IronBuckle # +20u CP14Iron (10x2u) -# count: 10 +# - !type:StackResource +# stack: CP14RuggedLeather # +50u CP14Leather (2x25u) +# count: 2 # result: CP14ClothingBackExplorerBackpackT3 -# # Final Balance: -# # T2's 7.5 normal = 3.75 rugged -# # Add 3 new rugged = 6.75 total vs original 6 -# # Slight overpayment compensates for buckle savings -# # Total Leather: 72u + 75u = 147u (73.5u rugged equiv) vs original 150u \ No newline at end of file +# # Total Leather: 45u + 50u = 95u diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml index c1d61bfba1..f8b18e1352 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml @@ -6,13 +6,13 @@ requirements: - !type:StackResource stack: CP14Cloth - count: 8 # 80u CP14Cloth ~~~ CP14Cloth (10u) + count: 4 # 40u CP14Cloth ~~~ CP14Cloth (10u) - !type:ProtoIdResource protoId: CP14String - count: 8 # 40u CP14Cloth ~~~ CP14Cloth (5u) + count: 2 # 10u CP14Cloth ~~~ 1/2 CP14Cloth (5u) - !type:ProtoIdResource protoId: CP14IronBuckle - count: 3 # 6u CP14Iron ~~~ 1/5 iron bar (10u) + count: 1 # 2u CP14Iron ~~~ 1/5 iron bar (10u) result: CP14ClothingBackSatchelT0 - type: CP14Recipe @@ -20,15 +20,12 @@ tag: CP14RecipeLeatherWorking craftTime: 4 requirements: - - !type:ProtoIdResource - protoId: CP14ThinLeather - count: 6 # 30u CP14Leather ~~~ CP14ThinLeather (5u) - - !type:ProtoIdResource - protoId: CP14LeatherStrap - count: 10 # 30u CP14Leather ~~~ CP14LeatherStrap (3u) + - !type:StackResource + stack: CP14ThinLeather + count: 3 # 15u CP14Leather ~~~ CP14ThinLeather (5u) - !type:ProtoIdResource protoId: CP14IronBuckle - count: 4 # 8u CP14Iron ~~~ 1/5 iron bar (10u) + count: 3 # 6u CP14Iron ~~~ 1/5 iron bar (10u) result: CP14ClothingBackSatchelT1 - type: CP14Recipe @@ -36,15 +33,15 @@ tag: CP14RecipeLeatherWorking craftTime: 6 requirements: - - !type:ProtoIdResource - protoId: CP14Leather - count: 6 # 60u CP14Leather ~~~ CP14Leather (10u) - - !type:ProtoIdResource - protoId: CP14LeatherStrap - count: 12 # 36u CP14Leather ~~~ CP14LeatherStrap (3u) + - !type:StackResource + stack: CP14ThinLeather + count: 3 # 15u CP14Leather ~~~ CP14ThinLeather (5u) + - !type:StackResource + stack: CP14Leather + count: 3 # 30u CP14Leather ~~~ CP14Leather (10u) - !type:ProtoIdResource protoId: CP14IronBuckle - count: 6 # 12u CP14Iron ~~~ 1/5 iron bar (10u) + count: 5 # 10u CP14Iron ~~~ 1/5 iron bar (10u) result: CP14ClothingBackSatchelT2 - type: CP14Recipe @@ -52,15 +49,15 @@ tag: CP14RecipeLeatherWorking craftTime: 10 requirements: - - !type:ProtoIdResource - protoId: CP14RuggedLeather - count: 6 # 150u CP14Leather ~~~ CP14RuggedLeather (25u) - - !type:ProtoIdResource - protoId: CP14RuggedStrap - count: 12 # 72u CP14Leather ~~~ CP14RuggedStrap (6u) + - !type:StackResource + stack: CP14Leather + count: 3 # 30u CP14Leather ~~~ CP14Leather (10u) + - !type:StackResource + stack: CP14RuggedLeather + count: 2 # 50u CP14Leather ~~~ CP14RuggedLeather (25u) - !type:ProtoIdResource protoId: CP14IronBuckle - count: 6 # 12u CP14Iron ~~~ 1/5 iron bar (10u) + count: 7 # 14u CP14Iron ~~~ 1/5 iron bar (10u) result: CP14ClothingBackSatchelT3 # ====================================== @@ -74,16 +71,16 @@ craftTime: 6 requirements: - !type:ProtoIdResource - protoId: CP14ClothingBackSatchelT0 # 80u cloth + 40u string = 120u (12u leather equiv) + protoId: CP14ClothingBackSatchelT0 # 40u cloth + count: 1 + - !type:StackResource + stack: CP14ThinLeather # +15u CP14Leather (3x5u) count: 1 - !type:ProtoIdResource - protoId: CP14ThinLeather # +10u CP14Leather (2x5u) - count: 2 - - !type:ProtoIdResource - protoId: CP14LeatherStrap # +30u CP14Leather (10x3u) - count: 6 + protoId: CP14IronBuckle + count: 3 # 6u CP14Iron ~~~ 1/5 iron bar (10u) result: CP14ClothingBackSatchelT1 - # Total Leather: 12u + 10u + 30u = 52u vs original 30u+30u=60u + # Total Materials: 40u cloth + 15u Leather # Satchel T2 Upgrade (Leather Optimization) - type: CP14Recipe @@ -92,16 +89,16 @@ craftTime: 8 requirements: - !type:ProtoIdResource - protoId: CP14ClothingBackSatchelT1 # 30u + 30u = 60u + protoId: CP14ClothingBackSatchelT1 # 15u (thin) count: 1 + - !type:StackResource + stack: CP14Leather # +30u CP14Leather (3x10u) + count: 3 - !type:ProtoIdResource - protoId: CP14Leather # +20u CP14Leather (2x10u) - count: 2 - - !type:ProtoIdResource - protoId: CP14LeatherStrap # +18u CP14Leather (6x3u) - count: 6 + protoId: CP14IronBuckle + count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u) result: CP14ClothingBackSatchelT2 - # Total Leather: 60u + 20u + 18u = 98u vs original 60u+36u=96u + # Total Leather: 15u + 30u = 45u # Satchel T3 Upgrade (Rugged Transition) - type: CP14Recipe @@ -110,13 +107,13 @@ craftTime: 12 requirements: - !type:ProtoIdResource - protoId: CP14ClothingBackSatchelT2 # 60u + 36u = 96u (48u rugged equiv) + protoId: CP14ClothingBackSatchelT2 # 15u + 30u = 45u count: 1 - - !type:ProtoIdResource - protoId: CP14RuggedLeather # +50u CP14Leather (2x25u) + - !type:StackResource + stack: CP14RuggedLeather # +50u CP14Leather (2x25u) count: 2 - !type:ProtoIdResource - protoId: CP14RuggedStrap # +36u CP14Leather (6x6u) - count: 6 + protoId: CP14IronBuckle + count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u) result: CP14ClothingBackSatchelT3 - # Total Leather: 96u + 50u + 36u = 182u vs original 150u+72u=222u \ No newline at end of file + # Total Leather: 45u + 50u = 95u diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/belts.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/belts.yml new file mode 100644 index 0000000000..ad00ef46d9 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/belts.yml @@ -0,0 +1,34 @@ + +# ================ +# Leather belts crafting + +- type: CP14Recipe + id: CP14ClothingBeltQuiverRecipe + tag: CP14RecipeLeatherWorking + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14Leather + count: 2 # 20u leather + - !type:ProtoIdResource + protoId: CP14String + count: 4 # 20u cloth + result: CP14ClothingBeltQuiver + # Cost: (20×1.2) + (20×0.3) = 24 + 6 = 30 copper coins + +- type: CP14Recipe + id: CP14ClothingBeltPouchPotionsRecipe + tag: CP14RecipeLeatherWorking + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14Leather + count: 1 # 10u leather + - !type:StackResource + stack: CP14Cloth + count: 1 # 10u cloth + - !type:ProtoIdResource + protoId: CP14String + count: 4 # 20u cloth + result: CP14ClothingBeltPouchPotions + # Cost: (15×1.2) + (20×0.3) + (10×0.3) = 12 + 6 + 3 = 21 copper coins diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml index 745a72ed0e..2afe4d7849 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml @@ -2,180 +2,31 @@ # Hide # ================ # Crafting Recipes -# Leather Processing -- type: CP14Recipe - id: CP14ThinHideRecipe - tag: CP14RecipeLeatherWorking - craftTime: 1 - requirements: - - !type:ProtoIdResource - protoId: CP14ThinAnimalHide - count: 1 # 10u leather - - !type:StackResource - stack: CP14SaltStone - count: 1 # 10u salt - result: CP14ThinLeather - resultCount: 2 # 2x thin leather (5u leather + 5u salt each) - # Cost: (10×1.2) + (10×0.4) = 12 + 4 = 16 copper coins - -- type: CP14Recipe - id: CP14HideRecipe - tag: CP14RecipeLeatherWorking - craftTime: 1 - requirements: - - !type:ProtoIdResource - protoId: CP14AnimalHide - count: 1 # 20u leather - - !type:StackResource - stack: CP14SaltStone - count: 2 # 20u salt - result: CP14Leather - resultCount: 2 # 2x leather (10u leather + 10u salt each) - # Cost: (20×1.2) + (20×0.4) = 24 + 8 = 32 copper coins - -- type: CP14Recipe - id: CP14RuggedAnimalHideRecipe - tag: CP14RecipeLeatherWorking - craftTime: 2 - requirements: - - !type:ProtoIdResource - protoId: CP14RuggedAnimalHide - count: 1 # 50u leather - - !type:StackResource - stack: CP14SaltStone - count: 4 # 40u salt - result: CP14RuggedLeather - resultCount: 2 # 2x rugged leather (25u leather + 20u salt total, 12.5u + 10u each) - # Cost: (50×1.2) + (40×0.4) = 60 + 16 = 76 copper coins - +# Hide Crafting - type: CP14Recipe id: CP14ScrapHideRecipe tag: CP14RecipeLeatherWorking craftTime: 2 requirements: - !type:ProtoIdResource - protoId: CP14ScrapAnimalHide - count: 3 # 3x scraps (15u total) + protoId: CP14ScrapLeather + count: 3 # 3x scraps (9u total) - !type:ProtoIdResource protoId: CP14String - count: 3 # 15u cloth - result: CP14AnimalHide - resultCount: 1 # 1x hide (20u) = 24 copper coins - # Cost: (15×1.2) + (15×0.3) = 18 + 4.5 = 22.5 copper coins + count: 1 # 5u cloth + result: CP14Leather1 + # Cost: (15×1.2) + (5×0.3) = 18 + 1.5 = 19.5 copper coins -# ================ -# Leather Crafting - type: CP14Recipe - id: CP14ThinToNormalLeatherRecipe + id: CP14ThinToRegularHideRecipe tag: CP14RecipeLeatherWorking craftTime: 2 requirements: - - !type:ProtoIdResource - protoId: CP14LeatherStrap - count: 2 # 6u leather + 6u salt + - !type:StackResource + stack: CP14ThinLeather # 5u + count: 2 # 10u CP14Leather - !type:ProtoIdResource protoId: CP14String - count: 3 # 15u cloth - result: CP14Leather - resultCount: 1 # 10u leather + 10u salt - # Cost: (6×1.2) + (6×0.4) + (15×0.3) = 7.2 + 2.4 + 4.5 = 14.1 copper coins - -# ================ -# Straps Crafting -- type: CP14Recipe - id: CP14ThinLeatherStrapRecipe - tag: CP14RecipeLeatherWorking - craftTime: 1 - requirements: - - !type:ProtoIdResource - protoId: CP14ThinLeather - count: 1 # 5u leather + 5u salt - - !type:ProtoIdResource - protoId: CP14String - count: 4 # 20u cloth - result: CP14LeatherStrap - resultCount: 3 # 3x straps (3u leather + 3u salt total, 1u + 1u each) - # Cost: (5×1.2) + (5×0.4) + (20×0.3) = 6 + 2 + 6 = 14 copper coins - -- type: CP14Recipe - id: CP14LeatherStrapRecipe - tag: CP14RecipeLeatherWorking - craftTime: 1 - requirements: - - !type:ProtoIdResource - protoId: CP14Leather - count: 1 # 10u leather + 10u salt - - !type:ProtoIdResource - protoId: CP14String - count: 2 # 10u cloth - result: CP14LeatherStrap - resultCount: 4 # 4x straps (3u leather + 3u salt total, 0.6u + 0.6u each) - # Cost: (10×1.2) + (10×0.4) + (10×0.3) = 12 + 4 + 3 = 19 copper coins - -- type: CP14Recipe - id: CP14StringedRuggedStrapRecipe - tag: CP14RecipeLeatherWorking - craftTime: 2 - requirements: - - !type:ProtoIdResource - protoId: CP14Leather - count: 1 # 10u leather + 10u salt - - !type:ProtoIdResource - protoId: CP14String - count: 8 # 40u cloth - result: CP14RuggedStrap - resultCount: 3 # 2x straps (6u leather + 5u salt total, 1.5u + 1.25u each) - # Cost: (10×1.2) + (10×0.4) + (40×0.3) = 12 + 4 + 12 = 28 copper coins - -- type: CP14Recipe - id: CP14RuggedStrapRecipe - tag: CP14RecipeLeatherWorking - craftTime: 2 - requirements: - - !type:ProtoIdResource - protoId: CP14RuggedLeather - count: 1 # 25u leather + 20u salt - - !type:ProtoIdResource - protoId: CP14String - count: 3 # 15u cloth - result: CP14RuggedStrap - resultCount: 4 # 4x straps (6u leather + 5u salt total, 1.5u + 1.25u each) - # Cost: (25×1.2) + (20×0.4) + (15×0.3) = 30 + 8 + 4.5 = 42.5 copper coins - - -# ================ -# Leather belts crafting - -- type: CP14Recipe - id: CP14ClothingBeltQuiverRecipe - tag: CP14RecipeLeatherWorking - craftTime: 1 - requirements: - - !type:ProtoIdResource - protoId: CP14Leather - count: 3 # 30u leather + 30u salt - - !type:ProtoIdResource - protoId: CP14LeatherStrap - count: 2 # 6u leather + 6u salt - - !type:ProtoIdResource - protoId: CP14String - count: 4 # 20u cloth - result: CP14ClothingBeltQuiver - # Cost: (36×1.2) + (36×0.4) + (20×0.3) = 43.2 + 14.4 + 6 = 63.6 copper coins - -- type: CP14Recipe - id: CP14ClothingBeltPouchPotionsRecipe - tag: CP14RecipeLeatherWorking - craftTime: 1 - requirements: - - !type:ProtoIdResource - protoId: CP14Leather - count: 1 # 10u leather + 10u salt - - !type:ProtoIdResource - protoId: CP14LeatherStrap - count: 3 # 9u leather + 9u salt - - !type:ProtoIdResource - protoId: CP14String - count: 4 # 20u cloth - result: CP14ClothingBeltPouchPotions - # Cost: (19×1.2) + (19×0.4) + (20×0.3) = 22.8 + 7.6 + 6 = 36.4 copper coins + count: 1 # 5u cloth + result: CP14Leather1 # 1x hide (10u) + # Cost: (10×1.2) + (5×0.3) = 12 + 1.5 = 13.5 copper coins diff --git a/Resources/Prototypes/_CP14/Stacks/materials.yml b/Resources/Prototypes/_CP14/Stacks/materials.yml index ea5706f7a5..5f49f7027c 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -118,8 +118,22 @@ maxCount: 10 - type: stack - id: CP14SaltStone - name: cp14-stack-salt-stone - icon: { sprite: _CP14/Objects/Materials/salt_stone.rsi, state: salt1 } - spawn: CP14SaltStone1 - maxCount: 10 + id: CP14ThinLeather + name: cp14-stack-hide-thin + icon: { sprite: "_CP14/Objects/Ingredients/hide.rsi", state: thin_hide1 } + spawn: CP14ThinLeather1 + maxCount: 5 + +- type: stack + id: CP14Leather + name: cp14-stack-hide + icon: { sprite: "_CP14/Objects/Ingredients/hide.rsi", state: hide1 } + spawn: CP14Leather1 + maxCount: 5 + +- type: stack + id: CP14RuggedLeather + name: cp14-stack-hide-rugged + icon: { sprite: "_CP14/Objects/Ingredients/hide.rsi", state: rugged_hide1 } + spawn: CP14RuggedLeather1 + maxCount: 5 diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml index cbb4b40683..61736c3190 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml @@ -171,37 +171,36 @@ # Hide - type: cp14TradingPosition - id: CP14ThinAnimalHide + id: CP14ThinLeather faction: Butchers reputationLevel: 1 uiPosition: 7 icon: sprite: _CP14/Objects/Ingredients/hide.rsi - state: thin_hide + state: thin_hide1 service: !type:CP14BuyItemsService - product: CP14ThinAnimalHide - count: 1 + product: CP14ThinLeather1 - type: cp14TradingPosition - id: CP14AnimalHide + id: CP14Leather faction: Butchers reputationLevel: 2 uiPosition: 7 icon: sprite: _CP14/Objects/Ingredients/hide.rsi - state: hide + state: hide1 service: !type:CP14BuyItemsService - product: CP14AnimalHide + product: CP14Leather1 count: 1 - type: cp14TradingPosition - id: CP14RuggedAnimalHide + id: CP14RuggedLeather faction: Butchers reputationLevel: 3 uiPosition: 7 icon: sprite: _CP14/Objects/Ingredients/hide.rsi - state: rugged_hide + state: rugged_hide1 service: !type:CP14BuyItemsService - product: CP14RuggedAnimalHide + product: CP14RuggedLeather1 count: 1 diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml index 5714566937..f473161276 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml @@ -77,17 +77,6 @@ service: !type:CP14BuyItemsService product: CP14Lighter -- type: cp14TradingPosition - id: CP14SaltStone5 - faction: DwarfMining - reputationLevel: 1 - uiPosition: 1 - icon: - sprite: _CP14/Objects/Materials/salt_stone.rsi - state: salt1 - service: !type:CP14BuyItemsService - product: CP14SaltStone5 - # Rep 2 - type: cp14TradingPosition diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide.png rename to Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide1.png diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide2.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide2.png new file mode 100644 index 0000000000000000000000000000000000000000..ac82baa1a933ea35aae82d87e8db9892aa80524a GIT binary patch literal 2464 zcmb_e3vd%f7`|!=P%L(YVx^$x;ZzYW_egR{ZV2>|LRy;wHKi?xdb!&)C&^v7yEbW& zhmshz9CnUiXi<4=ywcKvmyyW4D&@# zp;qY5VR<=d9D0nDx29rbZVF2P{bg{ozi!Z5lMaz(W2DGLE252$j9!h_6GNOPDTO^D4<0H?`{ zN0tLUm735)8KoH`joworN`f3#hhH`UI5`bCFjzGUPBJ)Y@sK1-THrN;f(^0@>Xrr3 zS9UqnhLbiOYPPYI`7cnY8G+NdtAYid^~p+*g8_>{t{4y@sTf0}X=F3xfUH2rke#WM zh1<<$Nvg(4Jjil7Fc`B@6a|(P7@LXaD4gL;Hr#AA+i@EJX53~ro9!0f#@M{pp7~Ch zFVQR8Ghcx7ITK~00ByxNE6?B-VD{oRhBo88o%90A3`i4i@0mYd5#iF}0@rOvUvRo4 zSeK~6VwH8Ti2K3x?p8oVJ5|7PysmBs#_MGT0@mFvULgb57D1QUupdC9|55HPm@50U zFsFdDVwkO~%8B?l@+wz)73x6nd3~G@r)+@60cSSh90LTL_6a=gwOav0dV4~@oVpdK zDG$Zy^0P2K^1B}D-D&0hoKy_pUP)lrAI!BW@t<|L;#&Iuf+6%BvP)sa-^JHCcG+$U z3)$HPw`jc?JsjXi^mqXh%##8SkNbMfNJNku-pg{Pc?v6kT}tH)n3%MEc0%%?<{*kvhOxqaf~Q%g!^#E+c2 z0~vCP82j0#J{TzR@*N)Xz1s)&wM!LEo8A2`~KPs zDTiEkV=Q%N;YD%A#?;hbhy8Xkd&!hdpX~l@dfP=@`GqMeqT~0xGTE(Qw_C%r-)+vr z2G6ggjwEin(=_IZ;FOU@VX-vtt>dG=tZJ+>%|nK}TNaTIWv^c^EG%7>`%J-WMkFWK z{pQV&Sg}uJV_a0t(Z^D9^#ePyAKlPey<%s>8s~Ej39eh;n7Vn#*>93hoqhMfmehSeRQ5gfT}3aX zdGj9=-pSur*l21nOj>)xHa;V@BWaxBV|%z`p?&UFBndU`+wkqdaQ$uyX)j;~Y@gbi zoxHB3{mkBFxwn0}=c_?*n5)>|8_lUkhHkyJHK%sB&^*@gamEvM`Hi<5RyQ>*dUd&P z^VwBZuibrc)7NRpoblDY#iVo7Tehu`onYo E1cV4~u>b%7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide3.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide3.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc075865f102cddce255d88a98c7a07439c8ce4 GIT binary patch literal 2570 zcmb_e3se->86F-gY{fM31(up&Xd6*x=dllVCoTk75GsoXmV|hMGCOmZow~a--5J=0 zXoVm#sEtWZjuPbPN!s{GG$F)15TZt#M4?fOMnSPQqzWg9B!=4h3cbT)k7-TK@pR5S z?%etA|Nr0rfA`+0U7WihN;6A?AV^epmNgGPQT2+L2=8)5#SnZ%N?A|H2=bGu>J@_2 zH$)@I#AgM2p;BneVK~vFWqHv7v;mI<(Fig>B_Offa-g6NP$GCO*kH?k3>A0__PD`D z+N5;g60$0MAipBl&Q&bu%siHojLr`*(0~UhEE@2*y)qN9U?X-J*jBp<3>|?e%Pm-{ z>JTloEk@HtA3)7o3g<|YMw851mg0Ddb|#`UN$UxUf+tRy8Pde)jp*2cL3cjh$>dox z$DF}83+7T3i6IET->>!Sw4$$spv-17LDB?G;}C(% zT%sb%F7XFU2S0z$0nDw<7W8q)SUjGf3t7o1gEYnxa!0gmFP8w32V}9-$AOG87-qc6 zMq<)^fK^1FT@>Bpm0CO=GD;h@G&<*T!OM$&IpMYez{)DXg2Ad8aMFmA20KYIqye7u zDA*uJp*E2hoaMJeO*m;%p?VXe(|->NHN&$Cdsi^eF;3CvVIg6`!QHFYQZ39tsw9Wujd>*M;dUmk*9EnNe^%qn2or}07xT8 z0l-ng@m7&5RVzC_o`>UE9c7{borJSVoDnwwy#qHHX+6%FNe7_xfYfp3asP{a0-Rc` z`=0Hn6Hb)`lO@QoSmk3gA|L#AtmPKa5fv~jr>fh6acWrskBxN;cgVnxV=!vg?*h>1 z|0wq;OctGrpY?&%5}2*K%8B@);AOV#E};Y7>2R`6oH79#2drL)vqr$!8l82&c%#R<@LQy>nXGJR zNk3LoyYb?MdgA;Zq_${!-v@RsW-|n}2ChxE<(Jd?)NP3eV>05F)IT)i_f4<&Bfi*m znYC4|`-=h*%9F3Z@TFvp6E*Fft6$h&?W%7Z`cp)OHm5XQcYgnhrkQg!?vSPl(b4_P z!t0-04qw5B3|%eNStx9o2JL7^W=~jK)!$6+t^Z~G+Uh~;fws+|+|-_LR=4i#J$NPd zrA--!BjTn@TUtJii9=deWLCYprZGCCy)(R^ZvD2|I^+DKAFnPtJ+z@}9hU9D#6XDk0caI=3mZExJ+1Q&()0{->{0o`aI*;6kbR}FK zp0FXbW>>@xsq=S>cSWU#-AeeXewNVRdg%1BUwydp-1?{u?UzoZ=rgxWX^ZlvNN0T6 z=fB>wV{Xop-#EJaKNtu(do(gV|JXx#<%=4yAf+%cT($nE9hIjh=f6p5u8L{3&)cUB z#de>&QvGt*wc^OfPOW+>tMXj^*=r$>z_MWl<5c;i#`ey?p82@#`e09T zW6{YiOpK}Sa+!P)7Pu%se&&mj8(xkY+TNXgdGM(Nk?(7eQro8H=W`DKxxpn4XfFMu zdM~#~Q@Q)#t$mZ|7XO1Y>nf6)iN>(|rL5R#Uq2E)CH}da@7%0AKvkur7U=(#p-lIw Pe{0zpxz;z+il6>BNs_7; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/meta.json b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/meta.json index 76257a8f61..76be72752b 100644 --- a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/meta.json @@ -6,18 +6,36 @@ }, "license": "CC-BY-SA-4.0", "copyright": "Created by PhantornRU (Github)", - "states": [ - { - "name": "thin_hide" - }, - { - "name": "hide" - }, - { - "name": "rugged_hide" - }, - { - "name": "scrap_hide" - } - ] + "states": [ + { + "name": "thin_hide1" + }, + { + "name": "thin_hide2" + }, + { + "name": "thin_hide3" + }, + { + "name": "hide1" + }, + { + "name": "hide2" + }, + { + "name": "hide3" + }, + { + "name": "rugged_hide1" + }, + { + "name": "rugged_hide2" + }, + { + "name": "rugged_hide3" + }, + { + "name": "scrap_hide" + } + ] } diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide.png rename to Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide1.png diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide2.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide2.png new file mode 100644 index 0000000000000000000000000000000000000000..2184de233ffe4caa36f826f2cb1991116a3799ce GIT binary patch literal 2605 zcmb_e4Nwzj8eS-HYQs18+LSCP_{T!#p03!lP6Ot}={BNlC$Q5+g|zAW+fgkZ3RJ5Eo2YFmNK{;++yN zIN*Rq+9Fg+Is{Oih{5g*nstbiIswHnFYUw#1s;fL9LO?3oU_tZG47mYFs_2La}G%a zSR#mZ+5|}uZNg8O4u1Zg1E8(R6!h^xE_Qp+g(zjYK^T*QJP<9KeNGN5;6$O)#c)|} zKyyJL8Yh+M;%G^5nFXO@DpUDWlwmSiLBjFR@(xz;hza)%;0(0H=@5`LHHs&rxY~^4 z6s`tm5&;_c1k@z3yw!Ir&0*(PY%nF`oDUF6ustBtJWjM})CRgXTf;dnoQ6%!J>ppt46gdl?Bxj8ZD~UstKIb;J8+; zo*KX0#e=CuS3I!AX&c28L@&}JK3t>;qfY^^4_%{SGZp#|sB6rGhEgU|glek%9)|j)tc;CzlyP9K#E^#%=GRr?kMr=r zx%B@F1`Di^6BUO2u=vKm-M5;8M2>fXB|6XyZVuojxV>-=ppy%19iue$?x^&hG5tli%L|Q^>KYjZLaZX)4UyvUy&OF6rtN4c1c+x<6x9r+q_q_Df z6Q`uX41df`=vq(Y(zapzmT&jogPHwNSsBYtcR?L9hHmWKcT$tqQY8-&hW=3qC2l7_ zC}{5Q9n0g}GOYOi=Ut6ig_}Q3Y)jl!(muDKrWINho+-bGt~~lwd%@MFJylt+uh}xM z{hR(3mGyi^!^&-%katgd5B07p?R%zt)*I^V>iU?j7h}3+HZOAXbsI02erltxO*5pv z?-;cVzSi7*xZAt+gU|J$4Ij^IO$^(A@7vBRM;4Zz!@rdexK{P7Y?_0W|E}@S`HtSb zJ7Xa@=Effm{PS1~_flTF?d_6RFReOK69Pc{{=38LIs441{u#x)n>3v-r(MpQ=RP~< zmZ%#&UETX7>b_JP?}Wofm)y+0(8H_7(xbPYJLWr4e|>cC;qZ|^juiT{d)Tx3gar}# zi?B@GOnDJ^V#LU{e;hyil*ri9kR&%Jf3YkuwCm>nqhd39?f^ZeSopUpp>HWJge zRkqo^A-*)nmATK@Hr(*rr<1}Bsk4ha!yKyl;Y%vD{lmiY3|#i=Z(huuqgV%h{Mgro zCUv`1k+=>nzZRUSpa-=?QsgcyA-bnAppyMsg z5f_KL_N@6(H8K0SCSlcKuY!_K|&NpWN77(Ik^bpQ^J#CE=^Zy22o-8?Y(PDZEMy8cS>=1p;~Ssx}= z;>KHF?@t{~I{sZxIuzQrSpUvz5oh#OY17wVu5oWT^U?GzbPe21dbjGYa!-0%78~z7* Cx2hcg literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide3.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide3.png new file mode 100644 index 0000000000000000000000000000000000000000..e0863d338ac4d733dbe6794d6a21321f2c772a25 GIT binary patch literal 2669 zcmb_e3se(V8XgL=3RTy31z&5&QTl?(%!E9r#PCQUpy6fESVfr3OdyhEVlom)E2dTv ztkR;TR1{Gug0$3vT^AKWm*cV(yLJH&pjOycWefEI3$?CTcf#w~u6-QO=G>XNbLYGN z|NYlg?LAOsfK%jw=K`Vr6RBZ{P zQw=JIm0sqE){u@gQc6Mc#b8hd&KWS#ECFVijAk32A%jNj;#}V~j6mQBgiVt{AuflY zRvin5F;*Is@-Uc0Q9dY^@(7HiFupzjGg|fiZ(F zi-e9@&&nW<>Szom%Y<38ZA>RlF(iYqAQ%sI#WVt>$O)Wfz12A4oFWn0NSkOgYvZuk z1lE$uu#7F0`5Ds_pMT_l(^jpX@bOqKCewrq8>>v`!Wa|ev1pqn(?TQhw2fJBC23_k zM{}Vo8Vep~r3sd?Y8b{io~hVz${=6FX&J<2O$ehR7!_(z z6i0J<6zy=eMLL(M) z3ItBbh=(yo#>zS7*aeQTP^u_SkGtxN2&lPNLO{sAkvjqnu5lL z4UbXaw?!~&)}BgpMt>pQqc9tzXYGWQ4oTtE`qgqmevZ72NdIN(LLG?(5@HmVkSHfU zCJ=JT(^0TMEJX!;iAX}}#p9v>gt}ORiSa-YjtR!g?@6eS$x5aY<`kOSD-r0)gZXWh z_`i90>{|N&1%tSD$k7Tzep-AZ-yYdbxkQc(aa**jJ8?L0FB8WLZRT{ca)-xFMQ;TF zxW5&t2+?S_+$@YqC6)7<M1wh38-@lyv`<`P##l#1C?!+<>aiX)GDidPpPKQ ztokA><~>J8qJ`*hNw_lerJ45Wo51<9oU)wwnv=W{{XyO(Bl-M%gEx_9I3z=o2qw|7(@ltX})*}nK_Pj;`n%6nZ$UE-FDgR4bR z`^s+gH|nqYANMLRpIy|Py`!~t(Fx%{?M-tg(<;A$;ch}>z8 zk?-mXXz40!3!dFXEIIc@g>Ffdtn$JurE}djW*PEz)u-)US#S4lniZtJez$9I-h%z! zwUuk$_#v*=z2n`)!l;X_ucaH3ORrVO4G6whiO#A-%2y{}8CLJhx)o4R8S!dPVwK2W z6wx`^nb7wkoIHKTfBc&Z+3R`;5N}*&56)eB^P5Er=8B{%y$u!JjyXZwoLwi5E_^57 zSo!6N?z+~{*u##&yMF6`M>Xbsq;*?SxzBUHeD^<##YvOCetFNFJ3WOyyNmYbrFvbX zcI5gdfekC${&*TZ(0=KFIX80^<$moFeqo=gCT<|q?+KAXHt659%~5c$TUBlY!v-&%6MTmFycq~n)|H{4!)c?jp)!{Jq5eYU+(e{Vi~($}e|o9V#Y z`FUad{Qb*6%+L9AYUe3qd!MH7Zf->Gt%CjqH}t*|+gj&VQ+Q%=>>F}p;I_lP=^~GH z8vP&M{PN)a{_lJu=y2@x3CBIJBMn1y!pPFUWq%%5l;7eMicfaCe{{9>yN2EQc+U^@ ziyEU3KF9-@l0Dsf3i{snV3!~IuV@BVw|vDoFz>eg`f?uDeVBP(l& zK!NDoon)WjgpS$Ed;StKWpmE^l&9xY!KGD+XAXY#i3jxAJRiZ%)1~tACUv*m4Xa9e U`rphh*B`=2Wwhes(Bw`31wb3$%m4rY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide.png rename to Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide1.png diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide2.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide2.png new file mode 100644 index 0000000000000000000000000000000000000000..6ab8bd2242f9542b2e176cf312530b8308eba3bb GIT binary patch literal 2340 zcmb_eYfKbZ6dph*C{&4B46Sh-s6goK%q;sHS+~3@7#Aq6x)oBGow*BJ*qLQ#U;!0{ z#>Q8rsfYwI);1`qR>j&M#wYlosHxbrskJSliAre|Q?SN&?=0*_TYSWHGmkrWzH`p^ zopbJ;U6q|VJ8W#^SOh`BGSX9X;2o9E;2?MvtEz_JEyS7ro`@jhCd#KD($qW!L4sD= z%@)aGnoF~SL&0!@6(}kkPKZX3L}P`MVT*x;T0xLj*2X@)A>l^J0|OLn;tim)$AZ1s;_>GFG8X zGGLJEum*?I=av^o@&q$RR4`70QjoGH50GPhIA@uw#1ouj2~YwYfR{vwrF>Xtkst|T zk?<7PzSmC#fVnl9d@)Al;&Avvh*DZPlrfT!QPHBg(g}zhAPQwJ7NnI!no+VEC!OK~ zj3l_sf>7eERJNBgs?;cyXzW5e&k1fZ?lA+9%1FR~!K$foQiGFfGfC2<8XoZ!9FW6M zlfc<+m5)PpIH{ANDh*90JOPD0!!Z)`TrkJdHo@g!pkTX$DFlR*FT_w^8tD|FL~y~t zkX?d@g~>!`@S?=&L=4_;m(OR`Sz1Kd=Wrs_PDS2r> z@`96Ff=;)KuvnEND`Flf9T}C_QBN1p3@dlH0b}K|0;phk+CEwaUP!^Py}JlNr_U(& zFiaF|lACdXq(Ydj=e85^H1Z--{%q<>EwJi!ss!Ao(W-HkRi(!nQVDR5C0QM*x7ln! z%#?;!X=$a#+kP)YeI%`H5yKY(xK|R`%ZqujPW*2jMqNw)pBO^kA%{DR z_;>Sp-aWRP!a{nc;1(?peIEz-;QPD)9_GmfKOP5;KRk#a{>d4sNoLE6>kY=DiSNGA zX$*NSTye55j7W|gHzzjCf~^Qud_HMa@8xK-Hlp;C+UzkgQ&$I;Iwwf2Xkb!A(xkRc z9|kYlP>)XPSN9sowrwHx)-HWs&#kKc#Sd2=pPnD=?mV>k;@Nu-4&PQxKfSlFrNdA* z5HRF-7kLzLbXR%M6=mGDyt)&}5;xIyPkSOK3>{NYzr)<0dply|5%(*-pSG;6t?yQ^ zZfWul{ibQpL?j+p9o5v0tBHHFbb7O2?oT=MJ3a_J#|Q1)*WK9Ij48&r*rQZJ%TVJl zbNV8?0>T5sTeD|Q`(jPZ*E9c4+*)j!OtnN4#rMC|>4VFfYw~7*-`gxR4cje?u&u?J zX^B_Yt^-TAj4w%2tl#^6vUujlQ5q;(;*#pY$mKV;hBp`w2K@O~)s-7}*3@?OSsLng zzt0E6?)*w?h_KXDRc;u%6m2yA9JhN}F4xz%nG3w!kbm|;=%EXx)28$s=xo}*czt_& zblt$*fYzz&PHi(>bsbX;ge+nlhrpd&|JYz8(7$}v!;|}>5Mt%R-x|vUZ|?qK&=|dR e`K-66^^QLcUca;%Hxlyyn2fZ{)LqF1wf_LND=p~& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide3.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide3.png new file mode 100644 index 0000000000000000000000000000000000000000..8f2ceeab29125b19dc466824e6ce920a7fbd5a9b GIT binary patch literal 2377 zcmb_e2~ZPP7+yROa8Ly6fq>g}TF=cMsW0)J1U}8YgJ^l3RY!QJjT8R$Y|>|PBVMFef$02|NX~%o6p82 zjtUM64}u^l*qmUpf;;Rv1N^~N&dF&4w?J3IBpHG_hj~svXw{lt5aeGZB&8@RmJcab zbf{=fWO!AU!v)X~G%PmDMY9>a0yBJ?;4~t)s;UuK;EYJJ#)4a1@qD_FkR$OEauSo+ zoD9~$A+a&=uq+A?ICzDIvmAD(Ol27nFE0hgo@oq$y$~hCh{Smu!YP(nXJsZv7#^oy6HFt7&AbGw@_Y(iO!;VVK+P zR=J~9qLhXa27>{^NsJ^>fI#JJr$T3;PPtzjgNc_}NpLBG=!89tG$UpzMg&N0iNWFW z(K_YUJb{d1S+olyRJbQ5FOXw>I9H}*_d4fTjJNX+-l@m{OZc#^bWsuIbnzwBzSqw= z0J*hTd_G>N#o_R|kd+a$K^UzGc_CU(%69RXm6yd#iRDMk1~U73qH$625>G3llq8Dw zwn~j_lMItu6$uYW7Mz^umIpp#z?*1=HzJ^F8Wh)}xF!k5DO>}N!2}rKEl`Wd3AXHK zp?Vb8d!T9!r7=7Q1wF&j3jJCz$5J*?a?l`P!9l0-n9G@lz`it6@uFRnfMcL8+N;81 zq0CNMp`9#mHW?8Rvq}&+N~hJUagx!X3{FO)(FQe#(rR9dG7QNu8eGGW21A>@Nn|rU zm2I=+YAJUYH2kKm^50H({MK2M(Y@z-e*5n62Q`;?QhNFS#X|~pb`Wb z6f3)RMNHslwT|op?Ck=IWNKdDQ5#SiCwY`(aaNBTY&ILOZ43Qb={l4o zk_auO)={Lkt^M9cdTUzQblRE5gS`?%-aeQ&>%{-o;e~7I{|g55?2s)ThW)$wyzidb zO+g{OQ(%ks41FI5@ZkHr@J^5?34A=d6_6zm)Gp0zic3l8`ouA^SXJuc!_3_iExjlcb7~)^HbY5jwzd|S;O5Jw< zbGiTG!o<^>VEFILA)V$-*u34Zd!Dp=#1DOT9ea3Shbu3pBH}yzz08uCn;W1(<9mD& zlv-L4bf&&AWQCOpxRiLN_n7{HgM&=PQCm(7zj~-4x7ToZC{cT)xZ>dXiPmJZWq)MR z9&66Uj(rn-oq5WC>Y!D}Z0#Ps8?bkC^QX1g18aHydLUs_-I!~udJJ3}wro~R z_1vD+@!C(Wjy$Z1mFjQaYh;|e1~-Qa-&EEo4k`?3ys~gvWl)~Bj3Bq(ZR!YZNIJB_ zTJfN%_rXMdpkv~IU$h<1+N#HzLh>Z{oO!p82+-+?U#|S>@YWi8!^%W#Vfz!0+XtTe zwbP~c*G~6QZUmo*9;n;bSWlgle>9%FUJ$5Xv?uIRRVQ25NF`?S;;7@%nv%;k`{JRE z+qE;QckIk*Ml!xXe6LHFzG+uZj)D$^&YH1iQFHU8{L*jD@2_TWADwdF)Kt}}c<7F( z6sSwU-qOys3CGtxSh}O?{OU#RFW00X$DXXN_3MR|WH;Ak*LB!+r$#j(a?6ci7kh5o zpSq70#Lj&Z{lS1@-P+Nm5i|dayxDWFY6(=ZC-70b$71kf>}*JC0Pf1GPM9(6H