Marble update (#1146)

* all marble resprite * Update meta.json * marble table * marble natural wall * marble cave floor * marble material * marble small floor bricks * marble in demiplanes
2025-04-07 21:27:20 +03:00
parent 06863d9986
commit f7f7feb837
74 changed files with 563 additions and 120 deletions
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml
@@ -137,4 +137,18 @@
        color: green
      - state: frame
  - type: CP14BiomeSpawner
-    biome: CP14LeafMaze
+    biome: CP14LeafMaze
+
+- type: entity
+  id: CP14BiomeSpawnerMarbleCave
+  parent: CP14BaseBiomeSpawner
+  suffix: Marble cave
+  components:
+  - type: Sprite
+    layers:
+      - state: cave
+      - state: frame
+      - sprite: _CP14/Objects/Materials/marble_block.rsi
+        state: stone_3
+  - type: CP14BiomeSpawner
+    biome: CP14MarbleCaves 
--- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml
@@ -0,0 +1,124 @@
+- type: entity
+  id: CP14DirtBlock1
+  parent: BaseItem
+  name: dirt block
+  description: A block of excellent black soil.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Materials/dirt_block.rsi
+    layers:
+      - state: dirt
+        map: ["base"]
+  - type: FloorTile
+    placeTileSound:
+      collection: CP14Digging
+      params:
+        variation: 0.03
+        volume: 2
+    outputs:
+      - CP14FloorDirt
+  - type: Appearance
+  - type: Stack
+    stackType: CP14Dirt
+    count: 1
+    baseLayer: base
+    layerStates:
+    - dirt
+    - dirt_2
+    - dirt_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14Dirt: 100
+  - type: CP14MagicEssenceContainer
+    essences:
+      Earth: 1
+
+- type: entity
+  id: CP14DirtBlock10
+  parent: CP14DirtBlock1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
+
+- type: entity
+  id: CP14StoneBlock1
+  parent: BaseItem
+  name: stone block
+  description: A block of cold stone.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Materials/stone_block.rsi
+    layers:
+      - state: stone
+        map: ["base"]
+  - type: Appearance
+  - type: Stack
+    stackType: CP14Stone
+    count: 1
+    baseLayer: base
+    layerStates:
+    - stone
+    - stone_2
+    - stone_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14Stone: 100
+  - type: CP14MagicEssenceContainer
+    essences:
+      Earth: 1
+
+- type: entity
+  id: CP14StoneBlock10
+  parent: CP14StoneBlock1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
+
+- type: entity
+  id: CP14MarbleBlock1
+  parent: BaseItem
+  name: marble block
+  description: A block of white marble.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Materials/marble_block.rsi
+    layers:
+      - state: stone
+        map: ["base"]
+  - type: Appearance
+  - type: Stack
+    stackType: CP14MarbleStone
+    count: 1
+    baseLayer: base
+    layerStates:
+    - stone
+    - stone_2
+    - stone_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14MarbleStone: 100
+
+- type: entity
+  id: CP14MarbleBlock10
+  parent: CP14MarbleBlock1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
--- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml
@@ -1,91 +1,3 @@
- type: entity
-  id: CP14DirtBlock1
-  parent: BaseItem
-  name: dirt block
-  description: A block of excellent black soil.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    noRot: true
-    sprite: _CP14/Objects/Materials/dirt_block.rsi
-    layers:
-      - state: dirt
-        map: ["base"]
-  - type: FloorTile
-    placeTileSound:
-      collection: CP14Digging
-      params:
-        variation: 0.03
-        volume: 2
-    outputs:
-      - CP14FloorDirt
-  - type: Appearance
-  - type: Stack
-    stackType: CP14Dirt
-    count: 1
-    baseLayer: base
-    layerStates:
-    - dirt
-    - dirt_2
-    - dirt_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Dirt: 100
-  - type: CP14MagicEssenceContainer
-    essences:
-      Earth: 1
-
- type: entity
-  id: CP14DirtBlock10
-  parent: CP14DirtBlock1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10
-
- type: entity
-  id: CP14StoneBlock1
-  parent: BaseItem
-  name: stone block
-  description: A block of cold stone.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    noRot: true
-    sprite: _CP14/Objects/Materials/stone_block.rsi
-    layers:
-      - state: stone
-        map: ["base"]
-  - type: Appearance
-  - type: Stack
-    stackType: CP14Stone
-    count: 1
-    baseLayer: base
-    layerStates:
-    - stone
-    - stone_2
-    - stone_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Stone: 100
-  - type: CP14MagicEssenceContainer
-    essences:
-      Earth: 1
-
- type: entity
-  id: CP14StoneBlock10
-  parent: CP14StoneBlock1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10
-
 - type: entity
  id: CP14WoodLog
  parent: BaseItem
--- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml
@@ -66,6 +66,19 @@
  - type: Stack
    stackType: CP14FloorTileMarbleBrick

+- type: entity
+  parent: CP14FloorTileBase
+  id: CP14FloorTileMarbleSmallbricks
+  name: marble small brick
+  components:
+  - type: Sprite
+    state: marble_smallbricks
+  - type: FloorTile
+    outputs:
+      - CP14FloorMarbleSmallbricks
+  - type: Stack
+    stackType: CP14FloorTileMarbleSmallbricks
+
 - type: entity
  parent: CP14FloorTileBase
  id: CP14FloorTileOakWoodplanks
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml
@@ -1,8 +1,7 @@
 - type: entity
  parent:
  - BaseStructure
-  - CP14BaseFlammable
-  id: CP14WoodenTableBase
+  id: CP14TableBase
  categories: [ ForkFiltered ]
  abstract: true
  components:
@@ -17,6 +16,31 @@
        - TableMask
        layer:
        - TableLayer
+  - type: Damageable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/picaxe2.ogg
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepHull
+  - type: Climbable
+  - type: PlaceableSurface
+
+- type: entity
+  parent:
+  - CP14TableBase
+  - CP14BaseFlammable
+  id: CP14WoodenTableBase
+  abstract: true
+  components:
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Wood
@@ -52,8 +76,6 @@
  - type: FireVisuals
    sprite: _CP14/Effects/fire.rsi
    normalState: full
-  - type: Climbable
-  - type: PlaceableSurface

 - type: entity
  parent: CP14WoodenTableBase
@@ -116,4 +138,25 @@
    state: full
  - type: Construction
    graph: CP14TableWoodenCounter
-    node: CP14TableWoodenCounter
+    node: CP14TableWoodenCounter
+
+- type: entity
+  parent: CP14TableBase
+  id: CP14TableMarble
+  name: marble table
+  description: Exquisite white marble table.
+  components:
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Metallic
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Tables/marble.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Tables/marble.rsi
+    state: full
+  - type: IconSmooth
+    key: state
+    base: state
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepFloor
--- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml
@@ -38,6 +38,39 @@
      - !type:DoActsBehavior
        acts: ["Destruction"]

+- type: entity
+  id: CP14WallMarbleStone
+  name: marble
+  parent: CP14WallStone
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Walls/Natural/marble_stone.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Walls/Natural/marble_stone.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 350
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/break_stone.ogg
+          params:
+            volume: -6
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14MarbleBlock1:
+            min: 2
+            max: 3
+      - !type:DoActsBehavior
+        acts: ["Destruction"]

 - type: entity
  id: CP14WallStoneIndestructable
--- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml
@@ -71,6 +71,25 @@
    sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi
  - type: IconSmooth
    base: stonebricks
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Rock
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/break_stone.ogg
+          params:
+            volume: -6
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: CP14WallMarbleBrick
+    node: WallMarbleBrick
  - type: CP14WallpaperHolder

 - type: entity
--- a/Resources/Prototypes/_CP14/Materials/simple.yml
+++ b/Resources/Prototypes/_CP14/Materials/simple.yml
@@ -25,6 +25,15 @@
  color: "#555963"
  price: 0

+- type: material
+  id: CP14MarbleStone
+  stackEntity: CP14MarbleBlock1
+  name: cp14-material-stone-block #TODO
+  unit: materials-unit-chunk
+  icon: { sprite: _CP14/Objects/Materials/marble_block.rsi, state: stone_2 }
+  color: "#555963"
+  price: 0
+
 - type: material
  id: CP14Nail
  stackEntity: CP14Nail1
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_magma_caves.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_magma_caves.yml
@@ -41,6 +41,10 @@
      biomeTemplate: CP14CavesFloor
      tileMask:
      - CP14FloorGrass
+    - !type:BiomeDunGen
+      biomeTemplate: CP14MarbleCaves
+      tileMask:
+      - CP14FloorMarble

 - type: dungeonConfig
  id: CP14DemiplaneCavesRingFloorMaskStone
@@ -102,9 +106,9 @@
  - !type:NoiseDistanceDunGen
    size: 50, 50
    distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 0.6
+      blendWeight: 0.8
    layers:
-    - tile: Space
+    - tile: CP14FloorMarble
      threshold: 0.50
      noise:
        frequency: 0.010
@@ -112,18 +116,4 @@
        fractalType: FBm
        octaves: 5
        lacunarity: 2
-        gain: 0.5
-  - !type:NoiseDistanceDunGen
-    size: 80, 50
-    distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 0.2
-    layers:
-    - tile: Space
-      threshold: 0.50
-      noise:
-        frequency: 0.08
-        noiseType: OpenSimplex2
-        fractalType: FBm
-        octaves: 5
-        lacunarity: 2
        gain: 0.5
--- a/Resources/Prototypes/_CP14/Procedural/marble_cave.yml
+++ b/Resources/Prototypes/_CP14/Procedural/marble_cave.yml
@@ -0,0 +1,47 @@
+- type: biomeTemplate
+  id: CP14MarbleCaves
+  layers:
+    - !type:BiomeTileLayer
+      threshold: -1.0
+      tile: CP14FloorMarbleCave
+    #Rocks
+    - !type:BiomeEntityLayer
+      threshold: 0.4
+      noise:
+        seed: 1
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        frequency: 2
+      allowedTiles:
+        - CP14FloorMarbleCave
+      entities:
+        - CP14RockSmall
+    # Lakes
+    - !type:BiomeEntityLayer
+      threshold: -0.45
+      invert: true
+      noise:
+        seed: 12
+        noiseType: Perlin
+        fractalType: Ridged
+        octaves: 1
+        frequency: 0.1
+        gain: 0.5
+      allowedTiles:
+        - CP14FloorMarbleCave
+      entities:
+        - CP14FloorLava
+    - !type:BiomeEntityLayer
+      threshold: -0.45
+      invert: true
+      noise:
+        seed: 0
+        noiseType: Perlin
+        fractalType: Ridged
+        octaves: 1
+        frequency: 0.1
+        gain: 0.5
+      allowedTiles:
+        - CP14FloorMarbleCave
+      entities:
+        - CP14WallMarbleStone
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallMarble.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallMarble.yml
@@ -0,0 +1,16 @@
+- type: constructionGraph
+  id: CP14WallMarbleBrick
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: WallMarbleBrick
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: CP14MarbleStone
+              amount: 3
+              doAfter: 2
+    - node: WallMarbleBrick
+      entity: CP14WallMarbleBrick
--- a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml
@@ -72,7 +72,7 @@

 - type: construction
  crystallPunkAllowed: true
-  name: stone wall
+  name: stonebrick wall
  description: Sturdy enough to cover you from threats or cold winds.
  id: CP14WallStonebrick
  graph: CP14WallStonebrick
@@ -88,6 +88,24 @@
  conditions:
    - !type:TileNotBlocked

+- type: construction
+  crystallPunkAllowed: true
+  name: marble brick wall
+  description: Sturdy enough to cover you from threats or cold winds.
+  id: CP14WallMarbleBrick
+  graph: CP14WallMarbleBrick
+  startNode: start
+  targetNode: CP14WallMarbleBrick
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
  crystallPunkAllowed: true
  name: iron grille
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml
@@ -15,11 +15,22 @@
  craftTime: 1
  requirements:
  - !type:StackResource
-    stack: CP14Stone
+    stack: CP14MarbleStone
    count: 1
  result: CP14FloorTileMarbleBrick
  resultCount: 4

+- type: CP14Recipe
+  id: CP14FloorTileMarbleSmallbricks
+  tag: CP14RecipeWorkbench
+  craftTime: 1
+  requirements:
+  - !type:StackResource
+    stack: CP14MarbleStone
+    count: 1
+  result: CP14FloorTileMarbleSmallbricks
+  resultCount: 4
+
 - type: CP14Recipe
  id: CP14FloorTileStonebricks
  tag: CP14RecipeWorkbench
--- a/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml
@@ -12,6 +12,13 @@
  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble }
  maxCount: 30

+- type: stack
+  id: CP14FloorTileMarbleSmallbricks
+  name: marble small brick
+  spawn: CP14FloorTileMarbleSmallbricks
+  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble_smallbricks }
+  maxCount: 30
+
 - type: stack
  id: CP14FloorTileOakWoodplanks
  name: oak woodplanks
--- a/Resources/Prototypes/_CP14/Stacks/materials.yml
+++ b/Resources/Prototypes/_CP14/Stacks/materials.yml
@@ -12,6 +12,13 @@
  icon: { sprite: _CP14/Objects/Materials/stone_block.rsi, state: stone_2 }
  maxCount: 10

+- type: stack
+  id: CP14MarbleStone
+  name: cp14-stack-marble-block
+  spawn: CP14MarbleBlock1
+  icon: { sprite: _CP14/Objects/Materials/marble_block.rsi, state: stone_2 }
+  maxCount: 10
+
 - type: stack
  id: CP14WoodenPlanks
  name: cp14-stack-wood-planks
--- a/Resources/Prototypes/_CP14/Tiles/natural.yml
+++ b/Resources/Prototypes/_CP14/Tiles/natural.yml
@@ -40,6 +40,37 @@
  heatCapacity: 10000
  weather: true

+- type: tile
+  editorHidden: false
+  id: CP14FloorMarbleCave
+  name: cp14-tiles-marble-cave
+  sprite: /Textures/_CP14/Tiles/marble_cave.png
+  variants: 14
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: CP14FloorBase
+  deconstructTools: [ CP14Digging ]
+  isSubfloor: true
+  itemDrop: CP14MarbleBlock1
+  footstepSounds:
+    collection: FootstepAsteroid
+  heatCapacity: 10000
+  weather: true
+  indestructible: true
+
 - type: tile
  editorHidden: false
  id: CP14FloorSand
--- a/Resources/Prototypes/_CP14/Tiles/produced.yml
+++ b/Resources/Prototypes/_CP14/Tiles/produced.yml
@@ -205,6 +205,34 @@
  deconstructTools: [ Prying ]
  itemDrop: CP14FloorTileMarbleBrick

+- type: tile
+  editorHidden: false
+  id: CP14FloorMarbleSmallbricks
+  name: cp14-tiles-stonebricks-marble
+  sprite: /Textures/_CP14/Tiles/Marble/small_bricks.png
+  variants: 9
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  edgeSpritePriority: 102
+  edgeSprites:
+    South: /Textures/_CP14/Tiles/Marble/double_edge_S.png
+  baseTurf: CP14FloorFoundation
+  isSubfloor: false
+  footstepSounds:
+    collection: FootstepAsteroid
+  heatCapacity: 10000
+  weather: true
+  deconstructTools: [ Prying ]
+  itemDrop: CP14FloorTileMarbleSmallbricks
+
 - type: tile
  editorHidden: false
  id: CP14FloorDirtSeedbed