Change how Oni melee bonuses are applied

DeltaV-Station · Jan 26, 2025 · 47d9b06 · 47d9b06
1 parent db583e0
commit 47d9b06
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Content.Shared/_DV/Abilities/Oni/SharedOniSystem.cs b/Content.Shared/_DV/Abilities/Oni/SharedOniSystem.cs
@@ -20,11 +20,11 @@ public override void Initialize()
         SubscribeLocalEvent<OniComponent, GetUserPryTimeModifierEvent>(OnGetUserPryMod);
         SubscribeLocalEvent<OniComponent, DidEquipHandEvent>(OnHandEquipped);
         SubscribeLocalEvent<OniComponent, DidUnequipHandEvent>(OnHandUnequipped);
-        SubscribeLocalEvent<OniComponent, MeleeHitEvent>(OnOniMeleeHit);
+        SubscribeLocalEvent<OniComponent, GetMeleeDamageEvent>(OnGetOniMeleeDamage);
 
         SubscribeLocalEvent<HeldByOniComponent, GunRefreshModifiersEvent>(OnGunRefreshModifiers);
-        SubscribeLocalEvent<HeldByOniComponent, MeleeHitEvent>(OnHeldMeleeHit);
         SubscribeLocalEvent<HeldByOniComponent, StaminaMeleeHitEvent>(OnStamHit);
+        SubscribeLocalEvent<HeldByOniComponent, GetMeleeDamageEvent>(OnGetMeleeDamage);
     }
 
     private void OnGetUserPryMod(Entity<OniComponent> ent, ref GetUserPryTimeModifierEvent args)
@@ -56,24 +56,24 @@ private void OnGunRefreshModifiers(Entity<HeldByOniComponent> ent, ref GunRefres
         args.MaxAngle *= 15f;
     }
 
-    private void OnOniMeleeHit(Entity<OniComponent> ent, ref MeleeHitEvent args)
+    private void OnGetOniMeleeDamage(Entity<OniComponent> ent, ref GetMeleeDamageEvent args)
     {
-        args.ModifiersList.Add(ent.Comp.MeleeModifiers);
+        args.Modifiers.Add(ent.Comp.MeleeModifiers);
     }
 
-    private void OnHeldMeleeHit(Entity<HeldByOniComponent> ent, ref MeleeHitEvent args)
+    private void OnStamHit(Entity<HeldByOniComponent> ent, ref StaminaMeleeHitEvent args)
     {
         if (!TryComp<OniComponent>(ent.Comp.Holder, out var oni))
             return;
 
-        args.ModifiersList.Add(oni.MeleeModifiers);
+        args.Multiplier *= oni.StamDamageMultiplier;
     }
 
-    private void OnStamHit(Entity<HeldByOniComponent> ent, ref StaminaMeleeHitEvent args)
+    private void OnGetMeleeDamage(Entity<HeldByOniComponent> ent, ref GetMeleeDamageEvent args)
     {
         if (!TryComp<OniComponent>(ent.Comp.Holder, out var oni))
             return;
 
-        args.Multiplier *= oni.StamDamageMultiplier;
+        args.Modifiers.Add(oni.MeleeModifiers);
     }
 }