Lyre Birb Trait

Content.Client/Traits/SingerSystem.cs

@@ -1,13 +1,18 @@
 using Content.Client.Instruments;
 using Content.Shared.Instruments;
+using Content.Shared.Traits.Assorted.Prototypes;
 using Content.Shared.Traits.Assorted.Systems;
 
 namespace Content.Client.Traits;
 
 public sealed class SingerSystem : SharedSingerSystem
 {
-    protected override SharedInstrumentComponent EnsureInstrumentComp(EntityUid uid)
+    protected override SharedInstrumentComponent EnsureInstrumentComp(EntityUid uid, SingerInstrumentPrototype singer)
     {
-        return EnsureComp<InstrumentComponent>(uid); // I hate this, but it's the only way.
+        var instrumentComp = EnsureComp<InstrumentComponent>(uid);
+        instrumentComp.AllowPercussion = singer.AllowPercussion;
+        instrumentComp.AllowProgramChange = singer.AllowProgramChange;
+
+        return instrumentComp;
     }
 }

Content.Server/Traits/Assorted/SingerSystem.cs

@@ -45,11 +45,16 @@ public override void Initialize()
         SubscribeLocalEvent<SingerComponent, OpenUiActionEvent>(OnInstrumentOpen, before: [typeof(ActivatableUISystem)]);
     }
 
-    protected override SharedInstrumentComponent EnsureInstrumentComp(EntityUid uid)
+    protected override SharedInstrumentComponent EnsureInstrumentComp(EntityUid uid, SingerInstrumentPrototype singer)
     {
-        return EnsureComp<InstrumentComponent>(uid);
+        var instrumentComp = EnsureComp<InstrumentComponent>(uid);
+        instrumentComp.AllowPercussion = singer.AllowPercussion;
+        instrumentComp.AllowProgramChange = singer.AllowProgramChange;
+
+        return instrumentComp;
     }
 
+
     protected override void SetUpSwappableInstrument(EntityUid uid, SingerInstrumentPrototype singer)
     {
         if (singer.InstrumentList.Count <= 1)

Content.Shared/Instruments/SharedInstrumentComponent.cs

@@ -6,7 +6,6 @@
 namespace Content.Shared.Instruments;
 
 [NetworkedComponent]
-[Access(typeof(SharedInstrumentSystem))]
 public abstract partial class SharedInstrumentComponent : Component
 {
     [ViewVariables]

Content.Shared/Traits/Assorted/Prototypes/SingerInstrumentPrototype.cs

@@ -33,4 +33,10 @@ public sealed partial class SingerInstrumentPrototype : IPrototype
     // The below is server only, as it uses a server-BUI event !type
     [DataField(serverOnly: true, required: true)]
     public EntProtoId MidiActionId;
+
+    [DataField]
+    public bool AllowPercussion;
+
+    [DataField]
+    public bool AllowProgramChange;
 }

Content.Shared/Traits/Assorted/Systems/SharedSingerSystem.cs

@@ -36,7 +36,7 @@ private void OnStartup(Entity<SingerComponent> ent, ref ComponentStartup args)
 
         _actionsSystem.AddAction(ent, ref ent.Comp.MidiAction, ent.Comp.MidiActionId);
 
-        var instrumentComp = EnsureInstrumentComp(ent);
+        var instrumentComp = EnsureInstrumentComp(ent, singer);
         var defaultData = singer.InstrumentList[singer.DefaultInstrument];
         _instrument.SetInstrumentProgram(ent.Owner, instrumentComp, defaultData.Item1, defaultData.Item2);
         SetUpSwappableInstrument(ent, singer);
@@ -92,5 +92,5 @@ protected virtual void SetUpSwappableInstrument(EntityUid uid, SingerInstrumentP
     /// <summary>
     ///     Ensures an InstrumentComponent on the entity. Uses client-side comp on client and server-side comp on the server.
     /// </summary>
-    protected abstract SharedInstrumentComponent EnsureInstrumentComp(EntityUid uid);
+    protected abstract SharedInstrumentComponent EnsureInstrumentComp(EntityUid uid, SingerInstrumentPrototype singer);
 }

Resources/Locale/en-US/traits/traits.ftl

@@ -540,5 +540,10 @@ trait-description-ThermographicVision =
     biological life forms. It can even detect individuals through the walls of a station.
 
 trait-name-ShadowkinBlackeye = Blackeye
-trait-description-ShadowkinBlackeye = 
+trait-description-ShadowkinBlackeye =
     You lose your special Shadowkin powers & respect amongst your peers, in return for some points. Effectively, you are only a Shadowkin in name, not in practice.
+
+trait-name-LyreBird = Lyre Bird
+trait-description-LyreBird =
+    Your natural talent for mimicry vastly exceeds that of other Harpies. You have the ability to perfectly imitate songs in their entirety.
+    Be your own full symphony orchestra, jazz group, or metal band.

Resources/Prototypes/Traits/Misc/singer_types.yml

@@ -14,6 +14,16 @@
   midiUi: Key
   midiActionId: ActionHarpyPlayMidi
 
+- type: SingerInstrument
+  id: HarpySingerAll
+  instrumentList:
+    "Lyresong": {52: 0}
+  defaultInstrument: "Lyresong"
+  midiUi: Key
+  midiActionId: ActionHarpyPlayMidi
+  allowPercussion: true
+  allowProgramChange: true
+
 - type: SingerInstrument
   id: NormalSinger
   instrumentList:

Resources/Prototypes/Traits/skills.yml

@@ -184,6 +184,20 @@
         - type: Singer
           proto: NormalSinger
 
+- type: trait
+  id: LyreBird
+  category: Auditory
+  points: -10
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species:
+        - Harpy
+  functions:
+    - !type:TraitReplaceComponent
+      components:
+        - type: Singer
+          proto: HarpySingerAll
+
 - type: trait
   id: LatentPsychic
   category: Mental