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

Fix riot shield audio and popup spam (#21881)

Browse Source
This commit is contained in:
themias
2023-11-28 02:06:38 -05:00
committed by GitHub
parent 79c59a48d7
commit ed2d59aa19
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Blocking/BlockingSystem.User.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.Damage; using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes; using Content.Shared.Damage.Prototypes;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
@@ -44,6 +44,9 @@ public sealed partial class BlockingSystem
{ {
if (TryComp<BlockingComponent>(component.BlockingItem, out var blocking)) if (TryComp<BlockingComponent>(component.BlockingItem, out var blocking))
{ {
if (args.Damage.GetTotal() <= 0)
return;
var blockFraction = blocking.IsBlocking ? blocking.ActiveBlockFraction : blocking.PassiveBlockFraction; var blockFraction = blocking.IsBlocking ? blocking.ActiveBlockFraction : blocking.PassiveBlockFraction;
blockFraction = Math.Clamp(blockFraction, 0, 1); blockFraction = Math.Clamp(blockFraction, 0, 1);
_damageable.TryChangeDamage(component.BlockingItem, blockFraction * args.OriginalDamage); _damageable.TryChangeDamage(component.BlockingItem, blockFraction * args.OriginalDamage);

18
Content.Shared/Blocking/BlockingSystem.cs
View File

@@ -19,6 +19,7 @@ using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Systems; using Robust.Shared.Physics.Systems;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
namespace Content.Shared.Blocking; namespace Content.Shared.Blocking;
@@ -36,6 +37,7 @@ public sealed partial class BlockingSystem : EntitySystem
[Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly ExamineSystemShared _examine = default!; [Dependency] private readonly ExamineSystemShared _examine = default!;
[Dependency] private readonly INetManager _net = default!; [Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -195,8 +197,12 @@ public sealed partial class BlockingSystem : EntitySystem
return false; return false;
} }
_actionsSystem.SetToggled(component.BlockingToggleActionEntity, true); _actionsSystem.SetToggled(component.BlockingToggleActionEntity, true);
_popupSystem.PopupEntity(msgUser, user, user); if (_gameTiming.IsFirstTimePredicted)
_popupSystem.PopupEntity(msgOther, user, Filter.PvsExcept(user), true); {
_popupSystem.PopupEntity(msgOther, user, Filter.PvsExcept(user), true);
if(_gameTiming.InPrediction)
_popupSystem.PopupEntity(msgUser, user, user);
}
} }
if (TryComp<PhysicsComponent>(user, out var physicsComponent)) if (TryComp<PhysicsComponent>(user, out var physicsComponent))
@@ -259,8 +265,12 @@ public sealed partial class BlockingSystem : EntitySystem
_actionsSystem.SetToggled(component.BlockingToggleActionEntity, false); _actionsSystem.SetToggled(component.BlockingToggleActionEntity, false);
_fixtureSystem.DestroyFixture(user, BlockingComponent.BlockFixtureID, body: physicsComponent); _fixtureSystem.DestroyFixture(user, BlockingComponent.BlockFixtureID, body: physicsComponent);
_physics.SetBodyType(user, blockingUserComponent.OriginalBodyType, body: physicsComponent); _physics.SetBodyType(user, blockingUserComponent.OriginalBodyType, body: physicsComponent);
_popupSystem.PopupEntity(msgUser, user, user); if (_gameTiming.IsFirstTimePredicted)
_popupSystem.PopupEntity(msgOther, user, Filter.PvsExcept(user), true); {
_popupSystem.PopupEntity(msgOther, user, Filter.PvsExcept(user), true);
if(_gameTiming.InPrediction)
_popupSystem.PopupEntity(msgUser, user, user);
}
} }
component.IsBlocking = false; component.IsBlocking = false;