Lava + Chest resprite (#1007)

* simple lava

* add into demiplanes

* Update meta.json

* wooden chest update

* Update migration.yml

* Update dev_map.yml

* manual migration

* Update factoria.yml

Resources/Maps/_CP14/comoss.yml

@@ -43021,7 +43021,7 @@ entities:
       parent: 13960
     - type: Physics
       canCollide: False
-- proto: CP14BrassChest
+- proto: CP14WoodenChest
   entities:
   - uid: 461
     components:
@@ -43048,7 +43048,7 @@ entities:
     - type: Transform
       pos: 20.5,-45.5
       parent: 2
-- proto: CP14BrassChestFilledFarmSeeds
+- proto: CP14WoodenChestFilledFarmSeeds
   entities:
   - uid: 890
     components:

Resources/Maps/_CP14/comoss_d.yml

@@ -94361,7 +94361,7 @@ entities:
     - type: ItemPlacer
       placedEntities:
       - 2240
-- proto: CP14BrassChest
+- proto: CP14WoodenChest
   entities:
   - uid: 2470
     components:
@@ -94478,14 +94478,14 @@ entities:
     - type: Transform
       pos: 23.5,1.5
       parent: 2
-- proto: CP14BrassChestFilledAlchemy
+- proto: CP14WoodenChestFilledAlchemy
   entities:
   - uid: 12843
     components:
     - type: Transform
       pos: -47.5,-73.5
       parent: 2
-- proto: CP14BrassChestFilledCheese
+- proto: CP14WoodenChestFilledCheese
   entities:
   - uid: 8943
     components:

Resources/Maps/_CP14/dev_map.yml

@@ -471,14 +471,14 @@ entities:
     - type: Transform
       pos: 2.696513,-0.36781955
       parent: 2
-- proto: CP14BrassChest
+- proto: CP14WoodenChest
   entities:
   - uid: 205
     components:
     - type: Transform
       pos: 4.5,5.5
       parent: 2
-- proto: CP14BrassChestFilledFarmSeeds
+- proto: CP14WoodenChestFilledFarmSeeds
   entities:
   - uid: 290
     components:

Resources/Maps/_CP14/factoria.yml

@@ -61133,27 +61133,20 @@ entities:
     - type: Transform
       pos: -36.414806,-12.267424
       parent: 2
-- proto: CP14BrassChest
+- proto: CP14WoodenChest
   entities:
   - uid: 14420
     components:
     - type: Transform
       pos: -5.5,-23.5
       parent: 2
-- proto: CP14BrassChestFilledFarmSeeds
+- proto: CP14WoodenChestFilledFarmSeeds
   entities:
   - uid: 14548
     components:
     - type: Transform
       pos: 8.5,38.5
       parent: 2
-- proto: CP14BrassChestFilledWood
-  entities:
-  - uid: 13198
-    components:
-    - type: Transform
-      pos: -12.5,4.5
-      parent: 2
 - proto: CP14Bucket
   entities:
   - uid: 14417

Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/buy.yml

@@ -8,11 +8,11 @@
   factions:
   - BradFamily
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledAlchemy
+    product: CP14WoodenChestFilledAlchemy
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledAlchemy
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledAlchemy
   name: alchemical vials chest
   components:
   - type: StorageFill
@@ -37,11 +37,11 @@
   factions:
   - BradFamily
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledSmallHealingBrute
+    product: CP14WoodenChestFilledSmallHealingBrute
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledSmallHealingBrute
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledSmallHealingBrute
   name: healing potions chest
   components:
   - type: StorageFill
@@ -60,11 +60,11 @@
   factions:
   - BradFamily
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledSmallHealingPoison
+    product: CP14WoodenChestFilledSmallHealingPoison
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledSmallHealingPoison
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledSmallHealingPoison
   name: antidote potions chest
   components:
   - type: StorageFill
@@ -83,11 +83,11 @@
   factions:
   - BradFamily
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledSmallHealingAirloss
+    product: CP14WoodenChestFilledSmallHealingAirloss
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledSmallHealingAirloss
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledSmallHealingAirloss
   name: airloss healing potions chest
   components:
   - type: StorageFill
@@ -106,11 +106,11 @@
   factions:
   - BradFamily
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledSmallHealingBlood
+    product: CP14WoodenChestFilledSmallHealingBlood
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledSmallHealingBlood
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledSmallHealingBlood
   name: blood restoration potions chest
   components:
   - type: StorageFill
@@ -129,11 +129,11 @@
   factions:
   - BradFamily
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledSmallHealingMana
+    product: CP14WoodenChestFilledSmallHealingMana
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledSmallHealingMana
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledSmallHealingMana
   name: mana potions chest
   components:
   - type: StorageFill
@@ -152,11 +152,11 @@
   factions:
   - BradFamily
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledSmallSpeedUp
+    product: CP14WoodenChestFilledSmallSpeedUp
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledSmallSpeedUp
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledSmallSpeedUp
   name: accseleration potions chest
   components:
   - type: StorageFill
@@ -175,11 +175,11 @@
   factions:
   - BradFamily
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledSmallRainbow
+    product: CP14WoodenChestFilledSmallRainbow
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledSmallRainbow
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledSmallRainbow
   name: funny potions chest
   components:
   - type: StorageFill

Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy.yml

@@ -8,11 +8,11 @@
   factions:
   - SpiceStream
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledFarmSeeds
+    product: CP14WoodenChestFilledFarmSeeds
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledFarmSeeds
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledFarmSeeds
   name: farm seeds chest
   components:
   - type: StorageFill
@@ -43,11 +43,11 @@
   factions:
   - SpiceStream
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledCheese
+    product: CP14WoodenChestFilledCheese
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledCheese
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledCheese
   name: cheese chest
   components:
   - type: StorageFill
@@ -147,11 +147,11 @@
   factions:
   - SpiceStream
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledBureaucracy
+    product: CP14WoodenChestFilledBureaucracy
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledBureaucracy
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledBureaucracy
   name: bureaucracy chest
   components:
   - type: StorageFill
@@ -204,11 +204,11 @@
   factions:
   - SpiceStream
   service: !type:CP14BuyItemsService
-    product: CP14BrassChestFilledEnergyCrystals
+    product: CP14WoodenChestFilledEnergyCrystals
 
 - type: entity
-  parent: CP14BrassChest
-  id: CP14BrassChestFilledEnergyCrystals
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledEnergyCrystals
   name: energy crystals chest
   components:
   - type: StorageFill

Resources/Prototypes/_CP14/Entities/Structures/Floor/floorLava.yml

@@ -0,0 +1,58 @@
+- type: entity
+  id: CP14FloorLava
+  name: lava
+  description: Don't jump in. It's not worth it, no matter how funny it is.
+  categories: [ ForkFiltered ]
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wall
+  components:
+  - type: PlacementReplacement
+    key: floorTile
+  - type: TileEmission
+    range: 0.5
+    color: "#ed811c"
+  - type: StepTrigger
+    requiredTriggeredSpeed: 0
+    intersectRatio: 0.1
+    blacklist:
+      tags:
+        - Catwalk
+  - type: TileEntityEffect
+    effects:
+    - !type:FlammableReaction
+      multiplier: 3.75
+      multiplierOnExisting: 0.75
+    - !type:Ignite
+  - type: Transform
+    anchored: true
+  - type: SyncSprite
+  - type: Clickable
+  - type: Sprite
+    sprite: _CP14/Tiles/Water/lava.rsi
+    drawdepth: BelowFloor
+  - type: Icon
+    sprite: _CP14/Tiles/Water/lava.rsi
+    state: full
+  - type: IconSmooth
+    shader: unshaded
+    key: CP14Lava
+    base: water
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        layer:
+          - SlipLayer
+        mask:
+          - ItemMask
+        density: 1000
+        hard: false
+  - type: Tag
+    tags:
+      - HideContextMenu

Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml

@@ -8,11 +8,12 @@
   - type: Transform
     noRot: true
   - type: Icon
-    sprite: _CP14/Structures/Storage/Crates/woodenchest.rsi
+    sprite: _CP14/Structures/Storage/Crates/chest.rsi
     state: icon
   - type: Sprite
+    offset: 0,0.3
     noRot: true
-    sprite: _CP14/Structures/Storage/Crates/woodenchest.rsi
+    sprite: _CP14/Structures/Storage/Crates/chest.rsi
     layers:
     - state: base
       map: ["enum.StorageVisualLayers.Base"]

Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml

@@ -8,10 +8,10 @@
   description: Base for any wooden chest
   components:
   - type: Icon
-    sprite: _CP14/Structures/Storage/Crates/woodenchest.rsi
+    sprite: _CP14/Structures/Storage/Crates/chest.rsi
     state: base
   - type: Sprite
-    sprite: _CP14/Structures/Storage/Crates/woodenchest.rsi
+    sprite: _CP14/Structures/Storage/Crates/chest.rsi
     noRot: true
     state: base
   - type: Damageable
@@ -56,10 +56,10 @@
   description: A simple wooden chest for easy storage of junk.
   components:
   - type: Icon
-    sprite: _CP14/Structures/Storage/Crates/woodenchest.rsi
+    sprite: _CP14/Structures/Storage/Crates/chest.rsi
     state: icon
   - type: Sprite
-    sprite: _CP14/Structures/Storage/Crates/woodenchest.rsi
+    sprite: _CP14/Structures/Storage/Crates/chest.rsi
     layers:
     - state: base
       map: ["enum.StorageVisualLayers.Base"]
@@ -104,16 +104,3 @@
     node: CP14WoodenChest
     containers:
     - entity_storage
-
-- type: entity
-  parent: 
-  - CP14WoodenChest
-  id: CP14BrassChest
-  name: brass chest
-  description: A simple brass chest for easy storage of junk.
-  components:
-  - type: Icon
-    sprite: _CP14/Structures/Storage/Crates/brasschest.rsi
-    state: icon
-  - type: Sprite
-    sprite: _CP14/Structures/Storage/Crates/brasschest.rsi

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml

@@ -22,6 +22,27 @@
       minGroupSize: 5
       maxGroupSize: 8
 
+- type: cp14DemiplaneModifier
+  id: Lava
+  tiers:
+    - 1
+    - 2
+    - 3
+  generationWeight: 0.3
+  categories:
+    Danger: 0.33
+  blacklistTags:
+  - CP14DemiplaneCold
+  - CP14DemiplaneHerbals
+  layers:
+    - !type:OreDunGen
+      entity: CP14FloorLava
+      tileMask:
+      - CP14FloorBase
+      count: 8
+      minGroupSize: 3
+      maxGroupSize: 5
+
 # TIER 2
 
 - type: cp14DemiplaneModifier

Resources/Prototypes/_CP14/Recipes/Construction/storage.yml

@@ -29,7 +29,7 @@
   targetNode: CP14WoodenChest
   category: construction-category-storage
   icon:
-    sprite: _CP14/Structures/Storage/Crates/woodenchest.rsi
+    sprite: _CP14/Structures/Storage/Crates/chest.rsi
     state: icon
   objectType: Structure
   placementMode: SnapgridCenter

Resources/Textures/_CP14/Structures/Storage/Crates/brasschest.rsi/meta.json

@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-4.0",
-  "copyright": "Created by Agoichi (Github), modified by Jaraten and vladimir.s",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "closed"
-    },
-    {
-      "name": "open"
-    }
-  ]
-}

Resources/Textures/_CP14/Structures/Storage/Crates/chest.rsi/meta.json

@@ -1,10 +1,10 @@
 {
   "version": 1,
   "license": "CC-BY-SA-4.0",
-  "copyright": "Created by Agoichi (Github), modified by Jaraten and vladimir.s",
+  "copyright": "Created by vladimir.s",
   "size": {
     "x": 32,
-    "y": 32
+    "y": 48
   },
   "states": [
     {

Resources/Textures/_CP14/Tiles/Water/lava.rsi/meta.json

@@ -0,0 +1,254 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "All right reserved",
+  "copyright": "Created by vladimir.s for Crystallpunk",
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "water0",
+      "directions": 4,
+      "delays": [
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ]
+      ]
+    },
+    {
+      "name": "water1",
+      "directions": 4,
+      "delays": [
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ]
+      ]
+    },
+    {
+      "name": "water2",
+      "directions": 4,
+      "delays": [
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ]
+      ]
+    },
+    {
+      "name": "water3",
+      "directions": 4,
+      "delays": [
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ]
+      ]
+    },
+    {
+      "name": "water4",
+      "directions": 4,
+      "delays": [
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ]
+      ]
+    },
+    {
+      "name": "water5",
+      "directions": 4,
+      "delays": [
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ]
+      ]
+    },
+    {
+      "name": "water6",
+      "directions": 4,
+      "delays": [
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ]
+      ]
+    },
+    {
+      "name": "water7",
+      "directions": 4,
+      "delays": [
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ],
+        [
+          0.35,
+          0.35,
+          0.35,
+          0.35
+        ]
+      ]
+    }
+  ]
+}

Resources/migration.yml

@@ -295,6 +295,19 @@ CP14ClothingOuterClothingInfantryCuirass: CP14ArmorIronCuirass
 CP14ClothingOuterClothingCuirassLoincloth: CP14ArmorIronCuirass
 CP14ClothingOuterClothingCuirassLeg: CP14ArmorIronCuirass
 
+#2025-11-03
+CP14BrassChest: CP14WoodenChest
+CP14BrassChestFilledEnergyCrystals: CP14WoodenChestFilledEnergyCrystals
+CP14BrassChestFilledAlchemy: CP14WoodenChestFilledAlchemy
+CP14BrassChestFilledCheese: CP14WoodenChestFilledCheese
+CP14BrassChestFilledSmallHealingBrute: CP14WoodenChestFilledSmallHealingBrute
+CP14BrassChestFilledSmallHealingPoison: CP14WoodenChestFilledSmallHealingPoison
+CP14BrassChestFilledSmallHealingAirloss: CP14WoodenChestFilledSmallHealingAirloss
+CP14BrassChestFilledSmallHealingBlood: CP14WoodenChestFilledSmallHealingBlood
+CP14BrassChestFilledSmallHealingMana: CP14WoodenChestFilledSmallHealingMana
+CP14BrassChestFilledSmallSpeedUp: CP14WoodenChestFilledSmallSpeedUp
+CP14BrassChestFilledSmallRainbow: CP14WoodenChestFilledSmallRainbow
+CP14BrassChestFilledFarmSeeds: CP14WoodenChestFilledFarmSeeds
 
 # <---> CrystallEdge migration zone end