From dc6d70b10e41dbe88461a7512c2c35ec40b14a82 Mon Sep 17 00:00:00 2001 From: Ed Date: Tue, 8 Oct 2024 13:29:07 +0300 Subject: [PATCH] iron and copper ore walls + procedural cave update --- .../Structures/Furniture/workbenchs.yml | 2 - .../Entities/Structures/Walls/natural.yml | 186 +++++++++--------- .../_CP14/Procedural/biome_template.yml | 26 ++- 3 files changed, 118 insertions(+), 96 deletions(-) diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index 98ca16399e..6493ca778b 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -105,7 +105,6 @@ description: A table with embroidery tools to create different clothing and materials. components: - type: Sprite - snapCardinals: true state: sewing_table - type: Icon state: sewing_table @@ -123,7 +122,6 @@ description: "An ultimatum anvil that doesn't even need a hammer or red-hot ingot temperatures to forge tools. (OOC: we just haven't done it yet)" components: - type: Sprite - snapCardinals: true state: anvil - type: Icon state: anvil diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index dc4ea6dab1..b382535eeb 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -69,97 +69,63 @@ graph: CP14WallDirt node: WallDirt -#- type: entity -# id: CP14WallStoneCopperOre -# suffix: copper ore -# parent: CP14WallStone -# description: A solid stone natural wall. You can see the sharp flecks of copper in it. -# components: -# - type: Sprite -# sprite: _CP14/Structures/Walls/cave_stone_copper.rsi -# - type: Icon -# sprite: _CP14/Structures/Walls/cave_stone_copper.rsi -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 100 -# behaviors: -# - !type:DoActsBehavior -# acts: ["Destruction"] -# - !type:PlaySoundBehavior -# sound: -# path: /Audio/Effects/break_stone.ogg -# params: -# volume: -6 -# - !type:SpawnEntitiesBehavior -# spawn: -# CP14OreCopper: -# min: 1 -# max: 5 -# -#- type: entity -# id: CP14WallStoneIronOre -# suffix: iron ore -# parent: CP14WallStone -# description: A solid stone natural wall. You can see the sharp flecks of iron in it. -# components: -# - type: Sprite -# sprite: _CP14/Structures/Walls/cave_stone_iron.rsi -# - type: Icon -# sprite: _CP14/Structures/Walls/cave_stone_iron.rsi -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 100 -# behaviors: -# - !type:DoActsBehavior -# acts: ["Destruction"] -# - !type:PlaySoundBehavior -# sound: -# path: /Audio/Effects/break_stone.ogg -# params: -# volume: -6 -# - !type:SpawnEntitiesBehavior -# spawn: -# CP14OreIron: -# min: 1 -# max: 5 -# -#- type: entity -# id: CP14WallStoneSilverOre -# suffix: silver ore -# parent: CP14WallStone -# description: A solid stone natural wall. You see the tantalizing particles of silver in it. -# components: -# - type: Sprite -# sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi -# - type: Icon -# sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 100 -# behaviors: -# - !type:DoActsBehavior -# acts: ["Destruction"] -# - !type:PlaySoundBehavior -# sound: -# path: /Audio/Effects/break_stone.ogg -# params: -# volume: -6 -# - !type:SpawnEntitiesBehavior -# spawn: -# CP14OreSilver: -# min: 1 -# max: 5 -# CP14StoneBlock1: -# min: 2 -# max: 3 -# - type: IconSmooth -# base: wall +- type: entity + id: CP14WallStoneCopperOre + suffix: copper ore + parent: CP14WallStone + description: A solid stone natural wall. You can see the sharp flecks of copper in it. + components: + - type: Sprite + sprite: _CP14/Structures/Walls/Natural/cave_stone_copper.rsi + - type: Icon + sprite: _CP14/Structures/Walls/Natural/cave_stone_copper.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + CP14OreCopper: + min: 1 + max: 5 + +- type: entity + id: CP14WallStoneIronOre + suffix: iron ore + parent: CP14WallStone + description: A solid stone natural wall. You can see the sharp flecks of iron in it. + components: + - type: Sprite + sprite: _CP14/Structures/Walls/Natural/cave_stone_iron.rsi + - type: Icon + sprite: _CP14/Structures/Walls/Natural/cave_stone_iron.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + CP14OreIron: + min: 1 + max: 5 - type: entity id: CP14WallStoneGoldOre @@ -193,4 +159,40 @@ min: 2 max: 3 - type: IconSmooth - base: wall \ No newline at end of file + base: wall + +# We dont have silver now + +#- type: entity +# id: CP14WallStoneSilverOre +# suffix: silver ore +# parent: CP14WallStone +# description: A solid stone natural wall. You see the tantalizing particles of silver in it. +# components: +# - type: Sprite +# sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi +# - type: Icon +# sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 100 +# behaviors: +# - !type:DoActsBehavior +# acts: ["Destruction"] +# - !type:PlaySoundBehavior +# sound: +# path: /Audio/Effects/break_stone.ogg +# params: +# volume: -6 +# - !type:SpawnEntitiesBehavior +# spawn: +# CP14OreSilver: +# min: 1 +# max: 5 +# CP14StoneBlock1: +# min: 2 +# max: 3 +# - type: IconSmooth +# base: wall \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template.yml b/Resources/Prototypes/_CP14/Procedural/biome_template.yml index 67d7744caf..e99cf6497a 100644 --- a/Resources/Prototypes/_CP14/Procedural/biome_template.yml +++ b/Resources/Prototypes/_CP14/Procedural/biome_template.yml @@ -118,7 +118,7 @@ - CP14WallStone #Ores - !type:BiomeEntityLayer - threshold: 0.6 + threshold: 0.7 noise: seed: 10 noiseType: OpenSimplex2 @@ -127,4 +127,26 @@ allowedTiles: - CP14FloorBase entities: - - CP14WallStoneGoldOre \ No newline at end of file + - CP14WallStoneGoldOre + - !type:BiomeEntityLayer + threshold: 0.6 + noise: + seed: 15 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 3 + allowedTiles: + - CP14FloorBase + entities: + - CP14WallStoneIronOre + - !type:BiomeEntityLayer + threshold: 0.5 + noise: + seed: 20 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 3 + allowedTiles: + - CP14FloorBase + entities: + - CP14WallStoneCopperOre \ No newline at end of file