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

spray bottle fix (#5012)

Browse Source 
* fix-spray

* move vapor rotation
This commit is contained in:
Leon Friedrich
2021-10-25 19:29:02 +13:00
committed by GitHub
parent 41524dac5b
commit e016fc9906
3 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Fluids/Components/SprayComponent.cs
View File

@@ -162,9 +162,8 @@ namespace Content.Server.Fluids.Components
var vapor = entManager.SpawnEntity(_vaporPrototype, playerPos.Offset(distance < 1 ? quarter : threeQuarters));
vapor.Transform.LocalRotation = rotation;
if (vapor.TryGetComponent(out AppearanceComponent? appearance)) // Vapor sprite should face down.
if (vapor.TryGetComponent(out AppearanceComponent? appearance))
{
appearance.SetData(VaporVisuals.Rotation, -Angle.Zero + rotation);
appearance.SetData(VaporVisuals.Color, contents.Color.WithAlpha(1f));
appearance.SetData(VaporVisuals.State, true);
}
@@ -174,11 +173,13 @@ namespace Content.Server.Fluids.Components
var vaporSystem = EntitySystem.Get<VaporSystem>();
vaporSystem.TryAddSolution(vaporComponent, solution);
vaporSystem.Start(vaporComponent, rotation.ToVec(), _sprayVelocity, target, _sprayAliveTime);
// impulse direction is defined in world-coordinates, not local coordinates
var impulseDirection = vapor.Transform.WorldRotation.ToVec();
vaporSystem.Start(vaporComponent, impulseDirection, _sprayVelocity, target, _sprayAliveTime);
if (_impulse > 0f && eventArgs.User.TryGetComponent(out IPhysBody? body))
{
body.ApplyLinearImpulse(-direction * _impulse);
body.ApplyLinearImpulse(-impulseDirection * _impulse);
}
}