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

Remove usages of physics anchored from content

Browse Source
This commit is contained in:
Pieter-Jan Briers
2021-05-13 02:13:12 +02:00
parent 251df93b71
commit 26c2d9f479
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs
View File

@@ -8,6 +8,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
@@ -58,9 +59,9 @@ namespace Content.Server.GameObjects.Components.Atmos
if (moveProb > ProbabilityOffset && _robustRandom.Prob(MathF.Min(moveProb / 100f, 1f)) if (moveProb > ProbabilityOffset && _robustRandom.Prob(MathF.Min(moveProb / 100f, 1f))
&& !float.IsPositiveInfinity(MoveResist) && !float.IsPositiveInfinity(MoveResist)
&& (!physics.Anchored && (physics.BodyType != BodyType.Static
&& (maxForce >= (MoveResist * MoveForcePushRatio))) && (maxForce >= (MoveResist * MoveForcePushRatio)))
|| (physics.Anchored && (maxForce >= (MoveResist * MoveForceForcePushRatio)))) || (physics.BodyType == BodyType.Static && (maxForce >= (MoveResist * MoveForceForcePushRatio))))
{ {
if (physics.Owner.HasComponent<IMobStateComponent>()) if (physics.Owner.HasComponent<IMobStateComponent>())

5
Content.Server/GlobalVerbs/SetAnchorVerb.cs
View File

@@ -4,6 +4,7 @@ using Robust.Server.Console;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Physics;
namespace Content.Server.GlobalVerbs namespace Content.Server.GlobalVerbs
{ {
@@ -30,7 +31,7 @@ namespace Content.Server.GlobalVerbs
if (groupController.CanCommand(player.PlayerSession, "setanchor")) if (groupController.CanCommand(player.PlayerSession, "setanchor"))
{ {
data.Text = physics.Anchored ? "Unanchor" : "Anchor"; data.Text = physics.BodyType == BodyType.Static ? "Unanchor" : "Anchor";
data.Visibility = VerbVisibility.Visible; data.Visibility = VerbVisibility.Visible;
} }
} }
@@ -46,7 +47,7 @@ namespace Content.Server.GlobalVerbs
if (target.TryGetComponent(out PhysicsComponent? physics)) if (target.TryGetComponent(out PhysicsComponent? physics))
{ {
physics.Anchored = !physics.Anchored; physics.BodyType = physics.BodyType == BodyType.Static ? BodyType.Dynamic : BodyType.Static;
} }
} }
} }

2
Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs
View File

@@ -210,7 +210,7 @@ namespace Content.Shared.GameObjects.Components.Pulling
return false; return false;
} }
if (_physics.Anchored) if (_physics.BodyType == BodyType.Static)
{ {
return false; return false;
} }