Figures can now be activated remotely (#32769)

* First commit

* I'm silly

* weh

* will this work?

* Better design

* Fixes!

* rider :(

* L rider

diff --git a/Content.Server/Chat/SpeakOnTriggerComponent.cs b/Content.Server/Chat/SpeakOnTriggerComponent.cs
new file mode 100644 (file)
index 0000000..d879cbf
--- /dev/null
+++ b/Content.Server/Chat/SpeakOnTriggerComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chat;
+
+/// <summary>
+///     Makes the entity speak when triggered. If the item has UseDelay component, the system will respect that cooldown.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SpeakOnTriggerComponent : Component
+{
+    /// <summary>
+    ///     The identifier for the dataset prototype containing messages to be spoken by this entity.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<LocalizedDatasetPrototype> Pack = string.Empty;
+}

diff --git a/Content.Server/Chat/SpeakOnUseComponent.cs b/Content.Server/Chat/SpeakOnUseComponent.cs
deleted file mode 100644 (file)
index f8953ae..0000000
--- a/Content.Server/Chat/SpeakOnUseComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Dataset;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chat;
-
-/// <summary>
-/// Entity will say the things when activated
-/// </summary>
-[RegisterComponent]
-public sealed partial class SpeakOnUseComponent : Component
-{
-    /// <summary>
-    /// The identifier for the dataset prototype containing messages to be spoken by this entity.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<LocalizedDatasetPrototype> Pack { get; private set; }
-
-}

diff --git a/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs b/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs
new file mode 100644 (file)
index 0000000..d8800a8
--- /dev/null
+++ b/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs
@@ -0,0 +1,42 @@
+using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Timing;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Chat.Systems;
+
+public sealed class SpeakOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SpeakOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<SpeakOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        TrySpeak(ent);
+        args.Handled = true;
+    }
+
+    private void TrySpeak(Entity<SpeakOnTriggerComponent> ent)
+    {
+        // If it doesn't have the use delay component, still send the message.
+        if (TryComp<UseDelayComponent>(ent.Owner, out var useDelay) && _useDelay.IsDelayed((ent.Owner, useDelay)))
+            return;
+
+        if (!_prototypeManager.TryIndex(ent.Comp.Pack, out var messagePack))
+            return;
+
+        var message = Loc.GetString(_random.Pick(messagePack.Values));
+        _chat.TrySendInGameICMessage(ent.Owner, message, InGameICChatType.Speak, true);
+
+        if (useDelay != null)
+            _useDelay.TryResetDelay((ent.Owner, useDelay));
+    }
+}

diff --git a/Content.Server/Chat/Systems/SpeakOnUseSystem.cs b/Content.Server/Chat/Systems/SpeakOnUseSystem.cs
deleted file mode 100644 (file)
index addec79..0000000
--- a/Content.Server/Chat/Systems/SpeakOnUseSystem.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Content.Server.Chat;
-using Content.Shared.Dataset;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Timing;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Chat.Systems;
-
-/// <summary>
-/// Handles the speech on activating an entity
-/// </summary>
-public sealed partial class SpeakOnUIClosedSystem : EntitySystem
-{
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<SpeakOnUseComponent, UseInHandEvent>(OnUseInHand);
-    }
-
-    public void OnUseInHand(EntityUid uid, SpeakOnUseComponent? component, UseInHandEvent args)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        // Yes it won't work without UseDelayComponent, but we don't want any kind of spam
-        if (!TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay)))
-            return;
-
-        if (!_prototypeManager.TryIndex(component.Pack, out var messagePack))
-            return;
-
-        var message = Loc.GetString(_random.Pick(messagePack.Values));
-        _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Speak, true);
-        _useDelay.TryResetDelay((uid, useDelay));
-    }
-}

diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index 5f962b90c871f288fb6d21525a3aa09e994841f4..1431c8eaf2c48ef50885daf24025ac9c47cd2a66 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -19,8 +19,18 @@
     - Figurine
   - type: UseDelay
     delay: 10
+  - type: TriggerOnActivate
+  - type: TriggerOnSignal
   - type: Speech
     speechSounds: Pai # it just sounds better
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSink
+    ports:
+    - Trigger
 
 - type: entity
   parent: BaseFigurine
@@ -30,7 +40,7 @@
   components:
   - type: Sprite
     state: hop
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesHoP
 
 - type: entity
@@ -41,7 +51,7 @@
   components:
   - type: Sprite
     state: passenger
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesPassenger
 
 - type: entity
@@ -52,7 +62,7 @@
   components:
   - type: Sprite
     state: passenger_greytide
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesGreytider
 
 - type: entity
@@ -63,7 +73,7 @@
   components:
   - type: Sprite
     state: clown
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesClown
 
 - type: entity
@@ -74,7 +84,7 @@
   components:
   - type: Sprite
     state: holoclown
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesHoloClown
 
 - type: entity
@@ -85,7 +95,7 @@
   components:
   - type: Sprite
     state: mime
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesMime
 
 - type: entity
@@ -96,7 +106,7 @@
   components:
   - type: Sprite
     state: musician
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesMusician
 
 - type: entity
@@ -107,7 +117,7 @@
   components:
   - type: Sprite
     state: boxer
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesBoxer
 
 - type: entity
@@ -118,7 +128,7 @@
   components:
   - type: Sprite
     state: captain
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesCaptain
 
 - type: entity
@@ -129,7 +139,7 @@
   components:
   - type: Sprite
     state: hos
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesHoS
 
 - type: entity
@@ -140,7 +150,7 @@
   components:
   - type: Sprite
     state: warden
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesWarden
 
 - type: entity
@@ -151,7 +161,7 @@
   components:
   - type: Sprite
     state: detective
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesDetective
 
 - type: entity
@@ -162,7 +172,7 @@
   components:
   - type: Sprite
     state: security
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesSecurity
 
 - type: entity
@@ -173,7 +183,7 @@
   components:
   - type: Sprite
     state: lawyer
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesLawyer
 
 - type: entity
@@ -184,7 +194,7 @@
   components:
   - type: Sprite
     state: cargotech
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesCargoTech
 
 - type: entity
@@ -195,7 +205,7 @@
   components:
   - type: Sprite
     state: salvage
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesSalvage
 
 - type: entity
@@ -206,7 +216,7 @@
   components:
   - type: Sprite
     state: qm
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesQM
 
 - type: entity
@@ -217,7 +227,7 @@
   components:
   - type: Sprite
     state: ce
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesCE
 
 - type: entity
@@ -228,7 +238,7 @@
   components:
   - type: Sprite
     state: engineer
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesEngineer
 
 - type: entity
@@ -239,7 +249,7 @@
   components:
   - type: Sprite
     state: atmos
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesAtmosTech
 
 - type: entity
@@ -250,7 +260,7 @@
   components:
   - type: Sprite
     state: rd
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesRD
 
 - type: entity
@@ -261,7 +271,7 @@
   components:
   - type: Sprite
     state: scientist
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesScientist
 
 - type: entity
@@ -272,7 +282,7 @@
   components:
   - type: Sprite
     state: cmo
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesCMO
 
 - type: entity
@@ -283,7 +293,7 @@
   components:
   - type: Sprite
     state: chemist
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesChemist
 
 - type: entity
@@ -294,7 +304,7 @@
   components:
   - type: Sprite
     state: paramedic
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesParamedic
 
 - type: entity
@@ -305,7 +315,7 @@
   components:
   - type: Sprite
     state: medical
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesDoctor
 
 - type: entity
@@ -316,7 +326,7 @@
   components:
   - type: Sprite
     state: librarian
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesLibrarian
 
 - type: entity
@@ -327,7 +337,7 @@
   components:
   - type: Sprite
     state: chaplain
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesChaplain
 
 - type: entity
@@ -338,7 +348,7 @@
   components:
   - type: Sprite
     state: chef
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesChef
 
 - type: entity
@@ -349,7 +359,7 @@
   components:
   - type: Sprite
     state: bartender
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesBartender
 
 - type: entity
@@ -360,7 +370,7 @@
   components:
   - type: Sprite
     state: botanist
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesBotanist
 
 - type: entity
@@ -371,7 +381,7 @@
   components:
   - type: Sprite
     state: janitor
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesJanitor
 
 - type: entity
@@ -382,7 +392,7 @@
   components:
   - type: Sprite
     state: nukie
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesNukie
 
 - type: entity
@@ -393,7 +403,7 @@
   components:
   - type: Sprite
     state: nukie_elite
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesNukieElite
 
 - type: entity
@@ -404,7 +414,7 @@
   components:
   - type: Sprite
     state: nukie_commander
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesNukieCommander
 
 - type: entity
@@ -415,7 +425,7 @@
   components:
   - type: Sprite
     state: footsoldier
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesFootsoldier
 
 - type: entity
@@ -426,7 +436,7 @@
   components:
   - type: Sprite
     state: wizard
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesWizard
 
 - type: entity
@@ -437,7 +447,7 @@
   components:
   - type: Sprite
     state: wizard_fake
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesWizard
 
 #Nonhuman Figurines
@@ -450,7 +460,7 @@
   components:
   - type: Sprite
     state: spacedragon
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesSpaceDragon
 
 - type: entity
@@ -461,7 +471,7 @@
   components:
   - type: Sprite
     state: queen
-  # - type: SpeakOnUse # TODO add something
+  # - type: SpeakOnTrigger # TODO add something
   #   pack: FigurinesQueen
 
 - type: entity
@@ -472,7 +482,7 @@
   components:
   - type: Sprite
     state: ratking
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesRatKing
 
 - type: entity
@@ -483,7 +493,7 @@
   components:
   - type: Sprite
     state: ratservant
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesRatServant
 
 - type: entity
@@ -494,7 +504,7 @@
   components:
   - type: Sprite
     state: mouse
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesMouse
 
 - type: entity
@@ -505,7 +515,7 @@
   components:
   - type: Sprite
     state: slime
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesSlime
 
 - type: entity
@@ -516,7 +526,7 @@
   components:
   - type: Sprite
     state: hamlet
-  - type: SpeakOnUse
+  - type: SpeakOnTrigger
     pack: FigurinesHamlet
 
 #TODO: Convert these to the new figurine sprite template and rename their sprite name.