From a2f4540cb5cfc58b97ea2c0b1c3e75fc9cb64b28 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Wed, 29 May 2024 01:56:41 +0200
Subject: [PATCH] Remake gasp popup to emote (#27736)
---
.../Body/Components/RespiratorComponent.cs | 12 +++++-
.../Body/Systems/RespiratorSystem.cs | 10 ++---
Resources/Audio/Effects/Gasp/attributions.yml | 26 ++++++++++++
Resources/Audio/Effects/Gasp/deathgasp_1.ogg | Bin 0 -> 15759 bytes
Resources/Audio/Effects/Gasp/deathgasp_2.ogg | Bin 0 -> 26424 bytes
.../Audio/Effects/Gasp/female_deathgasp_1.ogg | Bin 0 -> 11025 bytes
.../Audio/Effects/Gasp/female_deathgasp_2.ogg | Bin 0 -> 9004 bytes
.../Audio/Effects/Gasp/female_deathgasp_3.ogg | Bin 0 -> 7700 bytes
.../Audio/Effects/Gasp/female_deathgasp_4.ogg | Bin 0 -> 8684 bytes
.../Audio/Effects/Gasp/female_deathgasp_5.ogg | Bin 0 -> 9132 bytes
Resources/Audio/Effects/Gasp/gasp_female1.ogg | Bin 0 -> 8511 bytes
Resources/Audio/Effects/Gasp/gasp_female2.ogg | Bin 0 -> 9203 bytes
Resources/Audio/Effects/Gasp/gasp_female3.ogg | Bin 0 -> 8278 bytes
Resources/Audio/Effects/Gasp/gasp_male1.ogg | Bin 0 -> 7998 bytes
Resources/Audio/Effects/Gasp/gasp_male2.ogg | Bin 0 -> 8192 bytes
.../Audio/Effects/Gasp/male_deathgasp_1.ogg | Bin 0 -> 9378 bytes
.../Audio/Effects/Gasp/male_deathgasp_2.ogg | Bin 0 -> 7791 bytes
.../Audio/Effects/Gasp/male_deathgasp_3.ogg | Bin 0 -> 6899 bytes
.../Audio/Effects/Gasp/male_deathgasp_4.ogg | Bin 0 -> 8684 bytes
.../Audio/Effects/Gasp/male_deathgasp_5.ogg | Bin 0 -> 9132 bytes
.../Locale/en-US/body/behavior/behavior.ftl | 1 -
Resources/Locale/en-US/chat/emotes.ftl | 2 +
.../Prototypes/SoundCollections/deathgasp.yml | 23 ++++++++++
.../Prototypes/SoundCollections/gasp.yml | 12 ++++++
.../Prototypes/Voice/speech_emote_sounds.yml | 40 ++++++++++++++++++
Resources/Prototypes/Voice/speech_emotes.yml | 10 ++++-
26 files changed, 127 insertions(+), 9 deletions(-)
create mode 100644 Resources/Audio/Effects/Gasp/attributions.yml
create mode 100644 Resources/Audio/Effects/Gasp/deathgasp_1.ogg
create mode 100644 Resources/Audio/Effects/Gasp/deathgasp_2.ogg
create mode 100644 Resources/Audio/Effects/Gasp/female_deathgasp_1.ogg
create mode 100644 Resources/Audio/Effects/Gasp/female_deathgasp_2.ogg
create mode 100644 Resources/Audio/Effects/Gasp/female_deathgasp_3.ogg
create mode 100644 Resources/Audio/Effects/Gasp/female_deathgasp_4.ogg
create mode 100644 Resources/Audio/Effects/Gasp/female_deathgasp_5.ogg
create mode 100644 Resources/Audio/Effects/Gasp/gasp_female1.ogg
create mode 100644 Resources/Audio/Effects/Gasp/gasp_female2.ogg
create mode 100644 Resources/Audio/Effects/Gasp/gasp_female3.ogg
create mode 100644 Resources/Audio/Effects/Gasp/gasp_male1.ogg
create mode 100644 Resources/Audio/Effects/Gasp/gasp_male2.ogg
create mode 100644 Resources/Audio/Effects/Gasp/male_deathgasp_1.ogg
create mode 100644 Resources/Audio/Effects/Gasp/male_deathgasp_2.ogg
create mode 100644 Resources/Audio/Effects/Gasp/male_deathgasp_3.ogg
create mode 100644 Resources/Audio/Effects/Gasp/male_deathgasp_4.ogg
create mode 100644 Resources/Audio/Effects/Gasp/male_deathgasp_5.ogg
delete mode 100644 Resources/Locale/en-US/body/behavior/behavior.ftl
create mode 100644 Resources/Prototypes/SoundCollections/deathgasp.yml
create mode 100644 Resources/Prototypes/SoundCollections/gasp.yml
diff --git a/Content.Server/Body/Components/RespiratorComponent.cs b/Content.Server/Body/Components/RespiratorComponent.cs
index 4045e21e26..a81062362a 100644
--- a/Content.Server/Body/Components/RespiratorComponent.cs
+++ b/Content.Server/Body/Components/RespiratorComponent.cs
@@ -1,5 +1,7 @@
using Content.Server.Body.Systems;
+using Content.Shared.Chat.Prototypes;
using Content.Shared.Damage;
+using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
namespace Content.Server.Body.Components
@@ -50,10 +52,16 @@ namespace Content.Server.Body.Components
public DamageSpecifier DamageRecovery = default!;
[DataField]
- public TimeSpan GaspPopupCooldown = TimeSpan.FromSeconds(8);
+ public TimeSpan GaspEmoteCooldown = TimeSpan.FromSeconds(8);
[ViewVariables]
- public TimeSpan LastGaspPopupTime;
+ public TimeSpan LastGaspEmoteTime;
+
+ ///
+ /// The emote when gasps
+ ///
+ [DataField]
+ public ProtoId GaspEmote = "Gasp";
///
/// How many cycles in a row has the mob been under-saturated?
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index c7266e2c46..a46294beb4 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -2,8 +2,8 @@ using Content.Server.Administration.Logs;
using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Body.Components;
+using Content.Server.Chat.Systems;
using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Popups;
using Content.Shared.Alert;
using Content.Shared.Atmos;
using Content.Shared.Body.Components;
@@ -25,9 +25,9 @@ public sealed class RespiratorSystem : EntitySystem
[Dependency] private readonly BodySystem _bodySystem = default!;
[Dependency] private readonly DamageableSystem _damageableSys = default!;
[Dependency] private readonly LungSystem _lungSystem = default!;
- [Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+ [Dependency] private readonly ChatSystem _chat = default!;
public override void Initialize()
{
@@ -84,10 +84,10 @@ public sealed class RespiratorSystem : EntitySystem
if (respirator.Saturation < respirator.SuffocationThreshold)
{
- if (_gameTiming.CurTime >= respirator.LastGaspPopupTime + respirator.GaspPopupCooldown)
+ if (_gameTiming.CurTime >= respirator.LastGaspEmoteTime + respirator.GaspEmoteCooldown)
{
- respirator.LastGaspPopupTime = _gameTiming.CurTime;
- _popupSystem.PopupEntity(Loc.GetString("lung-behavior-gasp"), uid);
+ respirator.LastGaspEmoteTime = _gameTiming.CurTime;
+ _chat.TryEmoteWithChat(uid, respirator.GaspEmote, ignoreActionBlocker: true);
}
TakeSuffocationDamage((uid, respirator));
diff --git a/Resources/Audio/Effects/Gasp/attributions.yml b/Resources/Audio/Effects/Gasp/attributions.yml
new file mode 100644
index 0000000000..fe8f817c5a
--- /dev/null
+++ b/Resources/Audio/Effects/Gasp/attributions.yml
@@ -0,0 +1,26 @@
+- files:
+ - deathgasp_1.ogg
+ - deathgasp_2.ogg
+ - female_deathgasp_1.ogg
+ - female_deathgasp_2.ogg
+ - female_deathgasp_3.ogg
+ - female_deathgasp_4.ogg
+ - female_deathgasp_5.ogg
+ - male_deathgasp_1.ogg
+ - male_deathgasp_2.ogg
+ - male_deathgasp_3.ogg
+ - male_deathgasp_4.ogg
+ - male_deathgasp_5.ogg
+ license: "CC-BY-SA-3.0"
+ copyright: "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/4397f13c72998aa7e6ce192215c9f77b9d62eee2"
+ source: "https://github.com/ParadiseSS13/Paradise/tree/4397f13c72998aa7e6ce192215c9f77b9d62eee2/sound/goonstation/voice"
+
+- files:
+ - gasp_female1.ogg
+ - gasp_female2.ogg
+ - gasp_female3.ogg
+ - gasp_male1.ogg
+ - gasp_male2.ogg
+ license: "CC-BY-SA-3.0"
+ copyright: "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f7a49c4068f1277e6857baf0892d355f1c055974"
+ source: "https://github.com/tgstation/tgstation/tree/f7a49c4068f1277e6857baf0892d355f1c055974/sound/voice/human"
diff --git a/Resources/Audio/Effects/Gasp/deathgasp_1.ogg b/Resources/Audio/Effects/Gasp/deathgasp_1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..d6e4f8a9e758086c63e0bd6e620d21a11686a7c9
GIT binary patch
literal 15759
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