From 36c40bafd7c89906c6c9b413d0c457a5890b15bf Mon Sep 17 00:00:00 2001 From: Remuchi Date: Fri, 8 Mar 2024 23:06:46 +0700 Subject: [PATCH] =?UTF-8?q?remove:=20=D1=83=D0=B1=D1=80=D0=B0=D0=BD=20?= =?UTF-8?q?=D0=B0=D0=BA=D1=88=D0=B5=D0=BD=20=D0=9A=D1=80=D0=B8=D1=87=D0=B0?= =?UTF-8?q?=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Speech/Components/VocalComponent.cs | 7 ----- .../Speech/EntitySystems/VocalSystem.cs | 31 ------------------- Content.Server/Speech/Muting/MutingSystem.cs | 18 ++--------- Content.Shared/Speech/ScreamActionEvent.cs | 7 ----- .../ss14-ru/prototypes/actions/types.ftl | 2 -- Resources/Prototypes/Actions/types.yml | 13 -------- Resources/Prototypes/Catalog/catalog.yml | 10 ------ 7 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 Content.Shared/Speech/ScreamActionEvent.cs diff --git a/Content.Server/Speech/Components/VocalComponent.cs b/Content.Server/Speech/Components/VocalComponent.cs index ab01f01a9d..513e0e8b95 100644 --- a/Content.Server/Speech/Components/VocalComponent.cs +++ b/Content.Server/Speech/Components/VocalComponent.cs @@ -3,7 +3,6 @@ using Content.Server._White.AspectsSystem.Aspects; using Content.Shared.Chat.Prototypes; using Content.Shared.Humanoid; using Robust.Shared.Audio; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; @@ -32,12 +31,6 @@ public sealed partial class VocalComponent : Component [DataField("wilhelmProbability")] public float WilhelmProbability = 0.0002f; - [DataField("screamAction", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string ScreamAction = "ActionScream"; - - [DataField("screamActionEntity")] - public EntityUid? ScreamActionEntity; - /// /// Currently loaded emote sounds prototype, based on entity sex. /// Null if no valid prototype for entity sex was found. diff --git a/Content.Server/Speech/EntitySystems/VocalSystem.cs b/Content.Server/Speech/EntitySystems/VocalSystem.cs index aedcbbd099..47a3e9936b 100644 --- a/Content.Server/Speech/EntitySystems/VocalSystem.cs +++ b/Content.Server/Speech/EntitySystems/VocalSystem.cs @@ -1,10 +1,8 @@ -using Content.Server.Actions; using Content.Server.Chat.Systems; using Content.Server.Speech.Components; using Content.Shared.Chat.Prototypes; using Content.Shared.Humanoid; using Content.Shared.Speech; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Prototypes; using Robust.Shared.Random; @@ -17,33 +15,13 @@ public sealed class VocalSystem : EntitySystem [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly ActionsSystem _actions = default!; public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnMapInit); - SubscribeLocalEvent(OnShutdown); SubscribeLocalEvent(OnSexChanged); SubscribeLocalEvent(OnEmote); - SubscribeLocalEvent(OnScreamAction); - } - - private void OnMapInit(EntityUid uid, VocalComponent component, MapInitEvent args) - { - // try to add scream action when vocal comp added - _actions.AddAction(uid, ref component.ScreamActionEntity, component.ScreamAction); - LoadSounds(uid, component); - } - - private void OnShutdown(EntityUid uid, VocalComponent component, ComponentShutdown args) - { - // remove scream action when component removed - if (component.ScreamActionEntity != null) - { - _actions.RemoveAction(uid, component.ScreamActionEntity); - } } private void OnSexChanged(EntityUid uid, VocalComponent component, SexChangedEvent args) @@ -67,15 +45,6 @@ public sealed class VocalSystem : EntitySystem args.Handled = _chat.TryPlayEmoteSound(uid, component.EmoteSounds, args.Emote); } - private void OnScreamAction(EntityUid uid, VocalComponent component, ScreamActionEvent args) - { - if (args.Handled) - return; - - _chat.TryEmoteWithChat(uid, component.ScreamId); - args.Handled = true; - } - private bool TryPlayScreamSound(EntityUid uid, VocalComponent component) { if (_random.Prob(component.WilhelmProbability)) diff --git a/Content.Server/Speech/Muting/MutingSystem.cs b/Content.Server/Speech/Muting/MutingSystem.cs index b743d9eda8..83a0e54c02 100644 --- a/Content.Server/Speech/Muting/MutingSystem.cs +++ b/Content.Server/Speech/Muting/MutingSystem.cs @@ -12,12 +12,12 @@ namespace Content.Server.Speech.Muting public sealed class MutingSystem : EntitySystem { [Dependency] private readonly PopupSystem _popupSystem = default!; + public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnSpeakAttempt); SubscribeLocalEvent(OnEmote, before: new[] { typeof(VocalSystem) }); - SubscribeLocalEvent(OnScreamAction, before: new[] { typeof(VocalSystem) }); } private void OnEmote(EntityUid uid, MutedComponent component, ref EmoteEvent args) @@ -30,20 +30,6 @@ namespace Content.Server.Speech.Muting args.Handled = true; } - private void OnScreamAction(EntityUid uid, MutedComponent component, ScreamActionEvent args) - { - if (args.Handled) - return; - - if (HasComp(uid)) - _popupSystem.PopupEntity(Loc.GetString("mime-cant-speak"), uid, uid); - - else - _popupSystem.PopupEntity(Loc.GetString("speech-muted"), uid, uid); - args.Handled = true; - } - - private void OnSpeakAttempt(EntityUid uid, MutedComponent component, SpeakAttemptEvent args) { // TODO something better than this. @@ -58,4 +44,4 @@ namespace Content.Server.Speech.Muting args.Cancel(); } } -} +} \ No newline at end of file diff --git a/Content.Shared/Speech/ScreamActionEvent.cs b/Content.Shared/Speech/ScreamActionEvent.cs deleted file mode 100644 index 756f65a35d..0000000000 --- a/Content.Shared/Speech/ScreamActionEvent.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Content.Shared.Actions; - -namespace Content.Shared.Speech; - -public sealed partial class ScreamActionEvent : InstantActionEvent -{ -} diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl index 07546da98e..4a9364816a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl @@ -1,5 +1,3 @@ -ent-ActionScream = Крикнуть - .desc = ААААААААААААААААААААААААА ent-ActionTurnUndead = Обратиться в зомби .desc = Поддайтесь заражению и превратитесь в зомби. ent-ActionToggleLight = Переключить фонарь diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index ab650286bc..cd22605b64 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -1,16 +1,3 @@ -- type: entity - id: ActionScream - name: Scream - description: AAAAAAAAAAAAAAAAAAAAAAAAA - noSpawn: true - components: - - type: InstantAction - useDelay: 10 - icon: Interface/Actions/scream.png - event: !type:ScreamActionEvent - checkCanInteract: false - - type: LesserFormRestricted - - type: entity id: ActionTurnUndead name: Turn Undead diff --git a/Resources/Prototypes/Catalog/catalog.yml b/Resources/Prototypes/Catalog/catalog.yml index 49cdef2a40..07bc9f850d 100644 --- a/Resources/Prototypes/Catalog/catalog.yml +++ b/Resources/Prototypes/Catalog/catalog.yml @@ -24,16 +24,6 @@ categories: - Debug -- type: listing - id: DebugListing4 - name: debug name 4 - description: debug desc 4 - productAction: ActionScream - categories: - - Debug - cost: - DebugDollar: 1 - - type: listing id: DebugListing2 name: debug name 2