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

Content update for UI prediction (#27214)

Browse Source 
* Content update for UI refactor

* Big update

* Sharing

* Remaining content updates

* First big update

* Prototype updates

* AUGH

* Fix UI comp ref

* Cleanup

- Fix predicted message, fix item slots, fix interaction range check.

* Fix regressions

* Make this predictive

idk why it wasn't.

* Fix slime merge

* Merge conflict

* Fix merge
This commit is contained in:
metalgearsloth
2024-04-26 18:16:24 +10:00
committed by GitHub
parent 32b81de8c5
commit 5896e68752
279 changed files with 1308 additions and 1582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Power/Generator/PortableGeneratorSystem.cs
View File

@@ -48,30 +48,21 @@ public sealed class PortableGeneratorSystem : SharedPortableGeneratorSystem
private void GeneratorSwitchOutputMessage(EntityUid uid, PortableGeneratorComponent component, PortableGeneratorSwitchOutputMessage args)
{
if (args.Session.AttachedEntity == null)
return;
var fuelGenerator = Comp<FuelGeneratorComponent>(uid);
if (fuelGenerator.On)
return;
_switchable.Cycle(uid, args.Session.AttachedEntity.Value);
_switchable.Cycle(uid, args.Actor);
}
private void GeneratorStopMessage(EntityUid uid, PortableGeneratorComponent component, PortableGeneratorStopMessage args)
{
if (args.Session.AttachedEntity == null)
return;
StopGenerator(uid, component, args.Session.AttachedEntity.Value);
StopGenerator(uid, component, args.Actor);
}
private void GeneratorStartMessage(EntityUid uid, PortableGeneratorComponent component, PortableGeneratorStartMessage args)
{
if (args.Session.AttachedEntity == null)
return;
StartGenerator(uid, component, args.Session.AttachedEntity.Value);
StartGenerator(uid, component, args.Actor);
}
private void StartGenerator(EntityUid uid, PortableGeneratorComponent component, EntityUid user)
@@ -234,7 +225,7 @@ public sealed class PortableGeneratorSystem : SharedPortableGeneratorSystem
if (powerSupplier.Net is { IsConnectedNetwork: true } net)
networkStats = (net.NetworkNode.LastCombinedLoad, net.NetworkNode.LastCombinedSupply);
_uiSystem.TrySetUiState(
_uiSystem.SetUiState(
uid,
GeneratorComponentUiKey.Key,
new PortableGeneratorComponentBuiState(fuelComp, fuel, clogged, networkStats));