Removed Catwalk. Replaced with FootstepModifierComponent (#2496)

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
Ygg01
2020-11-22 15:02:39 +01:00
committed by GitHub
parent 3f2512851f
commit 8a19052394
4 changed files with 12 additions and 29 deletions

View File

@@ -35,7 +35,6 @@
"Smes",
"LightBulb",
"Healing",
"Catwalk",
"RangedMagazine",
"Ammo",
"HitscanWeaponCapacitor",

View File

@@ -1,13 +0,0 @@
using Robust.Shared.GameObjects;
namespace Content.Server.GameObjects.Components
{
/// <summary>
/// Literally just a marker component for footsteps for now.
/// </summary>
[RegisterComponent]
public sealed class CatwalkComponent : Component
{
public override string Name => "Catwalk";
}
}

View File

@@ -56,7 +56,8 @@ namespace Content.Server.GameObjects.EntitySystems
public override void Update(float frameTime)
{
foreach (var (moverComponent, collidableComponent) in EntityManager.ComponentManager.EntityQuery<IMoverComponent, IPhysicsComponent>())
foreach (var (moverComponent, collidableComponent) in EntityManager.ComponentManager
.EntityQuery<IMoverComponent, IPhysicsComponent>(false))
{
var entity = moverComponent.Owner;
UpdateKinematics(entity.Transform, moverComponent, collidableComponent);
@@ -141,24 +142,19 @@ namespace Content.Server.GameObjects.EntitySystems
var grid = _mapManager.GetGrid(coordinates.GetGridId(EntityManager));
var tile = grid.GetTileRef(coordinates);
// If the coordinates have a catwalk, it's always catwalk.
string soundCollectionName;
var catwalk = false;
foreach (var maybeCatwalk in grid.GetSnapGridCell(tile.GridIndices, SnapGridOffset.Center))
// If the coordinates have a FootstepModifier component
// i.e. component that emit sound on footsteps emit that sound
string? soundCollectionName = null;
foreach (var maybeFootstep in grid.GetSnapGridCell(tile.GridIndices, SnapGridOffset.Center))
{
if (maybeCatwalk.Owner.HasComponent<CatwalkComponent>())
if (maybeFootstep.Owner.TryGetComponent(out FootstepModifierComponent? footstep))
{
catwalk = true;
soundCollectionName = footstep._soundCollectionName;
break;
}
}
if (catwalk)
{
// Catwalk overrides tile sound.s
soundCollectionName = "footstep_catwalk";
}
else
// if there is no FootstepModifierComponent, determine sound based on tiles
if (soundCollectionName == null)
{
// Walking on a tile.
var def = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId];

View File

@@ -22,7 +22,8 @@
- type: IconSmooth
key: catwalk
base: catwalk_
- type: Catwalk
- type: FootstepModifier
footstepSoundCollection: footstep_catwalk
- type: Construction
graph: Catwalk
node: Catwalk