From 4bf3905083328cba4abd2379627dccab911fd15d Mon Sep 17 00:00:00 2001 From: No Elka <125199100+NoElkaTheGod@users.noreply.github.com> Date: Thu, 21 Aug 2025 10:53:56 +0300 Subject: [PATCH] Make some swing animations nicer (#4235) * Combo attacks when * Remove stuff --- Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs | 1 + Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs | 6 ++++++ .../Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml | 1 + .../Prototypes/_DV/CosmicCult/Objects/cosmicweapons.yml | 2 ++ 4 files changed, 10 insertions(+) diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs index 49b5b4a25b..94b7efa7bd 100644 --- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs +++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs @@ -55,6 +55,7 @@ public sealed partial class MeleeWeaponSystem if (meleeWeaponComponent.SwingLeft) angle *= -1; + if (meleeWeaponComponent.ChangeSwingDirection) meleeWeaponComponent.SwingLeft = !meleeWeaponComponent.SwingLeft; // DeltaV - Nice swing animation for desword } _sprite.SetRotation((animationUid, sprite), localPos.ToWorldAngle()); var distance = Math.Clamp(localPos.Length() / 2f, 0.2f, 1f); diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs index 1468d2e5ad..6ea5ad3ca0 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs @@ -115,6 +115,12 @@ public sealed partial class MeleeWeaponComponent : Component [DataField, AutoNetworkedField] public bool SwingLeft; + /// + /// DeltaV: if true, weapon will swing in different direction each strike. Purely cosmetic. + /// + [DataField] + public bool ChangeSwingDirection; + // Sounds diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index c860ea3bbc..e9571a678a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -332,6 +332,7 @@ - type: MeleeWeapon wideAnimationRotation: -135 attackRate: 2.0 # DeltaV - was 1.5 + changeSwingDirection: true # DeltaV angle: 100 damage: types: diff --git a/Resources/Prototypes/_DV/CosmicCult/Objects/cosmicweapons.yml b/Resources/Prototypes/_DV/CosmicCult/Objects/cosmicweapons.yml index 6e1ebcd768..4ad11404bf 100644 --- a/Resources/Prototypes/_DV/CosmicCult/Objects/cosmicweapons.yml +++ b/Resources/Prototypes/_DV/CosmicCult/Objects/cosmicweapons.yml @@ -91,7 +91,9 @@ - type: MeleeWeapon resistanceBypass: true angle: 0 + wideAnimationRotation: 225 animation: WeaponArcCosmic + wideAnimation: WeaponArcThrust attackRate: 0.62 damage: types: