Refactors, bugfixs + Crystals (#127)

* fix dwarf displacement map

* Big Fireplace update

* add crystalls placeholder

* bonfire update

* displaccement update

* Update wallmount_torch.yml

Resources/Prototypes/_CP14/Entities/Structures/Furniture/bonfire.yml

@@ -9,9 +9,9 @@
     sprite: _CP14/Structures/Furniture/bonfire.rsi
     layers:
       - state: base
-      - state: full1
+      - state: full-1
         visible: false
-        map: ["fuel"]
+      - map: ["enum.StorageFillLayers.Fill"]
   - type: Construction
     graph: CP14Bonfire
     node: CP14Bonfire
@@ -26,20 +26,12 @@
         behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
-  - type: GenericVisualizer
-    visuals:
-      enum.FireplaceFuelVisuals.Status:
-        fuel:
-          Empty: { visible: false }
-          Medium: { visible: true, state: full1 }
-          Full: { visible: true, state: full2 }
+  - type: StorageFillVisualizer
+    maxFillLevels: 2
+    fillBaseName: full
   - type: FireVisuals
     sprite: _CP14/Structures/Furniture/bonfire.rsi
     normalState: burning
-
-- type: entity
-  id: CP14Stick
-  parent: CP14Bucket
-  name: Stick!!!
-  components:
-  - type: CP14FireplaceFuel
+  - type: Storage
+    grid:
+    - 0,0,2,1

Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml

@@ -56,7 +56,6 @@
   - type: CP14Fireplace
     maxFuelLimit: 150
     currentFuel: 150
-    canInsertByHand: false
   - type: FireVisuals
     sprite: _CP14/Structures/Furniture/wallmount_torch.rsi
     normalState: fire

Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml

@@ -43,6 +43,21 @@
   - type: CP14FlammableEntityHeater
   - type: CP14FlammableSolutionHeater
   - type: CP14Fireplace
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,2,2
+    blacklist:
+      components:
+        - IgnitionSource
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
 
 - type: entity
   id: CP14AlchemyFurnaceDebug
@@ -110,4 +125,7 @@
         mask:
         - TableMask
         layer:
-        - TableLayer
+        - TableLayer
+  - type: Storage
+    grid:
+    - 0,0,2,2

Resources/Prototypes/_CP14/Entities/Structures/Wallmount/crystal.yml

@@ -0,0 +1,116 @@
+- type: entity
+  id: CP14WallmountCrystalBase
+  parent: 
+  - BaseStructure
+  abstract: true
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _CP14/Structures/Wallmount/wallmount_crystal.rsi
+    layers:
+      - state: crystal1
+        map: ["random"]
+        shader: unshaded
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Glass
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 20
+        behaviors:
+          - !type:PlaySoundBehavior
+            sound:
+              collection: GlassBreak
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "0.49,0.49,-0.49,0.36"
+        density: 60
+        mask:
+        - MachineMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: RandomSprite
+    available:
+    - random:
+        crystal1: Inherit
+        crystal2: Inherit
+        crystal3: Inherit
+  - type: PointLight
+    radius: 1.5
+    energy: 1
+
+- type: entity
+  id: CP14WallmountCrystalRubies
+  parent: CP14WallmountCrystalBase
+  name: sparkling rubies
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#ff3d0b"
+  - type: PointLight
+    color: "#ff3d0b"
+
+- type: entity
+  id: CP14WallmountCrystalTopazes
+  parent: CP14WallmountCrystalBase
+  name: sparkling topazes
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#ffe269"
+  - type: PointLight
+    color: "#ffe269"
+
+- type: entity
+  id: CP14WallmountCrystalEmeralds
+  parent: CP14WallmountCrystalBase
+  name: sparkling emeralds
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#30be81"
+  - type: PointLight
+    color: "#30be81"
+
+- type: entity
+  id: CP14WallmountCrystalSapphires
+  parent: CP14WallmountCrystalBase
+  name: sparkling sapphires
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#5eabeb"
+  - type: PointLight
+    color: "#5eabeb"
+
+- type: entity
+  id: CP14WallmountCrystalAmethysts
+  parent: CP14WallmountCrystalBase
+  name: sparkling amethysts
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#a878d1"
+  - type: PointLight
+    color: "#a878d1"
+
+- type: entity
+  id: CP14WallmountCrystalDiamonds
+  parent: CP14WallmountCrystalBase
+  name: sparkling diamonds
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#f8f8f8"
+  - type: PointLight
+    color: "#f8f8f8"

Resources/Prototypes/_CP14/Entities/Structures/Wallmount/wallmount.yml

@@ -10,7 +10,7 @@
   components:
   - type: Sprite
     drawdepth: Mobs
-    sprite: _CP14/Structures/Decoration/wallmount_decor.rsi
+    sprite: _CP14/Structures/Wallmount/wallmount_decor.rsi
     layers:
       - state: boards
         map: ["random"]
@@ -49,7 +49,7 @@
   components:
   - type: Sprite
     drawdepth: Mobs
-    sprite: _CP14/Structures/Decoration/wallmount_decor.rsi
+    sprite: _CP14/Structures/Wallmount/wallmount_decor.rsi
     layers:
       - state: web
         map: ["random"]
@@ -88,7 +88,7 @@
   components:
   - type: Sprite
     drawdepth: Mobs
-    sprite: _CP14/Structures/Decoration/wallmount_decor.rsi
+    sprite: _CP14/Structures/Wallmount/wallmount_decor.rsi
     layers:
       - state: vines
   - type: Damageable

Resources/Prototypes/_CP14/Entities/Structures/crystal.yml

@@ -0,0 +1,119 @@
+- type: entity
+  id: CP14CrystalBase
+  abstract: true
+  parent: BaseStructure
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _CP14/Structures/crystal.rsi
+    offset: 0, 0.25
+    layers:
+      - state: big
+        map: ["random"]
+        shader: unshaded
+    noRot: true
+  - type: Physics
+    bodyType: Static
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Glass
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 20
+        behaviors:
+          - !type:PlaySoundBehavior
+            sound:
+              collection: GlassBreak
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.45
+        density: 60
+        mask:
+          - MachineMask
+        layer:
+          - MidImpassable
+          - LowImpassable
+          - BulletImpassable
+          - Opaque
+  - type: RandomSprite
+    available:
+    - random:
+        big: Inherit
+        medium: Inherit
+        small: Inherit
+  - type: PointLight
+    radius: 2
+    energy: 2
+
+- type: entity
+  id: CP14CrystalRubies
+  parent: CP14CrystalBase
+  name: sparkling rubies
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#ff3d0b"
+  - type: PointLight
+    color: "#ff3d0b"
+
+- type: entity
+  id: CP14CrystalTopazes
+  parent: CP14CrystalBase
+  name: sparkling topazes
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#ffe269"
+  - type: PointLight
+    color: "#ffe269"
+
+- type: entity
+  id: CP14CrystalEmeralds
+  parent: CP14CrystalBase
+  name: sparkling emeralds
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#30be81"
+  - type: PointLight
+    color: "#30be81"
+
+- type: entity
+  id: CP14CrystalSapphires
+  parent: CP14CrystalBase
+  name: sparkling sapphires
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#5eabeb"
+  - type: PointLight
+    color: "#5eabeb"
+
+- type: entity
+  id: CP14CrystalAmethysts
+  parent: CP14CrystalBase
+  name: sparkling amethysts
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#a878d1"
+  - type: PointLight
+    color: "#a878d1"
+
+- type: entity
+  id: CP14CrystalDiamonds
+  parent: CP14CrystalBase
+  name: sparkling diamonds
+  description: wawa
+  components:
+  - type: RandomSprite
+    cP14InheritBaseColor: "#f8f8f8"
+  - type: PointLight
+    color: "#f8f8f8"