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

Attempts to fix all physics bugs at once (#3610)

Browse Source 
* Fixed Rack/Shelf

* Fixes bookshelf, bed

* Placeable for beds for bedsheets

* Bunch of Physics changes, ask metalgearsloth about em'

* More modifications

* More

* Other stuff

* Organizes entities yaml a little bit

* Something new

* Fixed, happy with the state of this rn

* A

* A

* Ye

* E

* Done for now...

* Applied Reviws

* Changes

* Fix the robust commit

* Fixes tests?

* E

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
Swept
2021-03-26 01:51:26 +00:00
committed by GitHub
parent 1499468157
commit 29d02a3740
58 changed files with 383 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
using Content.Shared.Physics;
@@ -22,7 +22,7 @@ namespace Content.Shared.GameObjects.Components.Movement
foreach (var entity in Body.GetBodiesIntersecting())
{
if ((entity.CollisionLayer & (int) CollisionGroup.VaultImpassable) != 0) return true;
if ((entity.CollisionLayer & (int) CollisionGroup.SmallImpassable) != 0) return true;
}
return false;
@@ -70,14 +70,14 @@ namespace Content.Shared.GameObjects.Components.Movement
if (_isClimbing == value) return;
_isClimbing = value;
ToggleVaultPassable(value);
ToggleSmallPassable(value);
}
}
protected bool _isClimbing;
// TODO: Layers need a re-work
private void ToggleVaultPassable(bool value)
private void ToggleSmallPassable(bool value)
{
// Hope the mob has one fixture
if (Body == null || Body.Deleted) return;
@@ -86,11 +86,11 @@ namespace Content.Shared.GameObjects.Components.Movement
{
if (value)
{
fixture.CollisionMask &= ~(int) CollisionGroup.VaultImpassable;
fixture.CollisionMask &= ~(int) CollisionGroup.SmallImpassable;
}
else
{
fixture.CollisionMask |= (int) CollisionGroup.VaultImpassable;
fixture.CollisionMask |= (int) CollisionGroup.SmallImpassable;
}
}
}