tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make attack animation follow the character (#1071)

Browse Source 
* Fix #971

* Make atacker parent of the animation instead
This commit is contained in:
Clyybber
2020-06-05 13:00:32 +02:00
committed by GitHub
parent 365a050e70
commit 19c9e3e4f9
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/GameObjects/Components/Weapons/Melee/MeleeWeaponArcAnimationComponent.cs
View File

@@ -2,6 +2,7 @@ using Content.Shared.GameObjects.Components.Weapons.Melee;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Maths; using Robust.Shared.Maths;
namespace Content.Client.GameObjects.Components.Weapons.Melee namespace Content.Client.GameObjects.Components.Weapons.Melee
@@ -24,11 +25,12 @@ namespace Content.Client.GameObjects.Components.Weapons.Melee
_sprite = Owner.GetComponent<SpriteComponent>(); _sprite = Owner.GetComponent<SpriteComponent>();
} }
public void SetData(MeleeWeaponAnimationPrototype prototype, Angle baseAngle) public void SetData(MeleeWeaponAnimationPrototype prototype, Angle baseAngle, IEntity attacker)
{ {
_meleeWeaponAnimation = prototype; _meleeWeaponAnimation = prototype;
_sprite.AddLayer(new RSI.StateId(prototype.State)); _sprite.AddLayer(new RSI.StateId(prototype.State));
_baseAngle = baseAngle; _baseAngle = baseAngle;
Owner.Transform.AttachParent(attacker);
} }
internal void Update(float frameTime) internal void Update(float frameTime)
@@ -48,11 +50,12 @@ namespace Content.Client.GameObjects.Components.Weapons.Melee
{ {
case WeaponArcType.Slash: case WeaponArcType.Slash:
var angle = Angle.FromDegrees(_meleeWeaponAnimation.Width)/2; var angle = Angle.FromDegrees(_meleeWeaponAnimation.Width)/2;
Owner.Transform.LocalRotation = Owner.Transform.WorldRotation =
_baseAngle + Angle.Lerp(-angle, angle, (float) (_timer / _meleeWeaponAnimation.Length.TotalSeconds)); _baseAngle + Angle.Lerp(-angle, angle, (float) (_timer / _meleeWeaponAnimation.Length.TotalSeconds));
break; break;
case WeaponArcType.Poke: case WeaponArcType.Poke:
Owner.Transform.WorldRotation = _baseAngle;
_sprite.Offset += (_meleeWeaponAnimation.Speed * frameTime, 0); _sprite.Offset += (_meleeWeaponAnimation.Speed * frameTime, 0);
break; break;
} }

2
Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
View File

@@ -54,7 +54,7 @@ namespace Content.Client.GameObjects.EntitySystems
entity.Transform.LocalRotation = msg.Angle; entity.Transform.LocalRotation = msg.Angle;
var weaponArcAnimation = entity.GetComponent<MeleeWeaponArcAnimationComponent>(); var weaponArcAnimation = entity.GetComponent<MeleeWeaponArcAnimationComponent>();
weaponArcAnimation.SetData(weaponArc, msg.Angle); weaponArcAnimation.SetData(weaponArc, msg.Angle, attacker);
foreach (var uid in msg.Hits) foreach (var uid in msg.Hits)