-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Lost-Paradise-Project:master' into dbg
- Loading branch information
Showing
186 changed files
with
4,031 additions
and
1,276 deletions.
There are no files selected for viewing
81 changes: 81 additions & 0 deletions
81
Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
<BoxContainer xmlns="https://spacestation14.io" | ||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
xmlns:s="clr-namespace:Content.Client.Stylesheets" | ||
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client" | ||
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" | ||
Orientation="Vertical" HorizontalExpand ="True" Margin="0 0 0 3"> | ||
|
||
<!-- Device selection button --> | ||
<Button Name="FocusButton" HorizontalExpand="True" SetHeight="32" Margin="12 0 0 0" StyleClasses="OpenBoth" Access="Public"> | ||
<BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Horizontal"> | ||
|
||
<!-- Alarm state --> | ||
<TextureRect Stretch="Keep" HorizontalAlignment="Left" Margin="-20 -2 0 0" ModulateSelfOverride="#25252a" TexturePath="/Textures/Interface/AtmosMonitoring/status_bg.png"> | ||
<BoxContainer VerticalExpand="True" HorizontalExpand="True" Orientation="Horizontal" Margin="8 0"> | ||
<TextureRect Name="ArrowTexture" VerticalAlignment="Center" SetSize="12 12" Stretch="KeepAspectCentered" Margin="3 0" TexturePath="/Textures/Interface/Nano/triangle_right.png"></TextureRect> | ||
<Label Name="AlarmStateLabel" HorizontalExpand="True" HorizontalAlignment="Center" FontColorOverride="#5A5A5A" Text="{Loc 'atmos-alerts-window-invalid-state'}"></Label> | ||
</BoxContainer> | ||
</TextureRect> | ||
|
||
<!-- Alarm name --> | ||
<Label Name="AlarmNameLabel" Text="???" HorizontalExpand="True" HorizontalAlignment="Center" Margin="5 0"></Label> | ||
</BoxContainer> | ||
</Button> | ||
|
||
<!-- Panel that appears on selecting the device --> | ||
<PanelContainer Name="FocusContainer" HorizontalExpand="True" Margin="1 -1 1 0" ReservesSpace="False" Visible="False" Access="Public"> | ||
<PanelContainer.PanelOverride> | ||
<gfx:StyleBoxFlat BackgroundColor="#25252a"/> | ||
</PanelContainer.PanelOverride> | ||
<BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical"> | ||
|
||
<!-- Atmosphere status --> | ||
<Control> | ||
|
||
<!-- Main container for displaying atmospheric data --> | ||
<BoxContainer Name="MainDataContainer" HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical" ReservesSpace="False" Visible="False"> | ||
<BoxContainer HorizontalExpand="True" Orientation="Horizontal"> | ||
<Label Name="TemperatureHeaderLabel" Text="{Loc 'atmos-alerts-window-temperature-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label> | ||
<Label Name="PressureHeaderLabel" Text="{Loc 'atmos-alerts-window-pressure-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label> | ||
<Label Name="OxygenationHeaderLabel" Text="{Loc 'atmos-alerts-window-oxygenation-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label> | ||
</BoxContainer> | ||
<PanelContainer HorizontalExpand="True"> | ||
<PanelContainer.PanelOverride> | ||
<gfx:StyleBoxFlat BackgroundColor="#202023"/> | ||
</PanelContainer.PanelOverride> | ||
<BoxContainer HorizontalExpand="True" Orientation="Horizontal"> | ||
<Label Name="TemperatureLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#5A5A5A" Margin="0 2 0 0" SetHeight="24"></Label> | ||
<Label Name="PressureLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#5A5A5A" Margin="0 2 0 0" SetHeight="24"></Label> | ||
<Label Name="OxygenationLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#5A5A5A" Margin="0 2 0 0" SetHeight="24"></Label> | ||
</BoxContainer> | ||
</PanelContainer> | ||
<BoxContainer HorizontalExpand="True" Orientation="Horizontal"> | ||
<Label Name="GasesHeaderLabel" Text="{Loc 'atmos-alerts-window-other-gases-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 4 0 0" SetHeight="24"></Label> | ||
</BoxContainer> | ||
<PanelContainer HorizontalExpand="True"> | ||
<PanelContainer.PanelOverride> | ||
<gfx:StyleBoxFlat BackgroundColor="#202023"/> | ||
</PanelContainer.PanelOverride> | ||
|
||
<!-- Gas entries added via C# code --> | ||
<GridContainer Name="GasGridContainer" HorizontalExpand="True" Columns = "4"></GridContainer> | ||
</PanelContainer> | ||
</BoxContainer> | ||
|
||
<!-- If the alarm is inactive, this is label is diplayed instead --> | ||
<Label Name="NoDataLabel" Text="{Loc 'atmos-alerts-window-no-data-available'}" HorizontalAlignment="Center" Margin="0 15" FontColorOverride="#a9a9a9" ReservesSpace="False" Visible="False"></Label> | ||
|
||
<!-- Silencing progress bar --> | ||
<controls:StripeBack Name="SilenceAlarmProgressBar" ReservesSpace="False" Visible="False" Access="Public"> | ||
<PanelContainer> | ||
<Label Text="{Loc 'atmos-alerts-window-alerts-being-silenced'}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5 5 5 5"/> | ||
</PanelContainer> | ||
</controls:StripeBack> | ||
</Control> | ||
|
||
<!-- Check box for silencing this alarm --> | ||
<CheckBox Name="SilenceCheckBox" Text="{Loc 'atmos-alerts-window-silence-alerts'}" HorizontalAlignment="Left" Margin="5 5 5 5" Access="Public"></CheckBox> | ||
</BoxContainer> | ||
</PanelContainer> | ||
|
||
</BoxContainer> |
215 changes: 215 additions & 0 deletions
215
Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,215 @@ | ||
using Content.Client.Stylesheets; | ||
using Content.Shared.Atmos; | ||
using Content.Shared.Atmos.Components; | ||
using Content.Shared.Atmos.Monitor; | ||
using Content.Shared.FixedPoint; | ||
using Content.Shared.Temperature; | ||
using Robust.Client.AutoGenerated; | ||
using Robust.Client.Graphics; | ||
using Robust.Client.ResourceManagement; | ||
using Robust.Client.UserInterface.Controls; | ||
using Robust.Client.UserInterface.XAML; | ||
using Robust.Shared.Map; | ||
using System.Linq; | ||
|
||
namespace Content.Client.Atmos.Consoles; | ||
|
||
[GenerateTypedNameReferences] | ||
public sealed partial class AtmosAlarmEntryContainer : BoxContainer | ||
{ | ||
public NetEntity NetEntity; | ||
public EntityCoordinates? Coordinates; | ||
|
||
private readonly IEntityManager _entManager; | ||
private readonly IResourceCache _cache; | ||
|
||
private Dictionary<AtmosAlarmType, string> _alarmStrings = new Dictionary<AtmosAlarmType, string>() | ||
{ | ||
[AtmosAlarmType.Invalid] = "atmos-alerts-window-invalid-state", | ||
[AtmosAlarmType.Normal] = "atmos-alerts-window-normal-state", | ||
[AtmosAlarmType.Warning] = "atmos-alerts-window-warning-state", | ||
[AtmosAlarmType.Danger] = "atmos-alerts-window-danger-state", | ||
}; | ||
|
||
private Dictionary<Gas, string> _gasShorthands = new Dictionary<Gas, string>() | ||
{ | ||
[Gas.Ammonia] = "NH₃", | ||
[Gas.CarbonDioxide] = "CO₂", | ||
[Gas.Frezon] = "F", | ||
[Gas.Nitrogen] = "N₂", | ||
[Gas.NitrousOxide] = "N₂O", | ||
[Gas.Oxygen] = "O₂", | ||
[Gas.Plasma] = "P", | ||
[Gas.Tritium] = "T", | ||
[Gas.WaterVapor] = "H₂O", | ||
}; | ||
|
||
public AtmosAlarmEntryContainer(NetEntity uid, EntityCoordinates? coordinates) | ||
{ | ||
RobustXamlLoader.Load(this); | ||
|
||
_entManager = IoCManager.Resolve<IEntityManager>(); | ||
_cache = IoCManager.Resolve<IResourceCache>(); | ||
|
||
NetEntity = uid; | ||
Coordinates = coordinates; | ||
|
||
// Load fonts | ||
var headerFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Bold.ttf"), 11); | ||
var normalFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-Regular.ttf"), 11); | ||
var smallFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10); | ||
|
||
// Set fonts | ||
TemperatureHeaderLabel.FontOverride = headerFont; | ||
PressureHeaderLabel.FontOverride = headerFont; | ||
OxygenationHeaderLabel.FontOverride = headerFont; | ||
GasesHeaderLabel.FontOverride = headerFont; | ||
|
||
TemperatureLabel.FontOverride = normalFont; | ||
PressureLabel.FontOverride = normalFont; | ||
OxygenationLabel.FontOverride = normalFont; | ||
|
||
NoDataLabel.FontOverride = headerFont; | ||
|
||
SilenceCheckBox.Label.FontOverride = smallFont; | ||
SilenceCheckBox.Label.FontColorOverride = Color.DarkGray; | ||
} | ||
|
||
public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlertsFocusDeviceData? focusData = null) | ||
{ | ||
NetEntity = entry.NetEntity; | ||
Coordinates = _entManager.GetCoordinates(entry.Coordinates); | ||
|
||
// Load fonts | ||
var normalFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-Regular.ttf"), 11); | ||
|
||
// Update alarm state | ||
if (!_alarmStrings.TryGetValue(entry.AlarmState, out var alarmString)) | ||
alarmString = "atmos-alerts-window-invalid-state"; | ||
|
||
AlarmStateLabel.Text = Loc.GetString(alarmString); | ||
AlarmStateLabel.FontColorOverride = GetAlarmStateColor(entry.AlarmState); | ||
|
||
// Update alarm name | ||
AlarmNameLabel.Text = Loc.GetString("atmos-alerts-window-alarm-label", ("name", entry.EntityName), ("address", entry.Address)); | ||
|
||
// Focus updates | ||
FocusContainer.Visible = isFocus; | ||
|
||
if (isFocus) | ||
SetAsFocus(); | ||
else | ||
RemoveAsFocus(); | ||
|
||
if (isFocus && entry.Group == AtmosAlertsComputerGroup.AirAlarm) | ||
{ | ||
MainDataContainer.Visible = (entry.AlarmState != AtmosAlarmType.Invalid); | ||
NoDataLabel.Visible = (entry.AlarmState == AtmosAlarmType.Invalid); | ||
|
||
if (focusData != null) | ||
{ | ||
// Update temperature | ||
var tempK = (FixedPoint2)focusData.Value.TemperatureData.Item1; | ||
var tempC = (FixedPoint2)TemperatureHelpers.KelvinToCelsius(tempK.Float()); | ||
|
||
TemperatureLabel.Text = Loc.GetString("atmos-alerts-window-temperature-value", ("valueInC", tempC), ("valueInK", tempK)); | ||
TemperatureLabel.FontColorOverride = GetAlarmStateColor(focusData.Value.TemperatureData.Item2); | ||
|
||
// Update pressure | ||
PressureLabel.Text = Loc.GetString("atmos-alerts-window-pressure-value", ("value", (FixedPoint2)focusData.Value.PressureData.Item1)); | ||
PressureLabel.FontColorOverride = GetAlarmStateColor(focusData.Value.PressureData.Item2); | ||
|
||
// Update oxygenation | ||
var oxygenPercent = (FixedPoint2)0f; | ||
var oxygenAlert = AtmosAlarmType.Invalid; | ||
|
||
if (focusData.Value.GasData.TryGetValue(Gas.Oxygen, out var oxygenData)) | ||
{ | ||
oxygenPercent = oxygenData.Item2 * 100f; | ||
oxygenAlert = oxygenData.Item3; | ||
} | ||
|
||
OxygenationLabel.Text = Loc.GetString("atmos-alerts-window-oxygenation-value", ("value", oxygenPercent)); | ||
OxygenationLabel.FontColorOverride = GetAlarmStateColor(oxygenAlert); | ||
|
||
// Update other present gases | ||
GasGridContainer.RemoveAllChildren(); | ||
|
||
var gasData = focusData.Value.GasData.Where(g => g.Key != Gas.Oxygen); | ||
|
||
if (gasData.Count() == 0) | ||
{ | ||
// No other gases | ||
var gasLabel = new Label() | ||
{ | ||
Text = Loc.GetString("atmos-alerts-window-other-gases-value-nil"), | ||
FontOverride = normalFont, | ||
FontColorOverride = StyleNano.DisabledFore, | ||
HorizontalAlignment = HAlignment.Center, | ||
VerticalAlignment = VAlignment.Center, | ||
HorizontalExpand = true, | ||
Margin = new Thickness(0, 2, 0, 0), | ||
SetHeight = 24f, | ||
}; | ||
|
||
GasGridContainer.AddChild(gasLabel); | ||
} | ||
|
||
else | ||
{ | ||
// Add an entry for each gas | ||
foreach ((var gas, (var mol, var percent, var alert)) in gasData) | ||
{ | ||
var gasPercent = (FixedPoint2)0f; | ||
gasPercent = percent * 100f; | ||
|
||
if (!_gasShorthands.TryGetValue(gas, out var gasShorthand)) | ||
gasShorthand = "X"; | ||
|
||
var gasLabel = new Label() | ||
{ | ||
Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasShorthand), ("value", gasPercent)), | ||
FontOverride = normalFont, | ||
FontColorOverride = GetAlarmStateColor(alert), | ||
HorizontalAlignment = HAlignment.Center, | ||
VerticalAlignment = VAlignment.Center, | ||
HorizontalExpand = true, | ||
Margin = new Thickness(0, 2, 0, 0), | ||
SetHeight = 24f, | ||
}; | ||
|
||
GasGridContainer.AddChild(gasLabel); | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
public void SetAsFocus() | ||
{ | ||
FocusButton.AddStyleClass(StyleNano.StyleClassButtonColorGreen); | ||
ArrowTexture.TexturePath = "/Textures/Interface/Nano/inverted_triangle.svg.png"; | ||
} | ||
|
||
public void RemoveAsFocus() | ||
{ | ||
FocusButton.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen); | ||
ArrowTexture.TexturePath = "/Textures/Interface/Nano/triangle_right.png"; | ||
FocusContainer.Visible = false; | ||
} | ||
|
||
private Color GetAlarmStateColor(AtmosAlarmType alarmType) | ||
{ | ||
switch (alarmType) | ||
{ | ||
case AtmosAlarmType.Normal: | ||
return StyleNano.GoodGreenFore; | ||
case AtmosAlarmType.Warning: | ||
return StyleNano.ConcerningOrangeFore; | ||
case AtmosAlarmType.Danger: | ||
return StyleNano.DangerousRedFore; | ||
} | ||
|
||
return StyleNano.DisabledFore; | ||
} | ||
} |
52 changes: 52 additions & 0 deletions
52
Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
using Content.Shared.Atmos.Components; | ||
|
||
namespace Content.Client.Atmos.Consoles; | ||
|
||
public sealed class AtmosAlertsComputerBoundUserInterface : BoundUserInterface | ||
{ | ||
[ViewVariables] | ||
private AtmosAlertsComputerWindow? _menu; | ||
|
||
public AtmosAlertsComputerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } | ||
|
||
protected override void Open() | ||
{ | ||
_menu = new AtmosAlertsComputerWindow(this, Owner); | ||
_menu.OpenCentered(); | ||
_menu.OnClose += Close; | ||
|
||
EntMan.TryGetComponent<TransformComponent>(Owner, out var xform); | ||
} | ||
|
||
protected override void UpdateState(BoundUserInterfaceState state) | ||
{ | ||
base.UpdateState(state); | ||
|
||
var castState = (AtmosAlertsComputerBoundInterfaceState) state; | ||
|
||
if (castState == null) | ||
return; | ||
|
||
EntMan.TryGetComponent<TransformComponent>(Owner, out var xform); | ||
_menu?.UpdateUI(xform?.Coordinates, castState.AirAlarms, castState.FireAlarms, castState.FocusData); | ||
} | ||
|
||
public void SendFocusChangeMessage(NetEntity? netEntity) | ||
{ | ||
SendMessage(new AtmosAlertsComputerFocusChangeMessage(netEntity)); | ||
} | ||
|
||
public void SendDeviceSilencedMessage(NetEntity netEntity, bool silenceDevice) | ||
{ | ||
SendMessage(new AtmosAlertsComputerDeviceSilencedMessage(netEntity, silenceDevice)); | ||
} | ||
|
||
protected override void Dispose(bool disposing) | ||
{ | ||
base.Dispose(disposing); | ||
if (!disposing) | ||
return; | ||
|
||
_menu?.Dispose(); | ||
} | ||
} |
Oops, something went wrong.