Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

7
Content.Server/Tools/Components/MultitoolComponent.cs
View File

@@ -33,10 +33,10 @@ namespace Content.Server.Tools.Components
[DataField("sprite")]
public string Sprite { get; } = string.Empty;
[DataField("useSound")]
[DataField("useSound", required: true)]
public SoundSpecifier Sound { get; } = default!;
[DataField("changeSound")]
[DataField("changeSound", required: true)]
public SoundSpecifier ChangeSound { get; } = default!;
}
@@ -60,8 +60,7 @@ namespace Content.Server.Tools.Components
_currentTool = (_currentTool + 1) % _tools.Count;
SetTool();
var current = _tools[_currentTool];
if(current.ChangeSound.TryGetSound(out var changeSound))
SoundSystem.Play(Filter.Pvs(Owner), changeSound, Owner);
SoundSystem.Play(Filter.Pvs(Owner), current.ChangeSound.GetSound(), Owner);
}
private void SetTool()

5
Content.Server/Tools/Components/ToolComponent.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Server.Tools.Components
[DataField("speed")]
public float SpeedModifier { get; set; } = 1;
[DataField("useSound")]
[DataField("useSound", required: true)]
public SoundSpecifier UseSound { get; set; } = default!;
public void AddQuality(ToolQuality quality)
@@ -96,8 +96,7 @@ namespace Content.Server.Tools.Components
public void PlayUseSound(float volume = -5f)
{
if(UseSound.TryGetSound(out var useSound))
SoundSystem.Play(Filter.Pvs(Owner), useSound, Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume));
SoundSystem.Play(Filter.Pvs(Owner), UseSound.GetSound(), Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume));
}
}
}

22
Content.Server/Tools/Components/WelderComponent.cs
View File

@@ -60,7 +60,7 @@ namespace Content.Server.Tools.Components
private SolutionContainerComponent? _solutionComponent;
private PointLightComponent? _pointLightComponent;
[DataField("weldSounds")]
[DataField("weldSounds", required: true)]
private SoundSpecifier WeldSounds { get; set; } = default!;
[DataField("welderOffSounds")]
@@ -171,9 +171,9 @@ namespace Content.Server.Tools.Components
var succeeded = _solutionComponent.TryRemoveReagent("WeldingFuel", ReagentUnit.New(value));
if (succeeded && !silent && WeldSounds.TryGetSound(out var weldSounds))
if (succeeded && !silent)
{
PlaySound(weldSounds);
PlaySound(WeldSounds);
}
return succeeded;
}
@@ -204,8 +204,7 @@ namespace Content.Server.Tools.Components
if (_pointLightComponent != null) _pointLightComponent.Enabled = false;
if(WelderOffSounds.TryGetSound(out var welderOffSOunds))
PlaySound(welderOffSOunds, -5);
PlaySound(WelderOffSounds, -5);
_welderSystem.Unsubscribe(this);
return true;
}
@@ -222,8 +221,7 @@ namespace Content.Server.Tools.Components
if (_pointLightComponent != null) _pointLightComponent.Enabled = true;
if (WelderOnSounds.TryGetSound(out var welderOnSOunds))
PlaySound(welderOnSOunds, -5);
PlaySound(WelderOnSounds, -5);
_welderSystem.Subscribe(this);
EntitySystem.Get<AtmosphereSystem>().HotspotExpose(Owner.Transform.Coordinates, 700, 50, true);
@@ -283,8 +281,7 @@ namespace Content.Server.Tools.Components
if (TryWeld(5, victim, silent: true))
{
if(WeldSounds.TryGetSound(out var weldSound))
PlaySound(weldSound);
PlaySound(WeldSounds);
othersMessage =
Loc.GetString("welder-component-suicide-lit-others-message",
@@ -337,8 +334,7 @@ namespace Content.Server.Tools.Components
{
var drained = targetSolution.Drain(trans);
_solutionComponent.TryAddSolution(drained);
if(WelderRefill.TryGetSound(out var welderRefillSound))
SoundSystem.Play(Filter.Pvs(Owner), welderRefillSound, Owner);
SoundSystem.Play(Filter.Pvs(Owner), WelderRefill.GetSound(), Owner);
eventArgs.Target.PopupMessage(eventArgs.User, Loc.GetString("welder-component-after-interact-refueled-message"));
}
}
@@ -346,9 +342,9 @@ namespace Content.Server.Tools.Components
return true;
}
private void PlaySound(string soundName, float volume = -5f)
private void PlaySound(SoundSpecifier sound, float volume = -5f)
{
SoundSystem.Play(Filter.Pvs(Owner), soundName, Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume));
SoundSystem.Play(Filter.Pvs(Owner), sound.GetSound(), Owner, AudioHelpers.WithVariation(0.15f).WithVolume(volume));
}
}
}