diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/rocks.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/rocks.yml deleted file mode 100644 index 74df660fc9..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/rocks.yml +++ /dev/null @@ -1,115 +0,0 @@ -- type: entity - id: CP14BaseRock - name: rock - description: A piece of rock. Hard, heavy, useless. - abstract: true - placement: - mode: SnapgridCenter - components: - - type: Clickable - - type: Sprite - drawdepth: Mobs - snapCardinals: true - - type: Physics - bodyType: Static - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: Rock - -- type: entity - id: CP14RockSmall - parent: CP14BaseRock - suffix: Small - components: - - type: Climbable - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.4 - density: 500 - layer: - - HalfWallLayer - - Opaque - - type: Sprite - sprite: _CP14/Structures/Flora/Rocks/rocks_small.rsi - offset: 0,0.2 - layers: - - state: rock0 - map: ["random"] - - type: RandomSprite - available: - - random: - rock0: "" - rock1: "" - rock2: "" - rock3: "" - rock4: "" - rock5: "" - rock7: "" - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 75 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14StoneBlock1: - min: 2 - max: 3 - -- type: entity - id: CP14RockBig - parent: CP14BaseRock - suffix: Big - components: - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.5 - density: 1500 - layer: - - WallLayer - - type: Sprite - sprite: _CP14/Structures/Flora/Rocks/rocks_big.rsi - offset: 0,0.5 - layers: - - state: rock0 - map: ["random"] - - type: RandomSprite - available: - - random: - rock0: "" - rock1: "" - rock2: "" - rock3: "" - rock4: "" - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14StoneBlock1: - min: 5 - max: 8 \ 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 b15dda01dc..e99cf6497a 100644 --- a/Resources/Prototypes/_CP14/Procedural/biome_template.yml +++ b/Resources/Prototypes/_CP14/Procedural/biome_template.yml @@ -28,8 +28,30 @@ allowedTiles: - CP14FloorBase entities: - - CP14RockSmall - - CP14RockSmall + - FloraGreyStalagmite1 + - FloraGreyStalagmite2 + - FloraGreyStalagmite3 + - FloraGreyStalagmite4 + - FloraGreyStalagmite5 + - FloraRockSolid01 + - FloraRockSolid02 + - FloraRockSolid03 + - FloraGreyStalagmite1 + - FloraGreyStalagmite2 + - FloraGreyStalagmite3 + - FloraGreyStalagmite4 + - FloraGreyStalagmite5 + - FloraRockSolid01 + - FloraRockSolid02 + - FloraRockSolid03 + - FloraGreyStalagmite1 + - FloraGreyStalagmite2 + - FloraGreyStalagmite3 + - FloraGreyStalagmite4 + - FloraGreyStalagmite5 + - FloraRockSolid01 + - FloraRockSolid02 + - FloraRockSolid03 - CP14QuartzCrystal - !type:BiomeEntityLayer # lumishroom sage threshold: 0.6 diff --git a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml index 6379957667..a94b5ec24f 100644 --- a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml +++ b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml @@ -208,32 +208,6 @@ - CP14FloorGrass entities: - CP14GatherableWildSage - - !type:BiomeEntityLayer # More Rocks - threshold: 0.7 - noise: - seed: 18 - noiseType: OpenSimplex2 - fractalType: FBm - frequency: 3 - allowedTiles: - - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall - entities: - - CP14RockSmall - - !type:BiomeEntityLayer # More Rocks - threshold: 0.8 - noise: - seed: 27 - noiseType: OpenSimplex2 - fractalType: FBm - frequency: 2 - allowedTiles: - - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall - entities: - - CP14RockBig # Подбиомы лугов @@ -251,8 +225,6 @@ frequency: 2 allowedTiles: - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall entities: - CP14FloraTree01 - CP14FloraTree02 diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/meta.json deleted file mode 100644 index 1b87eff81a..0000000000 --- a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CLA", - "copyright": "created by vladimir.s", - "size": { - "x": 48, - "y": 64 - }, - "states": [ - { - "name": "rock0" - }, - { - "name": "rock1" - }, - { - "name": "rock2" - }, - { - "name": "rock3" - }, - { - "name": "rock4" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock0.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock0.png deleted file mode 100644 index d61ad235c6..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock1.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock1.png deleted file mode 100644 index cc917429dc..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock2.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock2.png deleted file mode 100644 index 1c0d0a9dd9..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock3.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock3.png deleted file mode 100644 index 1d2c48cec9..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock4.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock4.png deleted file mode 100644 index d7aa3507bd..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_big.rsi/rock4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/meta.json deleted file mode 100644 index 8f76e1452a..0000000000 --- a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/meta.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1, - "license": "CLA", - "copyright": "created by vladimir.s", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "rock0" - }, - { - "name": "rock1" - }, - { - "name": "rock2" - }, - { - "name": "rock3" - }, - { - "name": "rock4" - }, - { - "name": "rock5" - }, - { - "name": "rock6" - }, - { - "name": "rock7" - }, - { - "name": "rock8" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock0.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock0.png deleted file mode 100644 index d9556d8571..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock1.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock1.png deleted file mode 100644 index 50650579a8..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock2.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock2.png deleted file mode 100644 index c68f2e3ee9..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock3.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock3.png deleted file mode 100644 index 734650f662..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock4.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock4.png deleted file mode 100644 index 666630438b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock5.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock5.png deleted file mode 100644 index 15d0f5c949..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock6.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock6.png deleted file mode 100644 index 6e3540db9f..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock7.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock7.png deleted file mode 100644 index ce2366c16a..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock8.png b/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock8.png deleted file mode 100644 index a862aeea5c..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Flora/Rocks/rocks_small.rsi/rock8.png and /dev/null differ