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

Battery (SMES/substation) interface (#36386)

Browse Source 
* Add ENERGYWATTHOURS() loc function

Takes in joules (energy), displays as watt-hours.

* Add simple OnOffButton control

* Re-add Inset style class

This was sloppily removed at some point?? Whatever, I need it.

* Add helper functions for setting title/guidebook IDs on FancyWindow

Reagent dispenser uses these, more in the next commits.

* Add BuiPredictionState helper

This enables me to implement coarse prediction manually in the battery UI.

Basically it's a local buffer of predicted inputs that can easily be replayed against future BUI states from the server.

* Add input coalescing infrastructure

I ran into the following problem: Robust's Slider control absolutely *spams* input events, to such a degree that it actually causes issues for the networking layer if directly passed through. For something like a slider, we just need to send the most recent value.

There is no good way for us to handle this in the control itself, as it *really* needs to happen in PreEngine. For simplicity reasons (for BUIs) I came to the conclusion it's best if it's there, as it's *before* any new states from the server can be applied. We can't just do this in Update() or something on the control as the timing just doesn't line up.

I made a content system, BuiPreTickUpdateSystem, that runs in the ModRunLevel.PreEngine phase to achieve this. It runs a method on a new IBuiPreTickUpdate interface on all open BUIs. They can then implement their own coalescing logic.

In the simplest case, this coalescing logic can just be "save the last value, and if we have any new value since the last update, send an input event." This is what the new InputCoalescer<T> type is for.

Adding new coalescing logic should be possible in the future, of course. It's all just small helpers.

* Battery interface

This adds a proper interface to batteries (SMES/substation). Players can turn IO on and off, and they can change charge and discharge rate. There's also a ton of numbers and stuff. It looks great.

This actually enables charge and discharge rates to be changed for these devices. The settings for both have been set between 5kW and 150kW.

* Oops, forgot to remove these style class defs.
This commit is contained in:
Pieter-Jan Briers
2025-04-27 13:08:34 +02:00
committed by GitHub
parent 791f7af5d4
commit ffe130b38d
21 changed files with 1146 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Shared/Localizations/ContentLocalizationManager.cs
View File

@@ -31,6 +31,8 @@ namespace Content.Shared.Localizations
_loc.AddFunction(culture, "PRESSURE", FormatPressure);
_loc.AddFunction(culture, "POWERWATTS", FormatPowerWatts);
_loc.AddFunction(culture, "POWERJOULES", FormatPowerJoules);
// NOTE: ENERGYWATTHOURS() still takes a value in joules, but formats as watt-hours.
_loc.AddFunction(culture, "ENERGYWATTHOURS", FormatEnergyWattHours);
_loc.AddFunction(culture, "UNITS", FormatUnits);
_loc.AddFunction(culture, "TOSTRING", args => FormatToString(culture, args));
_loc.AddFunction(culture, "LOC", FormatLoc);
@@ -172,11 +174,17 @@ namespace Content.Shared.Localizations
return new LocValueString(obj?.ToString() ?? "");
}
private static ILocValue FormatUnitsGeneric(LocArgs args, string mode)
private static ILocValue FormatUnitsGeneric(
LocArgs args,
string mode,
Func<double, double>? transformValue = null)
{
const int maxPlaces = 5; // Matches amount in _lib.ftl
var pressure = ((LocValueNumber) args.Args[0]).Value;
if (transformValue != null)
pressure = transformValue(pressure);
var places = 0;
while (pressure > 1000 && places < maxPlaces)
{
@@ -202,6 +210,13 @@ namespace Content.Shared.Localizations
return FormatUnitsGeneric(args, "zzzz-fmt-power-joules");
}
private static ILocValue FormatEnergyWattHours(LocArgs args)
{
const double joulesToWattHours = 1.0 / 3600;
return FormatUnitsGeneric(args, "zzzz-fmt-energy-watt-hours", joules => joules * joulesToWattHours);
}
private static ILocValue FormatUnits(LocArgs args)
{
if (!Units.Types.TryGetValue(((LocValueString) args.Args[0]).Value, out var ut))