Merge branch 'swords' of https://github.com/AeraAuling/Delta-v-stuff …

…into swords

Content.Shared/Damage/Systems/StaminaSystem.cs

@@ -160,6 +160,11 @@ private void OnMeleeHit(EntityUid uid, StaminaDamageOnHitComponent component, Me
         if (hitEvent.Handled)
             return;
 
+        // Begin DeltaV additions
+        // Allow users to modifier stamina damage as well, this part of the event is not handle-able by listeners.
+        RaiseLocalEvent(args.User, hitEvent);
+        // End DeltaV additions
+
         var damage = component.Damage;
 
         damage *= hitEvent.Multiplier;

Content.Shared/Prying/Systems/PryingSystem.cs

@@ -134,6 +134,12 @@ private bool StartPry(EntityUid target, EntityUid user, EntityUid? tool, float t
         var modEv = new GetPryTimeModifierEvent(user);
 
         RaiseLocalEvent(target, ref modEv);
+
+        // Begin DeltaV additions
+        // Also raise an event for users to modifiy the time to pry
+        RaiseLocalEvent(user, ref modEv);
+        // End DeltaV additions
+
         var doAfterArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(modEv.BaseTime * modEv.PryTimeModifier / toolModifier), new DoorPryDoAfterEvent(), target, target, tool)
         {
             BreakOnDamage = true,

Content.Shared/Tools/Components/ToolComponent.cs

@@ -1,4 +1,3 @@
-using Content.Shared.Nyanotrasen.Abilities.Oni;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
@@ -7,7 +6,7 @@
 namespace Content.Shared.Tools.Components;
 
 [RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedToolSystem), typeof(SharedOniSystem))] // DeltaV - Allowed OniSystem access
+[Access(typeof(SharedToolSystem))]
 public sealed partial class ToolComponent : Component
 {
     [DataField]

Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs

@@ -219,7 +219,13 @@ public DamageSpecifier GetDamage(EntityUid uid, EntityUid user, MeleeWeaponCompo
         var ev = new GetMeleeDamageEvent(uid, new(component.Damage), new(), user, component.ResistanceBypass);
         RaiseLocalEvent(uid, ref ev);
 
-        return DamageSpecifier.ApplyModifierSets(ev.Damage, ev.Modifiers);
+        // Begin DeltaV additions
+        // Allow users of melee weapons to have bonuses applied
+        var userEv = new GetMeleeDamageEvent(uid, new(component.Damage), new(), user, component.ResistanceBypass);
+        RaiseLocalEvent(user, ref userEv);
+
+        return DamageSpecifier.ApplyModifierSets(ev.Damage, ev.Modifiers.Concat(userEv.Modifiers));
+        // End DeltaV additions
     }
 
     public float GetAttackRate(EntityUid uid, EntityUid user, MeleeWeaponComponent? component = null)

Content.Shared/Weapons/Ranged/Components/GunComponent.cs

@@ -1,5 +1,4 @@
 using System.Numerics;
-using Content.Shared.Nyanotrasen.Abilities.Oni; // DeltaV: Make Oni shooting guns less accurate
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Audio;
@@ -10,7 +9,7 @@
 namespace Content.Shared.Weapons.Ranged.Components;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), AutoGenerateComponentPause]
-[Access(typeof(SharedGunSystem), typeof(SharedOniSystem))] // DeltaV - I didn't feel like rewriting big chunks of code
+[Access(typeof(SharedGunSystem))]
 public sealed partial class GunComponent : Component
 {
     #region Sound
@@ -145,6 +144,14 @@ public sealed partial class GunComponent : Component
     [ViewVariables]
     public EntityUid? Target = null;
 
+    // Begin DeltaV additions
+    /// <summary>
+    /// Who the gun is being held by
+    /// </summary>
+    [ViewVariables]
+    public EntityUid? Holder = null;
+    // End DeltaV additions
+
     /// <summary>
     ///     The base value for how many shots to fire per burst.
     /// </summary>

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs

@@ -98,6 +98,8 @@ public override void Initialize()
         SubscribeLocalEvent<GunComponent, CycleModeEvent>(OnCycleMode);
         SubscribeLocalEvent<GunComponent, HandSelectedEvent>(OnGunSelected);
         SubscribeLocalEvent<GunComponent, MapInitEvent>(OnMapInit);
+
+        InitializeHolders(); // DeltaV
     }
 
     private void OnMapInit(Entity<GunComponent> gun, ref MapInitEvent args)
@@ -546,6 +548,14 @@ public void RefreshModifiers(Entity<GunComponent?> gun)
             comp.ProjectileSpeed
         );
 
+        // Begin DeltaV additions
+        // Raise an event at the user of the gun so they have a chance to modify the gun's details.
+        if (gun.Comp.Holder != null)
+        {
+            RaiseLocalEvent(gun.Comp.Holder.Value, ref ev);
+        }
+        // End DeltaV additions
+
         RaiseLocalEvent(gun, ref ev);
 
         if (comp.SoundGunshotModified != ev.SoundGunshot)

Content.Shared/_DV/Damage/Components/BonusStaminaDamageComponent.cs

@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._DV.Damage.Components;
+
+/// <summary>
+/// Allows entities to have additional stamina damage for their melee
+/// and weapon attacks.
+/// <see cref="Shared.Damage.Events.StaminaMeleeHitEvent"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BonusStaminaDamageComponent : Component
+{
+    /// <summary>
+    /// Multiplies the stamina damage by this much during a stamina hit event
+    /// </summary>
+    [DataField]
+    public float Multiplier = 1.25f;
+}

Content.Shared/_DV/Damage/Systems/BonusStaminaDamageSystem.cs

@@ -0,0 +1,19 @@
+using Content.Shared._DV.Damage.Components;
+using Content.Shared.Damage.Events;
+
+namespace Content.Shared._DV.Damage.Systems;
+
+public sealed partial class BonusStaminaDamageSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<BonusStaminaDamageComponent, StaminaMeleeHitEvent>(OnStamHit);
+    }
+
+    private void OnStamHit(Entity<BonusStaminaDamageComponent> ent, ref StaminaMeleeHitEvent args)
+    {
+        args.Multiplier *= ent.Comp.Multiplier;
+    }
+}

Content.Shared/_DV/Prying/Components/PlayerToolModifierComponent.cs

@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._DV.Prying.Components;
+
+/// <summary>
+/// Alters the interaction speed of attached entity's tools.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PlayerToolModifierComponent : Component
+{
+    /// <summary>
+    /// Multiplies the time taken to perform a pry interaction on entities like
+    /// airlocks and doors.
+    /// <see cref="Shared.Prying.Components.GetPryTimeModifierEvent"/>
+    /// </summary>
+    [DataField]
+    public float PryTimeMultiplier = 1.0f;
+}

Content.Shared/_DV/Prying/Systems/PlayerToolModifierSystem.cs

@@ -0,0 +1,19 @@
+using Content.Shared._DV.Prying.Components;
+using Content.Shared.Prying.Components;
+
+namespace Content.Shared._DV.Prying.Systems;
+
+public sealed partial class PlayerToolModifierSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PlayerToolModifierComponent, GetPryTimeModifierEvent>(OnPry);
+    }
+
+    private void OnPry(Entity<PlayerToolModifierComponent> ent, ref GetPryTimeModifierEvent args)
+    {
+        args.PryTimeModifier *= ent.Comp.PryTimeMultiplier;
+    }
+}

Content.Shared/_DV/Weapons/Ranged/Components/PlayerAccuracyModifierComponent.cs

@@ -0,0 +1,25 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._DV.Weapons.Ranged.Components;
+
+/// <summary>
+/// Alters the accuracy of attached entity's held or wielded guns via
+/// <see cref="Shared.Weapons.Ranged.Events.GunRefreshModifiersEvent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PlayerAccuracyModifierComponent : Component
+{
+    /// <summary>
+    /// Multiplies the Min/Max angles of a gun by this amount.
+    /// </summary>
+    [DataField]
+    public float SpreadMultiplier = 15f;
+
+    /// <summary>
+    /// Maximum angle, in degrees, an entity can shoot between.
+    /// After the SpreadMultiplier is applied, this clamp can stop the entity
+    /// from shooting behind themselves.
+    /// </summary>
+    [DataField]
+    public float MaxSpreadAngle = 180f;
+}

Content.Shared/_DV/Weapons/Ranged/Systems/PlayerAccuracyModifierSystem.cs

@@ -0,0 +1,23 @@
+using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared._DV.Weapons.Ranged.Components;
+
+namespace Content.Shared._DV.Weapons.Ranged.Systems;
+
+public sealed class GunAccuracyModifierSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PlayerAccuracyModifierComponent, GunRefreshModifiersEvent>(OnGunRefreshModifiers);
+    }
+
+    private void OnGunRefreshModifiers(Entity<PlayerAccuracyModifierComponent> ent, ref GunRefreshModifiersEvent args)
+    {
+        var maxSpread = MathHelper.DegreesToRadians(ent.Comp.MaxSpreadAngle);
+        args.MinAngle = Math.Clamp(args.MinAngle * ent.Comp.SpreadMultiplier, 0f, maxSpread);
+        args.MaxAngle = Math.Clamp(args.MaxAngle * ent.Comp.SpreadMultiplier, 0f, maxSpread);
+
+        args.AngleIncrease *= ent.Comp.SpreadMultiplier;
+    }
+}

Content.Shared/_DV/Weapons/Ranged/Systems/SharedGunSystem.Holder.cs

@@ -0,0 +1,25 @@
+using Content.Shared.Hands;
+using Content.Shared.Weapons.Ranged.Components;
+
+namespace Content.Shared.Weapons.Ranged.Systems;
+
+public abstract partial class SharedGunSystem
+{
+    private void InitializeHolders()
+    {
+        SubscribeLocalEvent<GunComponent, GotEquippedHandEvent>(OnGunEquipped);
+        SubscribeLocalEvent<GunComponent, GotUnequippedHandEvent>(OnGunUnequipped);
+    }
+
+    private void OnGunEquipped(Entity<GunComponent> ent, ref GotEquippedHandEvent args)
+    {
+        ent.Comp.Holder = args.User;
+        RefreshModifiers((ent, ent));
+    }
+
+    private void OnGunUnequipped(Entity<GunComponent> ent, ref GotUnequippedHandEvent args)
+    {
+        ent.Comp.Holder = null;
+        RefreshModifiers((ent, ent));
+    }
+}

Resources/Locale/en-US/_DV/guidebook/chemistry/statuseffects.ftl

@@ -1,2 +1,3 @@
 reagent-effect-status-effect-PsionicallyInsulated = psionic insulation
 reagent-effect-status-effect-PsionicsDisabled = inability to use psionic powers
+reagent-effect-status-effect-Anesthesia = surgical anesthesia

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

@@ -10,8 +10,15 @@
     species: Oni
   - type: Sprite
     scale: 1.2, 1.2
-  - type: Oni
-    modifiers:
+  - type: PlayerToolModifier
+    pryTimeMultiplier: 0.6
+  - type: PlayerAccuracyModifier
+    spreadMultiplier: 15
+    maxSpreadAngle: 180
+  - type: BonusStaminaDamage
+    multiplier: 1.25
+  - type: BonusMeleeDamage
+    damageModifierSet:
       coefficients:
         Blunt: 1.35
         Slash: 1.2