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

Add gravitycomponent support to maps (#9857)

Browse Source 
* Add gravitycomponent support to maps

The alert still needs fixing if you want planets.

* move
This commit is contained in:
metalgearsloth
2022-07-18 19:49:52 +10:00
committed by GitHub
parent dc9493f7a2
commit 2268fdd24b
5 changed files with 61 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Friction/SharedTileFrictionController.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.CCVar;
using Content.Shared.Gravity;
using Content.Shared.Movement;
using Content.Shared.Movement.Components;
using Content.Shared.Movement.Systems;
@@ -18,6 +19,7 @@ namespace Content.Shared.Friction
{
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly SharedGravitySystem _gravity = default!;
protected SharedMoverController Mover = default!;
@@ -165,16 +167,14 @@ namespace Content.Shared.Friction
[Pure]
private float GetTileFriction(PhysicsComponent body, TransformComponent xform)
{
var coords = xform.Coordinates;
// TODO: Make IsWeightless event-based; we already have grid traversals tracked so just raise events
if (body.Owner.IsWeightless(body, coords, _mapManager) ||
if (_gravity.IsWeightless(body.Owner, body, xform) ||
!_mapManager.TryGetGrid(xform.GridUid, out var grid))
return 0.0f;
if (!coords.IsValid(EntityManager)) return 0.0f;
if (!xform.Coordinates.IsValid(EntityManager)) return 0.0f;
var tile = grid.GetTileRef(coords);
var tile = grid.GetTileRef(xform.Coordinates);
var tileDef = _tileDefinitionManager[tile.Tile.TypeId];
return tileDef.Friction;
}