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

Allow changing instrument style while playing them (#9946)

Browse Source 
* Properly dirty changes when calling "SetInstrumentProgram" method

* Allow using swappable instrument verbs even while playing the instrument.
It's funnier this way
This commit is contained in:
Vera Aguilera Puerto
2022-07-24 13:40:05 +02:00
committed by GitHub
parent 16a08a60d0
commit cb5f051be5
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Instruments/SwappableInstrumentSystem.cs
View File

@@ -25,9 +25,6 @@ public sealed class SwappableInstrumentSystem : EntitySystem
if (!TryComp<SharedInstrumentComponent>(uid, out var instrument)) if (!TryComp<SharedInstrumentComponent>(uid, out var instrument))
return; return;
if (instrument.Playing) //no changing while playing
return;
var priority = 0; var priority = 0;
foreach (var entry in component.InstrumentList) foreach (var entry in component.InstrumentList)
{ {

4
Content.Shared/Instruments/SharedInstrumentSystem.cs
View File

@@ -20,8 +20,10 @@ public abstract class SharedInstrumentSystem : EntitySystem
public void SetInstrumentProgram(SharedInstrumentComponent component, byte program, byte bank) public void SetInstrumentProgram(SharedInstrumentComponent component, byte program, byte bank)
{ {
component.InstrumentProgram = program;
component.InstrumentBank = bank; component.InstrumentBank = bank;
component.InstrumentProgram = program;
component.DirtyRenderer = true;
Dirty(component);
} }
private void OnGetState(EntityUid uid, SharedInstrumentComponent instrument, ref ComponentGetState args) private void OnGetState(EntityUid uid, SharedInstrumentComponent instrument, ref ComponentGetState args)