Merge pull request SS14-Classic#85 from SS14-Classic/chirp

Fix Harpy Singing
WarMechanic · Oct 15, 2024 · 5a7341b · 5a7341b
2 parents 0c35d9a + 3ab5731
commit 5a7341b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Content.Shared/Traits/Assorted/Components/SingerComponent.cs b/Content.Shared/Traits/Assorted/Components/SingerComponent.cs
@@ -11,6 +11,9 @@ public sealed partial class SingerComponent : Component
     [DataField(required: true), AutoNetworkedField]
     public ProtoId<SingerInstrumentPrototype> Proto = string.Empty;
 
+    [DataField(serverOnly: true)]
+    public EntProtoId? MidiActionId = "ActionHarpyPlayMidi";
+
     [DataField(serverOnly: true)]
     public EntityUid? MidiAction;
 }
diff --git a/Content.Shared/Traits/Assorted/Systems/SharedSingerSystem.cs b/Content.Shared/Traits/Assorted/Systems/SharedSingerSystem.cs
@@ -33,17 +33,12 @@ private void OnStartup(Entity<SingerComponent> ent, ref ComponentStartup args)
         if (!ProtoMan.TryIndex(ent.Comp.Proto, out var singer))
             return;
 
-        _actionsSystem.AddAction(ent, ref ent.Comp.MidiAction, singer.MidiActionId);
+        _actionsSystem.AddAction(ent, ref ent.Comp.MidiAction, ent.Comp.MidiActionId);
 
         var instrumentComp = EnsureInstrumentComp(ent);
         var defaultData = singer.InstrumentList[singer.DefaultInstrument];
         _instrument.SetInstrumentProgram(instrumentComp, defaultData.Item1, defaultData.Item2);
         SetUpSwappableInstrument(ent, singer);
-
-        EntityManager.TryGetComponent<UserInterfaceComponent>(ent.Owner, out var comp);
-        var entui = new Entity<UserInterfaceComponent?>(ent.Owner, comp);
-        if (singer.MidiUi is { } uiKey && !_ui.IsUiOpen(entui, uiKey))
-            _ui.OpenUi(entui, uiKey, entui);
     }
 
     private void OnShutdown(Entity<SingerComponent> ent, ref ComponentShutdown args)

diff --git a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
@@ -127,6 +127,11 @@
       - Shard
       - Landmine
       - Mousetrap
+  - type: UserInterface
+    interfaces:
+      enum.InstrumentUiKey.Key:
+        type: InstrumentBoundUserInterface
+        requireInputValidation: false
 
 - type: entity
   save: false
@@ -218,4 +223,4 @@
     checkCanInteract: false
     icon: { sprite: Interface/Actions/flight.rsi, state: flight_off }
     iconOn: { sprite : Interface/Actions/flight.rsi, state: flight_on }
-    event: !type:ToggleFlightEvent
+    event: !type:ToggleFlightEvent