Fix toggle verbs (#32138)

First commit

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
index 47edec135d8d850b0a38fbc117efeb13c4394b2f..110ae80626e32f732675c38f3c3c13b29f74836a 100644 (file)
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
@@ -32,6 +32,18 @@ public sealed partial class ItemToggleComponent : Component
     [DataField]
     public bool OnUse = true;
 
+    /// <summary>
+    ///     The localized text to display in the verb to activate.
+    /// </summary>
+    [DataField]
+    public string VerbToggleOn = "item-toggle-activate";
+
+    /// <summary>
+    ///     The localized text to display in the verb to de-activate.
+    /// </summary>
+    [DataField]
+    public string VerbToggleOff = "item-toggle-deactivate";
+
     /// <summary>
     ///     Whether the item's toggle can be predicted by the client.
     /// </summary>

diff --git a/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs b/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs
deleted file mode 100644 (file)
index b673c55..0000000
--- a/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Item.ItemToggle;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Item.ItemToggle.Components;
-
-/// <summary>
-/// Adds a verb for toggling something, requires <see cref="ItemToggleComponent"/>.
-/// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(ToggleVerbSystem))]
-public sealed partial class ToggleVerbComponent : Component
-{
-    /// <summary>
-    /// Text the verb will have.
-    /// Gets passed "entity" as the entity's identity string.
-    /// </summary>
-    [DataField(required: true)]
-    public LocId Text = string.Empty;
-}

diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
index d5bbaac12c330eaff4530f275b9a430100b21c33..f6752a67f61b03ea294e65eccfd4e3b923c74d7f 100644 (file)
--- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
+++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
@@ -78,7 +78,7 @@ public sealed class ItemToggleSystem : EntitySystem
 
         args.Verbs.Add(new ActivationVerb()
         {
-            Text = !ent.Comp.Activated ? Loc.GetString("item-toggle-activate") : Loc.GetString("item-toggle-deactivate"),
+            Text = !ent.Comp.Activated ? Loc.GetString(ent.Comp.VerbToggleOn) : Loc.GetString(ent.Comp.VerbToggleOff),
             Act = () =>
             {
                 Toggle((ent.Owner, ent.Comp), user, predicted: ent.Comp.Predictable);

diff --git a/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs b/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs
deleted file mode 100644 (file)
index 858cd9b..0000000
--- a/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.IdentityManagement;
-using Content.Shared.Item.ItemToggle.Components;
-using Content.Shared.Verbs;
-
-namespace Content.Shared.Item.ItemToggle;
-
-/// <summary>
-/// Adds a verb for toggling something with <see cref="ToggleVerbComponent"/>.
-/// </summary>
-public sealed class ToggleVerbSystem : EntitySystem
-{
-    [Dependency] private readonly ItemToggleSystem _toggle = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ToggleVerbComponent, GetVerbsEvent<ActivationVerb>>(OnGetVerbs);
-    }
-
-    private void OnGetVerbs(Entity<ToggleVerbComponent> ent, ref GetVerbsEvent<ActivationVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract)
-            return;
-
-        var name = Identity.Entity(ent, EntityManager);
-        var user = args.User;
-        args.Verbs.Add(new ActivationVerb()
-        {
-            Text = Loc.GetString(ent.Comp.Text, ("entity", name)),
-            Act = () => _toggle.Toggle(ent.Owner, user)
-        });
-    }
-}

diff --git a/Resources/Locale/en-US/clothing/components/magboots-component.ftl b/Resources/Locale/en-US/clothing/components/magboots-component.ftl
deleted file mode 100644 (file)
index 4113a74..0000000
--- a/Resources/Locale/en-US/clothing/components/magboots-component.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Toggle Magboots Verb
-toggle-magboots-verb-get-data-text = Toggle Magboots
\ No newline at end of file

diff --git a/Resources/Locale/en-US/fire-extinguisher/fire-extinguisher-component.ftl b/Resources/Locale/en-US/fire-extinguisher/fire-extinguisher-component.ftl
index f6418793918b94eee1526909f06bd799d16bd9f3..de1fcd7d4e3374a9d99dc5ca4cf96a9a6ac6ecb8 100644 (file)
--- a/Resources/Locale/en-US/fire-extinguisher/fire-extinguisher-component.ftl
+++ b/Resources/Locale/en-US/fire-extinguisher/fire-extinguisher-component.ftl
@@ -1,3 +1,4 @@
 fire-extinguisher-component-after-interact-refilled-message = {$owner} is now refilled
 fire-extinguisher-component-safety-on-message = Its safety is on!
-fire-extinguisher-component-verb-text = Toggle safety
+fire-extinguisher-component-verb-remove = Remove safety
+fire-extinguisher-component-verb-engage = Engage safety

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index ab8084c91c0d762d3c9ba5d92e7e16a453764c5e..6610ae87ccf6b128f5f789906a741d1892aa9874 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -15,8 +15,6 @@
   - type: ToggleClothing
     action: ActionToggleMagboots
     mustEquip: false
-  - type: ToggleVerb
-    text: toggle-magboots-verb-get-data-text
   - type: ComponentToggler
     components:
     - type: NoSlip

diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index b0c586fc7537ebc620636099bac3d64e18aeb76f..4b4200fed8f677dfdc6c1af18bc70e83c5d35493 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -47,8 +47,8 @@
       params:
         variation: 0.125
         volume: -4
-  - type: ToggleVerb
-    text: fire-extinguisher-component-verb-text
+    verbToggleOn: fire-extinguisher-component-verb-remove
+    verbToggleOff: fire-extinguisher-component-verb-engage
   - type: SpraySafety
   - type: MeleeWeapon
     wideAnimationRotation: 180