Skip to content

Commit

Permalink
Merge pull request #1624 from Darkmajia/supermatter-console-fixups
Browse files Browse the repository at this point in the history 
supermatter console fix-ups
  • Loading branch information
@hivehum
hivehum authored Feb 10, 2025
2 parents 8697d06 + 17dda96 commit 35880e5
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 24 deletions.
28 changes: 18 additions & 10 deletions Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterEntryContainer.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<gfx:StyleBoxFlat BackgroundColor="#25252a"/>
</PanelContainer.PanelOverride>
<BoxContainer Orientation="Horizontal" Margin="6 3">

<!-- Engine details -->
<BoxContainer HorizontalExpand="True" Orientation="Vertical" Margin="0 0 6 0">
<!-- Integrity display -->
Expand All @@ -36,7 +36,7 @@
<Label Name="IntegrityBarLabel" HorizontalAlignment="Right" Margin="0 0 4 0" />
</ProgressBar>
</PanelContainer>
<Button Name="IntegrityButton" SetWidth="27" StyleClasses="ButtonSquare" Margin="-1">
<Button Name="IntegrityButton" SetWidth="27" StyleClasses="ButtonSquare" Margin="-1 -1 -2 -1">
<TextureRect Name="IntegrityButtonArrow" TexturePath="/Textures/_EinsteinEngines/Interface/Supermatter/arrow_down.png" VerticalAlignment="Center" Margin="-8 -2 0 0" />
</Button>
</BoxContainer>
Expand All @@ -59,7 +59,7 @@
<Label Name="PowerBarLabel" HorizontalAlignment="Right" Margin="0 0 4 0" />
</ProgressBar>
</PanelContainer>
<Button Name="PowerButton" SetWidth="27" StyleClasses="ButtonSquare" Margin="-1">
<Button Name="PowerButton" SetWidth="27" StyleClasses="ButtonSquare" Margin="-1 -1 -2 -1">
<TextureRect Name="PowerButtonArrow" TexturePath="/Textures/_EinsteinEngines/Interface/Supermatter/arrow_down.png" VerticalAlignment="Center" Margin="-8 -2 0 0" />
</Button>
</BoxContainer>
Expand All @@ -82,7 +82,7 @@
<Label Name="RadiationBarLabel" HorizontalAlignment="Right" Margin="0 0 4 0" />
</ProgressBar>
</PanelContainer>
<Button Name="RadiationButton" SetWidth="27" StyleClasses="ButtonSquare" Margin="-1">
<Button Name="RadiationButton" SetWidth="27" StyleClasses="ButtonSquare" Margin="-1 -1 -2 -1">
<TextureRect Name="RadiationButtonArrow" TexturePath="/Textures/_EinsteinEngines/Interface/Supermatter/arrow_down.png" VerticalAlignment="Center" Margin="-8 -2 0 0" />
</Button>
</BoxContainer>
Expand All @@ -101,9 +101,9 @@

<!-- Absorbed moles display -->
<BoxContainer Orientation="Horizontal" Margin="0 1">
<Label Name="MolesLabel" Text="{Loc 'supermatter-console-window-label-power'}" HorizontalExpand="True" HorizontalAlignment="Left" />
<Label Name="MolesLabel" Text="{Loc 'supermatter-console-window-label-moles'}" HorizontalExpand="True" HorizontalAlignment="Left" />
<BoxContainer SetWidth="180" SetHeight="24" Orientation="Horizontal">
<PanelContainer Name="MolesBarBorder" HorizontalExpand="True" Margin="0 0 4 0">
<PanelContainer Name="MolesBarBorder" HorizontalExpand="True" Margin="0">
<ProgressBar Name="MolesBar" MinValue="0" MaxValue="100" Margin="1">
<Label Name="MolesBarLabel" HorizontalAlignment="Right" Margin="0 0 4 0" />
</ProgressBar>
Expand All @@ -115,7 +115,7 @@
<BoxContainer Orientation="Horizontal" Margin="0 1">
<Label Name="TemperatureLabel" Text="{Loc 'supermatter-console-window-label-temperature'}" HorizontalExpand="True" HorizontalAlignment="Left" />
<BoxContainer SetWidth="180" SetHeight="24" Orientation="Horizontal">
<PanelContainer Name="TemperatureBarBorder" HorizontalExpand="True" Margin="0 0 4 0">
<PanelContainer Name="TemperatureBarBorder" HorizontalExpand="True" Margin="0">
<ProgressBar Name="TemperatureBar" MinValue="0" MaxValue="1000" Margin="1">
<Label Name="TemperatureBarLabel" HorizontalAlignment="Right" Margin="0 0 4 0" />
</ProgressBar>
Expand All @@ -129,7 +129,7 @@
<Label Name="TemperatureLimitLabel" Text="{Loc 'supermatter-console-window-label-temperature-limit'}" HorizontalExpand="True" HorizontalAlignment="Left" />
<BoxContainer SetWidth="180" SetHeight="24" Orientation="Horizontal">
<Label Name="TemperatureLimitBarLabel" HorizontalExpand="True" HorizontalAlignment="Left" Margin="0 0 4 0" />
<Button Name="TemperatureLimitButton" SetWidth="27" StyleClasses="ButtonSquare" Margin="-1">
<Button Name="TemperatureLimitButton" SetWidth="27" StyleClasses="ButtonSquare" Margin="-1 -1 -2 -1">
<TextureRect Name="TemperatureLimitButtonArrow" TexturePath="/Textures/_EinsteinEngines/Interface/Supermatter/arrow_down.png" VerticalAlignment="Center" Margin="-8 -2 0 0" />
</Button>
</BoxContainer>
Expand Down Expand Up @@ -182,8 +182,16 @@
</BoxContainer>
</BoxContainer>

<!-- Gas details (entries added by C# code) -->
<BoxContainer Name="GasTable" HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical" Margin="6 0 0 0" />
<!-- Gas details -->
<BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="6 0 0 0">
<!-- Show all gases -->
<Button Name="ShowAllGasButton" StyleClasses="OpenLeft" SetHeight="26" HorizontalAlignment="Right">
<Label Name="ShowAllGasLabel" Text="{Loc 'supermatter-console-window-label-show-all-gas'}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="4 0 0 0" />
</Button>

<!-- Gas table (entries added by C# code) -->
<BoxContainer Name="GasTable" Orientation="Vertical" />
</BoxContainer>
</BoxContainer>
</PanelContainer>

Expand Down
33 changes: 21 additions & 12 deletions Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterEntryContainer.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public sealed partial class SupermatterEntryContainer : BoxContainer
private readonly Color _colorRed = StyleNano.DangerousRedFore;
private readonly Color _colorOrange = StyleNano.ConcerningOrangeFore;
private readonly Color _colorGreen = StyleNano.GoodGreenFore;
private readonly Color _colorTurqoise = Color.FromHex("#00fff7");
private readonly Color _colorTurquoise = Color.FromHex("#00fff7");

// Arrow icons
private readonly string _arrowUp = "/Textures/_EinsteinEngines/Interface/Supermatter/arrow_up.png";
Expand All @@ -45,6 +45,9 @@ public sealed partial class SupermatterEntryContainer : BoxContainer
// Save focus data values so we don't update too often
private SupermatterFocusData _focusData;

// Other saved variables
private bool _showAllGases;

public SupermatterEntryContainer(NetEntity uid)
{
RobustXamlLoader.Load(this);
Expand All @@ -60,12 +63,12 @@ public SupermatterEntryContainer(NetEntity uid)
// Set the engine dictionary
_engineDictionary = new()
{
{ "integrity", ( IntegrityBarLabel, IntegrityBar, IntegrityBarBorder, 0.9f, 0.1f, _colorRed, _colorOrange, _colorGreen ) },
{ "power", ( PowerBarLabel, PowerBar, PowerBarBorder, 0.9f, 0.1f, _colorGreen, _colorOrange, _colorRed ) },
{ "radiation", ( RadiationBarLabel, RadiationBar, RadiationBarBorder, 0.1f, 0.9f, _colorGreen, _colorOrange, _colorRed ) },
{ "moles", ( MolesBarLabel, MolesBar, MolesBarBorder, 0.5f, 0.5f, _colorGreen, _colorOrange, _colorRed ) },
{ "temperature", ( TemperatureBarLabel, TemperatureBar, TemperatureBarBorder, 0.9f, 0.1f, _colorTurqoise, _colorGreen, _colorRed ) },
{ "waste", ( WasteBarLabel, WasteBar, WasteBarBorder, 0.5f, 0.5f, _colorGreen, _colorOrange, _colorRed ) }
{ "integrity", ( IntegrityBarLabel, IntegrityBar, IntegrityBarBorder, 0.9f, 0.1f, _colorRed, _colorOrange, _colorGreen ) },
{ "power", ( PowerBarLabel, PowerBar, PowerBarBorder, 0.9f, 0.1f, _colorGreen, _colorOrange, _colorRed ) },
{ "radiation", ( RadiationBarLabel, RadiationBar, RadiationBarBorder, 0.1f, 0.9f, _colorGreen, _colorOrange, _colorRed ) },
{ "moles", ( MolesBarLabel, MolesBar, MolesBarBorder, 0.5f, 0.5f, _colorGreen, _colorOrange, _colorRed ) },
{ "temperature", ( TemperatureBarLabel, TemperatureBar, TemperatureBarBorder, 0.9f, 0.1f, _colorTurquoise, _colorGreen, _colorRed ) },
{ "waste", ( WasteBarLabel, WasteBar, WasteBarBorder, 0.5f, 0.5f, _colorGreen, _colorOrange, _colorRed ) }
};

// Set the gas bar data
Expand Down Expand Up @@ -151,6 +154,7 @@ public SupermatterEntryContainer(NetEntity uid)
// Set fonts and font colors
SupermatterNameLabel.FontOverride = headerFont;
SupermatterStatusLabel.FontOverride = normalFont;
ShowAllGasLabel.FontOverride = normalFont;

IntegrityHealingInfoLabel.FontColorOverride = _colorGreen;
RadiationBaseInfoLabel.FontColorOverride = _colorGreen;
Expand All @@ -174,6 +178,9 @@ public SupermatterEntryContainer(NetEntity uid)
label.FontColorOverride = _colorSlate;
}

// Set other variables
_showAllGases = false;

// On click
foreach (var detail in _expandDetails)
{
Expand All @@ -183,6 +190,11 @@ public SupermatterEntryContainer(NetEntity uid)
detail.Arrow.TexturePath = detail.Container.Visible ? _arrowUp : _arrowDown;
};
}

ShowAllGasButton.OnButtonUp += args =>
{
_showAllGases = !_showAllGases;
};
}

public void UpdateEntry(SupermatterConsoleEntry entry, bool isFocus, SupermatterFocusData? focusData = null)
Expand Down Expand Up @@ -253,11 +265,8 @@ public void UpdateEntry(SupermatterConsoleEntry entry, bool isFocus, Supermatter
gasData.Add((data, moles));
data.Bar.UpdateEntry(gas, _focusData);

// Hide 0% gases
if (moles == 0f)
data.Bar.Visible = false;
else
data.Bar.Visible = true;
// Only show gases above 0%, unless "show all gases" is enabled
data.Bar.Visible = moles > 0f || _showAllGases;
}

var gasSort = gasData.OrderByDescending(x => x.Moles).ThenBy(x => x.GasBarData.Gas);
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterGasBarContainer.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
<Label Name="GasBarLabel" HorizontalAlignment="Right" Margin="0 0 4 0" />
</ProgressBar>
</PanelContainer>
<Button Name="GasButton" SetWidth="27" StyleClasses="ButtonSquare" Margin="-1">
<Button Name="GasButton" SetWidth="27" StyleClasses="ButtonSquare" Margin="-1 -1 0 -1">
<TextureRect Name="GasButtonArrow" TexturePath="/Textures/_EinsteinEngines/Interface/Supermatter/arrow_down.png" VerticalAlignment="Center" Margin="-8 -2 0 0" />
</Button>
</BoxContainer>
</BoxContainer>

<BoxContainer Name="DetailsContainer" Orientation="Vertical" Margin="16 2 0 0" Visible="False">
<BoxContainer Orientation="Horizontal" HorizontalExpand="True">
<Label Name="HeaderLabel" Text="{Loc 'supermatter-console-window-label-details'}" />
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_EinsteinEngines/supermatter/supermatter-console.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ supermatter-console-window-status-danger = Danger
supermatter-console-window-status-emergency = Emergency
supermatter-console-window-status-delaminating = Delaminating
supermatter-console-window-label-show-all-gas = Show All Gases
supermatter-console-window-label-integrity = Integrity:
supermatter-console-window-label-integrity-bar = {$integrity}%
supermatter-console-window-label-integrity-healing = Low Temperature Healing (Δ):
Expand Down

0 comments on commit 35880e5

Please sign in to comment.