From 3bf2514c2d7fb214edb87951d83475fb5cde13de Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Mon, 9 Sep 2024 13:21:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComponentalActions.Abilities.cs | 9 ++++-- .../Components/ElectrionPulseActComponets.cs | 28 +++++++++--------- .../ADT/Actions/componental_actions.yml | 7 ++--- .../Alerts/evaporation.rsi/evaporation.png | Bin 0 -> 702 bytes .../Alerts/evaporation.rsi/meta.json | 14 +++++++++ 5 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 Resources/Textures/ADT/Interface/Alerts/evaporation.rsi/evaporation.png create mode 100644 Resources/Textures/ADT/Interface/Alerts/evaporation.rsi/meta.json diff --git a/Content.Server/ADT/ComponentalActions/EntitySystems/ComponentalActions.Abilities.cs b/Content.Server/ADT/ComponentalActions/EntitySystems/ComponentalActions.Abilities.cs index 4f6c832a546..a1121f324d5 100644 --- a/Content.Server/ADT/ComponentalActions/EntitySystems/ComponentalActions.Abilities.cs +++ b/Content.Server/ADT/ComponentalActions/EntitySystems/ComponentalActions.Abilities.cs @@ -107,6 +107,7 @@ using Robust.Shared.Timing; using Robust.Shared.Utility; using Robust.Server.GameObjects; +using System.Threading; namespace Content.Server.ComponentalActions.EntitySystems; @@ -413,15 +414,17 @@ private void OnElectrionPulse(EntityUid uid, ElectrionPulseActComponent componen { if (args.Handled) return; - _chat.TrySendInGameICMessage(uid, "щёлкает пальцами", InGameICChatType.Emote, ChatTransmitRange.Normal); + _chat.TrySendInGameICMessage(uid, "щёлкает пальцами", InGameICChatType.Emote, ChatTransmitRange.HideChat); _light.SetEnabled(uid, true); _light.SetColor(uid, Color.FromHex("#a83da8")); _light.SetRadius(uid, 1.7f); _light.SetEnergy(uid, 160f); - _audio.PlayPvs(component.IgniteSound, uid); + var despawn = AddComp(uid); despawn.Lifetime = 2.1f; + Thread.Sleep(2000); //2 секунды задержка + _audio.PlayPvs(component.IgniteSound, uid); // // Создаем таймер для задержки // System.Timers.Timer timer = new System.Timers.Timer(); @@ -441,7 +444,7 @@ private void OnElectrionPulse(EntityUid uid, ElectrionPulseActComponent componen // }; // timer.Start(); - // args.Handled = true; + args.Handled = true; } // //OnElectrionPulseAction(uid, component); diff --git a/Content.Shared/ADT/ComponentalActions/Components/ElectrionPulseActComponets.cs b/Content.Shared/ADT/ComponentalActions/Components/ElectrionPulseActComponets.cs index 66853c8a178..5a9ac573a5c 100644 --- a/Content.Shared/ADT/ComponentalActions/Components/ElectrionPulseActComponets.cs +++ b/Content.Shared/ADT/ComponentalActions/Components/ElectrionPulseActComponets.cs @@ -18,7 +18,7 @@ public sealed partial class ElectrionPulseActComponent : Component /// Radius of objects that will be ignited if flammable. /// [DataField] - public float IgnitionRadius = 4f; + public float IgnitionRadius = 5f; [DataField("lifetime")] public float Lifetime = 5f; @@ -41,19 +41,19 @@ public sealed partial class ElectrionPulseActComponent : Component [DataField, ViewVariables(VVAccess.ReadWrite)] public int MaxBoltCount = 5; - /// - /// The maximum radius of the passive electrocution effect - /// scales with stability - /// - [DataField, ViewVariables(VVAccess.ReadWrite)] - public float MaxElectrocuteRange = 7f; + // /// + // /// The maximum radius of the passive electrocution effect + // /// scales with stability + // /// + // [DataField, ViewVariables(VVAccess.ReadWrite)] + // public float MaxElectrocuteRange = 7f; - /// - /// The maximum amount of damage the electrocution can do - /// scales with severity - /// - [DataField, ViewVariables(VVAccess.ReadWrite)] - public float MaxElectrocuteDamage = 20f; + // /// + // /// The maximum amount of damage the electrocution can do + // /// scales with severity + // /// + // [DataField, ViewVariables(VVAccess.ReadWrite)] + // public float MaxElectrocuteDamage = 20f; /// /// The maximum amount of time the electrocution lasts @@ -66,7 +66,7 @@ public sealed partial class ElectrionPulseActComponent : Component /// Radius of objects that will be ignited if flammable. /// [DataField] - public SoundSpecifier IgniteSound = new SoundPathSpecifier("/Audio/Magic/rumble.ogg"); + public SoundSpecifier IgniteSound = new SoundPathSpecifier("/Audio/Magic/forcewall.ogg"); [ViewVariables(VVAccess.ReadWrite)] public float Severity = 0.3f; diff --git a/Resources/Prototypes/ADT/Actions/componental_actions.yml b/Resources/Prototypes/ADT/Actions/componental_actions.yml index c68e8e76344..469e4f81f5a 100644 --- a/Resources/Prototypes/ADT/Actions/componental_actions.yml +++ b/Resources/Prototypes/ADT/Actions/componental_actions.yml @@ -105,12 +105,9 @@ components: - type: InstantAction icon: - sprite: /Textures/ADT/Interface/alerts.rsi - state: levitation + sprite: /Textures/ADT/Interface/Alerts/evaporation.rsi + state: evaporation itemIconStyle: BigAction checkCanInteract: false event: !type:CompElectrionPulseActionEvent useDelay: 5 - - - diff --git a/Resources/Textures/ADT/Interface/Alerts/evaporation.rsi/evaporation.png b/Resources/Textures/ADT/Interface/Alerts/evaporation.rsi/evaporation.png new file mode 100644 index 0000000000000000000000000000000000000000..cb0c33788ddc4f164cbdfef7f887fc5bee12b739 GIT binary patch literal 702 zcmV;v0zv(WP)Px%cu7P-R9J=WmobYIQ4q)fdm{(-R|e7uffon_w!D)^9{3rotTc^Yu1#l~I`Nv* z4`696?D0@bt3VbOt~tnca;+eadre+^dAIv^HVQTlq{*Ai|F^UAW+uRY`^T0@oUFB# z-)pT)B02%^EX%TS#d%}w0|`K#xKaweUhgwAkBu?2ed62$SYuGGF(@VC&WPxOnWx5> z(?16AL7K!@`9lD}^Iu0Vh-k*li&)yL9_}7M2g}6&L5#kyzN09L^LGc|-ZJx)h_)FB zLF!^vW*`P(txfVg_rH1^oJYm|*tGzm<0CzZL40E7F%iwOEL#|3j)~}4A`S?yp&#JN z&J(S52>`ARilR6NaJYdu1#ra7uO;Fl0Bh||2A-&&JLe7nz%76qW?o3e0bw7wvh!_# zkNJaIzqaCH0IhZDKY0wIjkp-V3s?)m%u`>yORE#V821JUyIvIpGmistGaL>Nn_`Oq zoaK2AYi$DT7UDJcUxsPVvg~pL_T{eugcjZg0O-oE2x_X%>2r2L;%pG z)tNhM+9$*SzPR6rfZq!%5zX8};?IsIh(>@wyf&pS1695;h$ujt!9ql{4amF=glH*s zf$IJr1RxXNw+W&WU>|Y+6@)usEPK&w7>dVQ@#YoWG{q7DR5^!ZIc7xkRBQcS;@jAW k{L}~Q_|{w_643>A2lkg)LUl%8SpWb407*qoM6N<$f>Gc(0RR91 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Interface/Alerts/evaporation.rsi/meta.json b/Resources/Textures/ADT/Interface/Alerts/evaporation.rsi/meta.json new file mode 100644 index 00000000000..20ea4c36280 --- /dev/null +++ b/Resources/Textures/ADT/Interface/Alerts/evaporation.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord:Schrodinger71, for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "evaporation" + } + ] + }