]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Wield recoil components (#26915)
authorFroffy025 <78222136+Froffy025@users.noreply.github.com>
Sun, 14 Apr 2024 10:16:23 +0000 (06:16 -0400)
committerGitHub <noreply@github.com>
Sun, 14 Apr 2024 10:16:23 +0000 (20:16 +1000)
* WieldRecoilComponents

* WieldRecoilComponents

* Update Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs

Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
* Update Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs

---------

Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
Content.Shared/Wieldable/WieldableSystem.cs

index 58c5fec2d8377d086e402dfab213ec413d0c20bf..ce96639e3c499f83bbfb1d56af2889455d94527b 100644 (file)
@@ -17,4 +17,20 @@ public sealed partial class GunWieldBonusComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("maxAngle"), AutoNetworkedField]
     public Angle MaxAngle = Angle.FromDegrees(-43);
+
+    /// <summary>
+    /// Recoil bonuses applied upon being wielded.
+    /// Higher angle decay bonus, quicker recovery.
+    /// Lower angle increase bonus (negative numbers), slower buildup.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Angle AngleDecay = Angle.FromDegrees(0);
+
+       /// <summary>
+    /// Recoil bonuses applied upon being wielded.
+    /// Higher angle decay bonus, quicker recovery.
+    /// Lower angle increase bonus (negative numbers), slower buildup.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Angle AngleIncrease = Angle.FromDegrees(0);
 }
index 2baed19ef85455e3ace6e34dfc2325b98077a123..6bd406c1cadccc53a90d2a311e4b7dda1dd21e9c 100644 (file)
@@ -90,6 +90,8 @@ public sealed class WieldableSystem : EntitySystem
         {
             args.MinAngle += bonus.Comp.MinAngle;
             args.MaxAngle += bonus.Comp.MaxAngle;
+            args.AngleDecay += bonus.Comp.AngleDecay;
+            args.AngleIncrease += bonus.Comp.AngleIncrease;
         }
     }