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

removed TryGetSound + made some SoundSpecifier datafields required

Browse Source
This commit is contained in:
Galactic Chimp
2021-07-31 19:52:33 +02:00
parent 8ff703c338
commit 57016d14b4
114 changed files with 519 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Window/WindowComponent.cs
View File

@@ -31,7 +31,8 @@ namespace Content.Server.Window
[ViewVariables(VVAccess.ReadWrite)] private TimeSpan _lastKnockTime;
[DataField("knockDelay")] [ViewVariables(VVAccess.ReadWrite)]
[DataField("knockDelay")]
[ViewVariables(VVAccess.ReadWrite)]
private TimeSpan _knockDelay = TimeSpan.FromSeconds(0.5);
[DataField("rateLimitedKnocking")]
@@ -47,11 +48,11 @@ namespace Content.Server.Window
switch (message)
{
case DamageChangedMessage msg:
{
var current = msg.Damageable.TotalDamage;
UpdateVisuals(current);
break;
}
{
var current = msg.Damageable.TotalDamage;
UpdateVisuals(current);
break;
}
}
}
@@ -133,9 +134,9 @@ namespace Content.Server.Window
return false;
}
if(_knockSound.TryGetSound(out var sound))
SoundSystem.Play(Filter.Pvs(eventArgs.Target), sound,
eventArgs.Target.Transform.Coordinates, AudioHelpers.WithVariation(0.05f));
SoundSystem.Play(
Filter.Pvs(eventArgs.Target), _knockSound.GetSound(),
eventArgs.Target.Transform.Coordinates, AudioHelpers.WithVariation(0.05f));
eventArgs.Target.PopupMessageEveryone(Loc.GetString("comp-window-knock"));
_lastKnockTime = _gameTiming.CurTime;