Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename usages of collidable to physics (#2230)

Browse Source 
* Rename usages of collidable to physics

* high tier PANIQUE

* aaaaaaaaAAAAAa

* cursed commit dont research

* Fix urist and items being anchored

* Fix the rest
This commit is contained in:
DrSmugleaf
2020-10-11 16:36:58 +02:00
committed by GitHub
parent 413ca9812d
commit b64cb24059
79 changed files with 292 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Physics/BulletController.cs
View File

@@ -7,7 +7,7 @@ namespace Content.Shared.Physics
{
public class BulletController : VirtualController
{
public override ICollidableComponent? ControlledComponent { protected get; set; }
public override IPhysicsComponent? ControlledComponent { protected get; set; }
public void Push(Vector2 velocityDirection, float speed)
{

2
Content.Shared/Physics/ConveyedController.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Shared.Physics
{
public class ConveyedController : VirtualController
{
public override ICollidableComponent? ControlledComponent { protected get; set; }
public override IPhysicsComponent? ControlledComponent { protected get; set; }
public void Move(Vector2 velocityDirection, float speed)
{

2
Content.Shared/Physics/MoverController.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Shared.Physics
{
[Dependency] private readonly IPhysicsManager _physicsManager = default!;
public override ICollidableComponent? ControlledComponent { protected get; set; }
public override IPhysicsComponent? ControlledComponent { protected get; set; }
public void Move(Vector2 velocityDirection, float speed)
{

6
Content.Shared/Physics/Pull/PullController.cs
View File

@@ -18,15 +18,15 @@ namespace Content.Shared.Physics.Pull
private const float DistBeforeStopPull = SharedInteractionSystem.InteractionRange;
private ICollidableComponent? _puller;
private IPhysicsComponent? _puller;
public bool GettingPulled => _puller != null;
private EntityCoordinates? _movingTo;
public ICollidableComponent? Puller => _puller;
public IPhysicsComponent? Puller => _puller;
public void StartPull(ICollidableComponent puller)
public void StartPull(IPhysicsComponent puller)
{
DebugTools.AssertNotNull(puller);

6
Content.Shared/Physics/Pull/PullMessage.cs
View File

@@ -6,10 +6,10 @@ namespace Content.Shared.Physics.Pull
public class PullMessage : ComponentMessage
{
public readonly PullController Controller;
public readonly ICollidableComponent Puller;
public readonly ICollidableComponent Pulled;
public readonly IPhysicsComponent Puller;
public readonly IPhysicsComponent Pulled;
protected PullMessage(PullController controller, ICollidableComponent puller, ICollidableComponent pulled)
protected PullMessage(PullController controller, IPhysicsComponent puller, IPhysicsComponent pulled)
{
Controller = controller;
Puller = puller;

2
Content.Shared/Physics/Pull/PullStartedMessage.cs
View File

@@ -4,7 +4,7 @@ namespace Content.Shared.Physics.Pull
{
public class PullStartedMessage : PullMessage
{
public PullStartedMessage(PullController controller, ICollidableComponent puller, ICollidableComponent pulled) :
public PullStartedMessage(PullController controller, IPhysicsComponent puller, IPhysicsComponent pulled) :
base(controller, puller, pulled)
{
}

2
Content.Shared/Physics/Pull/PullStoppedMessage.cs
View File

@@ -4,7 +4,7 @@ namespace Content.Shared.Physics.Pull
{
public class PullStoppedMessage : PullMessage
{
public PullStoppedMessage(PullController controller, ICollidableComponent puller, ICollidableComponent pulled) :
public PullStoppedMessage(PullController controller, IPhysicsComponent puller, IPhysicsComponent pulled) :
base(controller, puller, pulled)
{
}

2
Content.Shared/Physics/ShuttleController.cs
View File

@@ -7,7 +7,7 @@ namespace Content.Shared.Physics
{
public class ShuttleController : VirtualController
{
public override ICollidableComponent? ControlledComponent { protected get; set; }
public override IPhysicsComponent? ControlledComponent { protected get; set; }
public void Push(Vector2 velocityDirection, float speed)
{

2
Content.Shared/Physics/ThrownController.cs
View File

@@ -7,7 +7,7 @@ namespace Content.Shared.Physics
{
public class ThrownController : VirtualController
{
public override ICollidableComponent? ControlledComponent { protected get; set; }
public override IPhysicsComponent? ControlledComponent { protected get; set; }
public void Push(Vector2 velocityDirection, float speed)
{