From 60ae5642791281a30b814260d742805a15b8ea21 Mon Sep 17 00:00:00 2001 From: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com> Date: Mon, 18 Sep 2023 22:17:59 +0300 Subject: [PATCH] now with sound! (#20287) --- .../Entities/Structures/Decoration/bonfire.yml | 12 ++++++++++-- .../bonfire.rsi/{bonfire_0.png => bonfire.png} | Bin .../{bonfire_1.png => bonfire_extinguished.png} | Bin .../Structures/Decoration/bonfire.rsi/meta.json | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) rename Resources/Textures/Structures/Decoration/bonfire.rsi/{bonfire_0.png => bonfire.png} (100%) rename Resources/Textures/Structures/Decoration/bonfire.rsi/{bonfire_1.png => bonfire_extinguished.png} (100%) diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml index 0fb3614393..6934b67c5e 100644 --- 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 bfa6011fdd..a30ea680c5 100644 --- 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", -- 2.51.2