now with sound! (#20287)

diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
index 0fb3614393bf4e9af16266eadb10fe20b5ffe7dc..6934b67c5eb181a97794fb5bff2bd17698fa1808 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
@@ -6,7 +6,9 @@
   components:
   - type: Sprite
     sprite: Structures/Decoration/bonfire.rsi
-    state: burning
+    layers:
+      - state: bonfire
+      - state: burning
   - type: PointLight
     radius: 5
     energy: 3
@@ -22,6 +24,11 @@
         behaviors:
           - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: AmbientSound
+    volume: -5
+    range: 5
+    sound:
+      path: /Audio/Ambience/Objects/fireplace.ogg
 
 - type: entity
   id: LegionnaireBonfire
@@ -30,6 +37,7 @@
   description: There, in the land of lava and ash, place to to cook marshmallow and potato.
   components:
   - type: Sprite
-    state: legionnaire_bonfire
+    layers:
+      - state: legionnaire_bonfire
   - type: PointLight
     color: "#FF5601"

diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_0.png b/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png
similarity index 100%
rename from Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_0.png
rename to Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png

diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_1.png b/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_extinguished.png
similarity index 100%
rename from Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_1.png
rename to Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_extinguished.png

diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/meta.json b/Resources/Textures/Structures/Decoration/bonfire.rsi/meta.json
index bfa6011fdddb7c271b1d858f8d26125974a36f36..a30ea680c5d641e2c89a7359487c7f83ee42710f 100644 (file)
--- a/Resources/Textures/Structures/Decoration/bonfire.rsi/meta.json
+++ b/Resources/Textures/Structures/Decoration/bonfire.rsi/meta.json
@@ -8,10 +8,10 @@
   },
   "states": [
     {
-      "name": "bonfire_0"
+      "name": "bonfire"
     },
     {
-      "name": "bonfire_1"
+      "name": "bonfire_extinguished"
     },
     {
       "name": "burning",