Harpy Rebalance & Content Update 2

Content.Server/DeltaV/Harpy/HarpySingerSystem.cs

@@ -1,6 +1,8 @@
 using Content.Server.Instruments;
 using Content.Server.Speech.Components;
 using Content.Server.UserInterface;
+using Content.Shared.Instruments;
+using Content.Shared.Instruments.UI;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Damage;
 using Content.Shared.Damage.ForceSay;
@@ -17,6 +19,7 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Content.Shared.DeltaV.Harpy.Components;
 
 namespace Content.Server.DeltaV.Harpy
 {
@@ -27,6 +30,7 @@ public sealed class HarpySingerSystem : EntitySystem
         [Dependency] private readonly InventorySystem _inventorySystem = default!;
         [Dependency] private readonly ActionBlockerSystem _blocker = default!;
         [Dependency] private readonly IPrototypeManager _prototype = default!;
+        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
         public override void Initialize()
         {
@@ -40,6 +44,8 @@ public override void Initialize()
             SubscribeLocalEvent<InstrumentComponent, SleepStateChangedEvent>(OnSleep);
             SubscribeLocalEvent<InstrumentComponent, StatusEffectAddedEvent>(OnStatusEffect);
             SubscribeLocalEvent<InstrumentComponent, DamageChangedEvent>(OnDamageChanged);
+            SubscribeLocalEvent<HarpySingerComponent, BoundUIClosedEvent>(OnBoundUIClosed);
+            SubscribeLocalEvent<HarpySingerComponent, BoundUIOpenedEvent>(OnBoundUIOpened);
 
             // This is intended to intercept the UI event and stop the MIDI UI from opening if the
             // singer is unable to sing. Thus it needs to run before the ActivatableUISystem.
@@ -153,5 +159,24 @@ private void OnInstrumentOpen(EntityUid uid, HarpySingerComponent component, Ope
             if (args.Handled)
                 _popupSystem.PopupEntity(Loc.GetString("no-sing-while-no-speak"), uid, uid, PopupType.Medium);
         }
+
+        private void OnBoundUIClosed(EntityUid uid, HarpySingerComponent component, BoundUIClosedEvent args)
+        {
+            if (args.UiKey is not InstrumentUiKey)
+                return;
+
+            TryComp(uid, out AppearanceComponent? appearance);
+            _appearance.SetData(uid, HarpyVisualLayers.Singing, SingingVisualLayer.False, appearance);
+        }
+
+        private void OnBoundUIOpened(EntityUid uid, HarpySingerComponent component, BoundUIOpenedEvent args)
+        {
+            if (args.UiKey is not InstrumentUiKey)
+                return;
+
+            TryComp(uid, out AppearanceComponent? appearance);
+            _appearance.SetData(uid, HarpyVisualLayers.Singing, SingingVisualLayer.True, appearance);
+
+        }
     }
 }

Content.Shared/DeltaV/Harpy/Components/HarpyVisualSystem.cs

@@ -0,0 +1,17 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DeltaV.Harpy.Components
+{
+    [Serializable, NetSerializable]
+    public enum HarpyVisualLayers
+    {
+        Singing,
+    }
+
+    [Serializable, NetSerializable]
+    public enum SingingVisualLayer
+    {
+        True,
+        False,
+    }
+}

Resources/Prototypes/DeltaV/Body/Organs/harpy.yml

@@ -0,0 +1,34 @@
+- type: entity
+  id: OrganHarpyLungs
+  parent: BaseHumanOrgan
+  name: lungs
+  description: "An advanced pair of avian lungs. Filters oxygen by way of moving air constantly through air sacs."
+  components:
+  - type: Sprite
+    layers:
+      - state: lung-l
+      - state: lung-r
+  - type: Lung
+  - type: Metabolizer
+    updateFrequency: 2.0
+    removeEmpty: true
+    solutionOnBody: false
+    solution: "Lung"
+    metabolizerTypes: [ Human ]
+    groups:
+    - id: Gas
+      rateModifier: 100.0
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      Lung:
+        maxVol: 100.0
+        canReact: false
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5

Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml

@@ -19,7 +19,7 @@
       - right leg
       organs:
         heart: OrganHumanHeart
-        lungs: OrganHumanLungs
+        lungs: OrganHarpyLungs
         stomach: OrganHumanStomach
         liver:  OrganHumanLiver
         kidneys: OrganHumanKidneys

Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml

@@ -17,12 +17,6 @@
   - type: MobMover
   - type: InputMover
   - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 1.15
-    damageRecovery:
-      types:
-        Asphyxiation: -1.15
   - type: Alerts
   - type: Actions
   - type: Eye

Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml

@@ -76,16 +76,19 @@
       - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
       - map: [ "mask" ]
       - map: [ "head" ]
-
+      - map: [ "singingLayer" ]
+        sprite: DeltaV/Effects/harpysinger.rsi
+        state: singing_music_notes
+        visible: false
   - type: HumanoidAppearance
     species: Harpy
   - type: Fixtures
     fixtures: # TODO: This needs a second fixture just for mob collisions.
       fix1:
         shape:
           !type:PhysShapeCircle
-          radius: 0.28
-        density: 140
+          radius: 0.32
+        density: 90
         restitution: 0.0
         mask:
         - MobMask
@@ -97,20 +100,28 @@
     damageModifierSet: Harpy
   - type: MeleeWeapon
     soundHit:
-      collection: Punch
+      collection: AlienClaw
     animation: WeaponArcClaw
     damage:
       types:
-        Blunt: 1
-        Slash: 5
+        Piercing: 5
   - type: Speech
     speechSounds: Alto
   - type: Vocal
     sounds:
       Male: SoundsHarpy
       Female: SoundsHarpy
       Unsexed: SoundsHarpy
-
+  - type: GenericVisualizer
+    visuals:
+      enum.HarpyVisualLayers.Singing:
+        singingLayer:
+          False:  {visible: false}
+          True:  {visible: true}
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 2.5
+    baseSprintSpeed: 5.0
+
 - type: entity
   save: false
   name: Urist McHands

Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml

@@ -31,8 +31,8 @@
     animation: WeaponArcClaw
     damage:
       types:
-        Blunt: 1
-        Slash: 5
+        Slash: 4
+        Piercing: 1
 #  - type: DiseaseCarrier
 #    naturalImmunities:
 #    - OwOnavirus

Resources/Textures/DeltaV/Effects/harpysinger.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "copyright": "Made by @ps3moira",
+    "license": "CC-BY-SA-3.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "singing_music_notes",
+            "directions": 1,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        }
+    ]
+}