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

Revert "Physics (#3452)"

Browse Source 
This reverts commit 3e64fd56a1.
This commit is contained in:
Pieter-Jan Briers
2021-02-28 18:49:48 +01:00
parent eddec5fcce
commit 1eb0fbd8d0
211 changed files with 2560 additions and 2600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Construction/Completions/SetAnchor.cs
View File

@@ -3,7 +3,6 @@ using System.Threading.Tasks;
using Content.Shared.Construction;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.Physics;
using Robust.Shared.Serialization;
namespace Content.Server.Construction.Completions
@@ -20,9 +19,9 @@ namespace Content.Server.Construction.Completions
public async Task PerformAction(IEntity entity, IEntity? user)
{
if (!entity.TryGetComponent(out IPhysBody? physics)) return;
if (!entity.TryGetComponent(out IPhysicsComponent? physics)) return;
physics.BodyType = Value ? BodyType.Static : BodyType.Dynamic;
physics.Anchored = Value;
}
}
}

11
Content.Server/Construction/Conditions/EntityAnchored.cs
View File

@@ -2,7 +2,6 @@
using Content.Shared.Construction;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.Physics;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
@@ -20,21 +19,21 @@ namespace Content.Server.Construction.Conditions
public async Task<bool> Condition(IEntity entity)
{
if (!entity.TryGetComponent(out IPhysBody physics)) return false;
if (!entity.TryGetComponent(out IPhysicsComponent physics)) return false;
return (physics.BodyType == BodyType.Static && Anchored) || (physics.BodyType != BodyType.Static && !Anchored);
return physics.Anchored == Anchored;
}
public bool DoExamine(IEntity entity, FormattedMessage message, bool inDetailsRange)
{
if (!entity.TryGetComponent(out IPhysBody physics)) return false;
if (!entity.TryGetComponent(out IPhysicsComponent physics)) return false;
switch (Anchored)
{
case true when physics.BodyType == BodyType.Static:
case true when !physics.Anchored:
message.AddMarkup("First, anchor it.\n");
return true;
case false when physics.BodyType == BodyType.Static:
case false when physics.Anchored:
message.AddMarkup("First, unanchor it.\n");
return true;
}