From 06cb93fb1dc4d035be474efa5f0ead237e49ee84 Mon Sep 17 00:00:00 2001 From: comasqw Date: Wed, 11 Dec 2024 16:34:09 +0400 Subject: [PATCH] recipes for workbench --- .../en-US/_CP14/materials/materials.ftl | 3 + .../ru-RU/_CP14/materials/materials.ftl | 2 + .../Entities/Objects/Materials/simple.yml | 74 ++++++- .../Prototypes/_CP14/Materials/simple.yml | 18 ++ .../_CP14/Recipes/Workbench/anvil.yml | 203 +++++++++++++++++- .../_CP14/Recipes/Workbench/workbench.yml | 16 ++ .../Prototypes/_CP14/Stacks/materials.yml | 7 + 7 files changed, 321 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/_CP14/materials/materials.ftl b/Resources/Locale/en-US/_CP14/materials/materials.ftl index 88aca4d1ac..99ca7189f2 100644 --- a/Resources/Locale/en-US/_CP14/materials/materials.ftl +++ b/Resources/Locale/en-US/_CP14/materials/materials.ftl @@ -3,3 +3,6 @@ cp14-material-dirt-block = dirt cp14-material-stone-block = stone cp14-material-cloth = cloth cp14-material-flora = flora material +cp14-material-glowing-iron = glowing iron +cp14-material-glowing-wooden-planks = glowing wooden planks + diff --git a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl index 6ada59c193..f569ddc939 100644 --- a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl @@ -3,3 +3,5 @@ cp14-material-dirt-block = земля cp14-material-stone-block = камень cp14-material-cloth = ткань cp14-material-flora = растительный материал +cp14-material-glowing-iron = сверкающее железо +cp14-material-glowing-wooden-planks = сверкающие деревянные доски diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml index 121a5970cf..3c0cf4c86d 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -175,7 +175,7 @@ types: Heat: 1 - type: Log - spawnedPrototype: CP14WoodenPlanks1 + spawnedPrototype: CP14GlowingWoodenPlanks1 spawnCount: 3 - type: Appearance - type: Damageable @@ -265,6 +265,78 @@ - type: Stack count: 10 +- type: entity + id: CP14GlowingWoodenPlanks1 + parent: BaseItem + name: glowing wooden planks + description: Treated and ready-to-use wood. + categories: [ ForkFiltered ] + suffix: 1 + components: + - type: Item + size: Normal + - type: Sprite + sprite: _CP14/Objects/Materials/wood.rsi + layers: + - state: planks + map: ["base"] + - type: Tag + tags: + - CP14FireplaceFuel + - Wooden + - type: Flammable + fireSpread: false + canResistFire: false + alwaysCombustible: true + canExtinguish: true + cP14FireplaceFuel: 12 + damage: + types: + Heat: 1 + - type: Appearance + - type: FloorTile + placeTileSound: + path: /Audio/Effects/woodenclosetclose.ogg + params: + variation: 0.03 + volume: 2 + outputs: + - CP14FloorOakWoodPlanks # TODO + - type: Stack + stackType: CP14GlowingWoodenPlanks + count: 1 + baseLayer: base + layerStates: + - planks + - planks_2 + - planks_3 + - type: Material + - type: PhysicalComposition # точно ли это нужно? + materialComposition: + CP14WoodenPlanks: 100 + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14GlowingWoodenPlanks10 + parent: CP14GlowingWoodenPlanks1 + suffix: 10 + components: + - type: Stack + count: 10 + - type: entity id: CP14Nail1 parent: BaseItem diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml index c101e29c27..2f089eee23 100644 --- a/Resources/Prototypes/_CP14/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Materials/simple.yml @@ -78,3 +78,21 @@ icon: { sprite: _CP14/Objects/Materials/flora.rsi, state: grass_material1 } color: "#85903e" price: 0 #? + +- type: material + id: CP14GlowingIron + stackEntity: CP14GlowingIronBar1 + name: cp14-material-glowing-iron + unit: materials-unit-bar + icon: { sprite: _CP14/Objects/Materials/glowingiron_bar.rsi, state: bar_2 } + color: "#87CEEB" + price: 0 #? + +- type: material + id: CP14GlowingWoodenPlanks + stackEntity: CP14GlowingWoodenPlanks1 + name: cp14-material-glowing-wooden-planks + unit: materials-unit-plank + icon: { sprite: _CP14/Objects/Materials/wood.rsi, state: planks_2 } + color: "#874d3a" + price: 0 #? diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml index 605a33866d..61319e7815 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml @@ -384,4 +384,205 @@ craftTime: 4 stacks: CP14GoldBar: 2 - result: CP14ModularBladeGoldAxe \ No newline at end of file + result: CP14ModularBladeGoldAxe + +- type: CP14Recipe + id: CP14ClothingMagicRingBlue + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GlowingIronBar: 1 + result: CP14ClothingMagicRingBlue + +- type: CP14Recipe + id: CP14ClothingMagicRingCooper + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 1 + result: CP14ClothingMagicRingCooper + +- type: CP14Recipe + id: CP14ClothingMagicRingIron + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14IronBar: 1 + result: CP14ClothingMagicRingIron + +- type: CP14Recipe + id: CP14ClothingMagicRingGold + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 1 + result: CP14ClothingMagicRingGold + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Blue1 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GlowingIronBar: 1 + result: CP14MagicCrystalHolder_Blue1 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Blue2 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GlowingIronBar: 2 + result: CP14MagicCrystalHolder_Blue2 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Blue3 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GlowingIronBar: 3 + result: CP14MagicCrystalHolder_Blue3 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Blue4 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GlowingIronBar: 4 + result: CP14MagicCrystalHolder_Blue4 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Cooper1 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 1 + result: CP14MagicCrystalHolder_Cooper1 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Cooper2 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 2 + result: CP14MagicCrystalHolder_Cooper2 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Cooper3 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 3 + result: CP14MagicCrystalHolder_Cooper3 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Cooper4 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 4 + result: CP14MagicCrystalHolder_Cooper4 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Iron1 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14IronBar: 1 + result: CP14MagicCrystalHolder_Iron1 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Iron2 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14IronBar: 2 + result: CP14MagicCrystalHolder_Iron2 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Iron3 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14IronBar: 3 + result: CP14MagicCrystalHolder_Iron3 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Iron4 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14IronBar: 4 + result: CP14MagicCrystalHolder_Iron4 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Gold1 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 1 + result: CP14MagicCrystalHolder_Gold1 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Gold2 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 2 + result: CP14MagicCrystalHolder_Gold2 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Gold3 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 3 + result: CP14MagicCrystalHolder_Gold3 + +- type: CP14Recipe + id: CP14MagicCrystalHolder_Gold4 + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 4 + result: CP14MagicCrystalHolder_Gold4 + +- type: CP14Recipe + id: CP14MagicStaff_GlowingIron + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GlowingIronBar: 2 + result: CP14MagicStaff_GlowingIron + +- type: CP14Recipe + id: CP14MagicStaff_GlowingIronHolder + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GlowingIronBar: 2 + CP14IronBar: 1 + result: CP14MagicStaff_GlowingIronHolder + +- type: CP14Recipe + id: CP14MagicStaff_Cooper + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 2 + result: CP14MagicStaff_Cooper + +- type: CP14Recipe + id: CP14MagicStaff_Iron + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14IronBar: 2 + result: CP14MagicStaff_Iron + +- type: CP14Recipe + id: CP14MagicStaff_Gold + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 2 + result: CP14MagicStaff_Gold diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml index 85176ed07c..8a3d5f60ab 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml @@ -85,3 +85,19 @@ stacks: CP14WoodenPlanks: 2 result: CP14ModularGripWoodenLong + +- type: CP14Recipe + id: CP14MagicStaff_GlowingWooden + tag: CP14RecipeWorkbench + craftTime: 2 + stacks: + CP14GlowingWoodenPlanks: 2 + result: CP14MagicStaff_GlowingWooden + +- type: CP14Recipe + id: CP14MagicStaff_Wooden + tag: CP14RecipeWorkbench + craftTime: 2 + stacks: + CP14WoodenPlanks: 2 + result: CP14MagicStaff_Wooden diff --git a/Resources/Prototypes/_CP14/Stacks/materials.yml b/Resources/Prototypes/_CP14/Stacks/materials.yml index 95e00462cc..4776d960d5 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -74,3 +74,10 @@ spawn: CP14GlowingIronBar1 icon: { sprite: _CP14/Objects/Materials/glowingiron_bar.rsi, state: bar_2 } maxCount: 10 + +- type: stack + id: CP14GlowingWoodenPlanks + name: cp14-stack-glowing-wood-planks + spawn: CP14GlowingWoodenPlanks1 + icon: { sprite: _CP14/Objects/Materials/wood.rsi, state: planks_2 } + maxCount: 10