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

Fix xenos prying doors from afar (#10778)

Browse Source
This commit is contained in:
TekuNut
2022-08-23 11:31:54 +01:00
committed by GitHub
parent 9a0eef932c
commit b80708e7cc
3 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Doors/DoorSystem.cs
View File

@@ -27,9 +27,9 @@ public sealed class DoorSystem : SharedDoorSystem
} }
// TODO AUDIO PREDICT see comments in server-side PlaySound() // TODO AUDIO PREDICT see comments in server-side PlaySound()
protected override void PlaySound(EntityUid uid, string sound, AudioParams audioParams, EntityUid? predictingPlayer, bool predicted) protected override void PlaySound(EntityUid uid, SoundSpecifier soundSpecifier, AudioParams audioParams, EntityUid? predictingPlayer, bool predicted)
{ {
if (GameTiming.InPrediction && GameTiming.IsFirstTimePredicted) if (GameTiming.InPrediction && GameTiming.IsFirstTimePredicted)
SoundSystem.Play(sound, Filter.Local(), uid, audioParams); Audio.Play(soundSpecifier, Filter.Local(), uid, audioParams);
} }
} }

27
Content.Server/Doors/Systems/DoorSystem.cs
View File

@@ -30,6 +30,7 @@ public sealed class DoorSystem : SharedDoorSystem
[Dependency] private readonly AirtightSystem _airtightSystem = default!; [Dependency] private readonly AirtightSystem _airtightSystem = default!;
[Dependency] private readonly ConstructionSystem _constructionSystem = default!; [Dependency] private readonly ConstructionSystem _constructionSystem = default!;
[Dependency] private readonly ToolSystem _toolSystem = default!; [Dependency] private readonly ToolSystem _toolSystem = default!;
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -94,11 +95,12 @@ public sealed class DoorSystem : SharedDoorSystem
/// Selectively send sound to clients, taking care to not send the double-audio. /// Selectively send sound to clients, taking care to not send the double-audio.
/// </summary> /// </summary>
/// <param name="uid">The audio source</param> /// <param name="uid">The audio source</param>
/// <param name="sound">The sound</param> /// <param name="soundSpecifier">The sound</param>
/// <param name="audioParams">The audio parameters.</param>
/// <param name="predictingPlayer">The user (if any) that instigated an interaction</param> /// <param name="predictingPlayer">The user (if any) that instigated an interaction</param>
/// <param name="predicted">Whether this interaction would have been predicted. If the predicting player is null, /// <param name="predicted">Whether this interaction would have been predicted. If the predicting player is null,
/// this assumes it would have been predicted by all players in PVS range.</param> /// this assumes it would have been predicted by all players in PVS range.</param>
protected override void PlaySound(EntityUid uid, string sound, AudioParams audioParams, EntityUid? predictingPlayer, bool predicted) protected override void PlaySound(EntityUid uid, SoundSpecifier soundSpecifier, AudioParams audioParams, EntityUid? predictingPlayer, bool predicted)
{ {
// If this sound would have been predicted by all clients, do not play any audio. // If this sound would have been predicted by all clients, do not play any audio.
if (predicted && predictingPlayer == null) if (predicted && predictingPlayer == null)
@@ -113,7 +115,7 @@ public sealed class DoorSystem : SharedDoorSystem
} }
// send the sound to players. // send the sound to players.
SoundSystem.Play(sound, filter, uid, audioParams); Audio.Play(soundSpecifier, filter, uid, audioParams);
} }
#region DoAfters #region DoAfters
@@ -158,7 +160,11 @@ public sealed class DoorSystem : SharedDoorSystem
private void OnDoorAltVerb(EntityUid uid, DoorComponent component, GetVerbsEvent<AlternativeVerb> args) private void OnDoorAltVerb(EntityUid uid, DoorComponent component, GetVerbsEvent<AlternativeVerb> args)
{ {
if (!args.CanInteract || !TryComp<ToolComponent>(args.User, out var tool) || !tool.Qualities.Contains(component.PryingQuality)) return; if (!args.CanInteract || !args.CanAccess)
return;
if (!TryComp<ToolComponent>(args.User, out var tool) || !tool.Qualities.Contains(component.PryingQuality))
return;
args.Verbs.Add(new AlternativeVerb() args.Verbs.Add(new AlternativeVerb()
{ {
@@ -173,7 +179,8 @@ public sealed class DoorSystem : SharedDoorSystem
/// </summary> /// </summary>
private bool TryPryDoor(EntityUid target, EntityUid tool, EntityUid user, DoorComponent door, bool force = false) private bool TryPryDoor(EntityUid target, EntityUid tool, EntityUid user, DoorComponent door, bool force = false)
{ {
if (door.BeingPried) return false; if (door.BeingPried)
return false;
if (door.State == DoorState.Welded) if (door.State == DoorState.Welded)
return false; return false;
@@ -274,9 +281,9 @@ public sealed class DoorSystem : SharedDoorSystem
if (string.IsNullOrEmpty(door.BoardPrototype)) if (string.IsNullOrEmpty(door.BoardPrototype))
return; return;
var container = uid.EnsureContainer<Container>("board", out var existed); var container = _containerSystem.EnsureContainer<Container>(uid, "board", out var existed);
if (existed & container.ContainedEntities.Count != 0) if (existed && container.ContainedEntities.Count != 0)
{ {
// We already contain a board. Note: We don't check if it's the right one! // We already contain a board. Note: We don't check if it's the right one!
return; return;
@@ -298,7 +305,7 @@ public sealed class DoorSystem : SharedDoorSystem
if (door.State == DoorState.Closed) if (door.State == DoorState.Closed)
{ {
SetState(uid, DoorState.Emagging, door); SetState(uid, DoorState.Emagging, door);
PlaySound(uid, door.SparkSound.GetSound(), AudioParams.Default.WithVolume(8), args.UserUid, false); PlaySound(uid, door.SparkSound, AudioParams.Default.WithVolume(8), args.UserUid, false);
args.Handled = true; args.Handled = true;
} }
} }
@@ -309,12 +316,12 @@ public sealed class DoorSystem : SharedDoorSystem
if (!Resolve(uid, ref door)) if (!Resolve(uid, ref door))
return; return;
DoorState lastState = door.State; var lastState = door.State;
SetState(uid, DoorState.Opening, door); SetState(uid, DoorState.Opening, door);
if (door.OpenSound != null) if (door.OpenSound != null)
PlaySound(uid, door.OpenSound.GetSound(), AudioParams.Default.WithVolume(-5), user, predicted); PlaySound(uid, door.OpenSound, AudioParams.Default.WithVolume(-5), user, predicted);
if(lastState == DoorState.Emagging && TryComp<AirlockComponent>(door.Owner, out var airlockComponent)) if(lastState == DoorState.Emagging && TryComp<AirlockComponent>(door.Owner, out var airlockComponent))
airlockComponent?.SetBoltsWithAudio(!airlockComponent.IsBolted()); airlockComponent?.SetBoltsWithAudio(!airlockComponent.IsBolted());

20
Content.Shared/Doors/Systems/SharedDoorSystem.cs
View File

@@ -23,6 +23,9 @@ public abstract class SharedDoorSystem : EntitySystem
[Dependency] private readonly SharedStunSystem _stunSystem = default!; [Dependency] private readonly SharedStunSystem _stunSystem = default!;
[Dependency] protected readonly TagSystem Tags = default!; [Dependency] protected readonly TagSystem Tags = default!;
[Dependency] protected readonly IGameTiming GameTiming = default!; [Dependency] protected readonly IGameTiming GameTiming = default!;
[Dependency] protected readonly SharedAudioSystem Audio = default!;
[Dependency] private readonly EntityLookupSystem _entityLookup = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
/// <summary> /// <summary>
/// A body must have an intersection percentage larger than this in order to be considered as colliding with a /// A body must have an intersection percentage larger than this in order to be considered as colliding with a
@@ -167,7 +170,7 @@ public abstract class SharedDoorSystem : EntitySystem
if (!TryComp(uid, out AppearanceComponent? appearance)) if (!TryComp(uid, out AppearanceComponent? appearance))
return; return;
appearance.SetData(DoorVisuals.State, door.State); _appearance.SetData(uid, DoorVisuals.State, door.State);
} }
#endregion #endregion
@@ -199,7 +202,7 @@ public abstract class SharedDoorSystem : EntitySystem
SetState(uid, DoorState.Denying, door); SetState(uid, DoorState.Denying, door);
if (door.DenySound != null) if (door.DenySound != null)
PlaySound(uid, door.DenySound.GetSound(), AudioParams.Default.WithVolume(-3), user, predicted); PlaySound(uid, door.DenySound, AudioParams.Default.WithVolume(-3), user, predicted);
} }
public bool TryToggleDoor(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool predicted = false) public bool TryToggleDoor(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool predicted = false)
@@ -265,14 +268,14 @@ public abstract class SharedDoorSystem : EntitySystem
SetState(uid, DoorState.Opening, door); SetState(uid, DoorState.Opening, door);
if (door.OpenSound != null) if (door.OpenSound != null)
PlaySound(uid, door.OpenSound.GetSound(), AudioParams.Default.WithVolume(-5), user, predicted); PlaySound(uid, door.OpenSound, AudioParams.Default.WithVolume(-5), user, predicted);
// I'm not sure what the intent here is/was? It plays a sound if the user is opening a door with a hands // I'm not sure what the intent here is/was? It plays a sound if the user is opening a door with a hands
// component, but no actual hands!? What!? Is this the sound of them head-butting the door to get it to open?? // component, but no actual hands!? What!? Is this the sound of them head-butting the door to get it to open??
// I'm 99% sure something is wrong here, but I kind of want to keep it this way. // I'm 99% sure something is wrong here, but I kind of want to keep it this way.
if (user != null && TryComp(user.Value, out SharedHandsComponent? hands) && hands.Hands.Count == 0) if (user != null && TryComp(user.Value, out SharedHandsComponent? hands) && hands.Hands.Count == 0)
PlaySound(uid, door.TryOpenDoorSound.GetSound(), AudioParams.Default.WithVolume(-2), user, predicted); PlaySound(uid, door.TryOpenDoorSound, AudioParams.Default.WithVolume(-2), user, predicted);
} }
/// <summary> /// <summary>
@@ -329,7 +332,7 @@ public abstract class SharedDoorSystem : EntitySystem
SetState(uid, DoorState.Closing, door); SetState(uid, DoorState.Closing, door);
if (door.CloseSound != null) if (door.CloseSound != null)
PlaySound(uid, door.CloseSound.GetSound(), AudioParams.Default.WithVolume(-5), user, predicted); PlaySound(uid, door.CloseSound, AudioParams.Default.WithVolume(-5), user, predicted);
} }
/// <summary> /// <summary>
@@ -422,7 +425,8 @@ public abstract class SharedDoorSystem : EntitySystem
yield break; yield break;
// TODO SLOTH fix electro's code. // TODO SLOTH fix electro's code.
var doorAABB = physics.GetWorldAABB(); // ReSharper disable once InconsistentNaming
var doorAABB = _entityLookup.GetWorldAABB(uid);
foreach (var otherPhysics in PhysicsSystem.GetCollidingEntities(Transform(uid).MapID, doorAABB)) foreach (var otherPhysics in PhysicsSystem.GetCollidingEntities(Transform(uid).MapID, doorAABB))
{ {
@@ -436,7 +440,7 @@ public abstract class SharedDoorSystem : EntitySystem
&& (otherPhysics.CollisionMask & physics.CollisionLayer) == 0) && (otherPhysics.CollisionMask & physics.CollisionLayer) == 0)
continue; continue;
if (otherPhysics.GetWorldAABB().IntersectPercentage(doorAABB) < IntersectPercentage) if (_entityLookup.GetWorldAABB(otherPhysics.Owner).IntersectPercentage(doorAABB) < IntersectPercentage)
continue; continue;
yield return otherPhysics.Owner; yield return otherPhysics.Owner;
@@ -614,5 +618,5 @@ public abstract class SharedDoorSystem : EntitySystem
} }
#endregion #endregion
protected abstract void PlaySound(EntityUid uid, string sound, AudioParams audioParams, EntityUid? predictingPlayer, bool predicted); protected abstract void PlaySound(EntityUid uid, SoundSpecifier soundSpecifier, AudioParams audioParams, EntityUid? predictingPlayer, bool predicted);
} }