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

Refactor to use the new multiple controller system (#1462)

Browse Source 
* Transition code to new controller system

* Fix shuttles not moving

* Fix throwing

* Fix guns

* Change hands to use physics.Stop() and remove item fumble method
This commit is contained in:
DrSmugleaf
2020-07-23 18:33:37 +02:00
committed by GitHub
parent 3296079400
commit 64672fdc31
13 changed files with 114 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.GameObjects.Components
void ICollideBehavior.CollideWith(IEntity entity)
{
if (!_shouldCollide) return;
if (entity.TryGetComponent(out CollidableComponent collid))
if (entity.TryGetComponent(out CollidableComponent collid))
{
if (!collid.Hard) // ignore non hard
return;
@@ -65,10 +65,13 @@ namespace Content.Server.GameObjects.Components
{
body.PhysicsShapes[0].CollisionMask &= (int) ~CollisionGroup.ThrownItem;
var physics = Owner.GetComponent<IPhysicsComponent>();
physics.LinearVelocity = Vector2.Zero;
physics.Status = BodyStatus.OnGround;
if (body.TryGetController(out ThrownController controller))
{
controller.LinearVelocity = Vector2.Zero;
}
body.Status = BodyStatus.OnGround;
Owner.RemoveComponent<ThrownItemComponent>();
EntitySystem.Get<InteractionSystem>().LandInteraction(User, Owner, Owner.Transform.GridPosition);
}
@@ -82,11 +85,14 @@ namespace Content.Server.GameObjects.Components
}
}
public void StartThrow(Vector2 initialImpulse)
public void StartThrow(Vector2 direction, float speed)
{
var comp = Owner.GetComponent<IPhysicsComponent>();
comp.Status = BodyStatus.InAir;
comp.Momentum = initialImpulse;
var controller = comp.EnsureController<ThrownController>();
controller.Push(direction, speed);
StartStopTimer();
}
@@ -110,5 +116,12 @@ namespace Content.Server.GameObjects.Components
StopThrow();
}
public override void Initialize()
{
base.Initialize();
Owner.EnsureComponent<CollidableComponent>().EnsureController<ThrownController>();
}
}
}