Merge pull request #6202 from sowelipililimute/work/densetsu/progress-bar-begone
with deference to the progress bar kill it as gaudily as possible
This commit is contained in:
commit
fb7de4c114
|
|
@ -5,13 +5,6 @@
|
|||
MinSize="650 600"
|
||||
SetSize="750 620">
|
||||
<BoxContainer Orientation="Vertical" Margin="5 5 5 0">
|
||||
<!-- Header -->
|
||||
<BoxContainer Margin="7 10 7 0">
|
||||
<!-- Progress bar -->
|
||||
<ProgressBar Name="CultProgressBar" SetHeight="30" MaxValue="100" HorizontalExpand="True">
|
||||
<Label Name="ProgressBarPercentage" HorizontalAlignment="Center"/>
|
||||
</ProgressBar>
|
||||
</BoxContainer>
|
||||
<!-- Main body -->
|
||||
<BoxContainer Orientation="Horizontal" VerticalExpand="True" Margin="10 20 10 10">
|
||||
<!-- Left section -->
|
||||
|
|
@ -31,18 +24,6 @@
|
|||
<Label HorizontalAlignment="Center" Text="{Loc 'monument-interface-entropy-available-label'}" Margin="0 0 5 0" StyleClasses="LabelSmall" />
|
||||
<Label HorizontalAlignment="Center" Name="AvailableEntropy" FontColorOverride="#4CA7AD" StyleClasses="LabelSmall" />
|
||||
</BoxContainer>
|
||||
<BoxContainer Orientation="Horizontal" Margin="0 5 0 0" HorizontalAlignment="Center">
|
||||
<Label HorizontalAlignment="Center" Text="{Loc 'monument-interface-entropy-next-stage-title'}" Margin="0 0 5 0" StyleClasses="LabelSmall" />
|
||||
<Label HorizontalAlignment="Center" Name="EntropyUntilNextStage" FontColorOverride="#4CA7AD" StyleClasses="LabelSmall" />
|
||||
</BoxContainer>
|
||||
<BoxContainer Orientation="Horizontal" Margin="0 5 0 0" HorizontalAlignment="Center">
|
||||
<Label HorizontalAlignment="Center" Text="{Loc 'monument-interface-entropy-seperator'}" Margin="0 0 5 0" StyleClasses="LabelSmall" />
|
||||
<Label HorizontalAlignment="Center" Name="OrSeperator" FontColorOverride="#4CA7AD" StyleClasses="LabelSmall" />
|
||||
</BoxContainer>
|
||||
<BoxContainer Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<Label HorizontalAlignment="Center" Text="{Loc 'monument-interface-entropy-crew-convert-title'}" Margin="0 0 5 0" StyleClasses="LabelSmall" />
|
||||
<Label HorizontalAlignment="Center" Name="CrewToConvertUntilNextStage" FontColorOverride="#4CA7AD" StyleClasses="LabelSmall" />
|
||||
</BoxContainer>
|
||||
</BoxContainer>
|
||||
</BoxContainer>
|
||||
<!-- Right section -->
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ using Content.Shared._DV.CosmicCult.Prototypes;
|
|||
using Content.Shared._DV.CosmicCult;
|
||||
using Robust.Client.AutoGenerated;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Client.Graphics;
|
||||
using Robust.Client.Player;
|
||||
using Robust.Client.UserInterface.Controls;
|
||||
using Robust.Client.UserInterface.XAML;
|
||||
|
|
@ -57,28 +56,10 @@ public sealed partial class MonumentMenu : FancyWindow
|
|||
|
||||
public void UpdateState(MonumentBuiState state)
|
||||
{
|
||||
CultProgressBar.BackgroundStyleBoxOverride = new StyleBoxFlat { BackgroundColor = new Color(15, 17, 30) };
|
||||
CultProgressBar.ForegroundStyleBoxOverride = new StyleBoxFlat { BackgroundColor = new Color(91, 62, 124) };
|
||||
|
||||
UpdateBar(state);
|
||||
UpdateEntropy(state);
|
||||
UpdateInfluences(state);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Updates the progress bar
|
||||
/// </summary>
|
||||
private void UpdateBar(MonumentBuiState state)
|
||||
{
|
||||
var percentComplete = 100f * ((float)state.CurrentProgress / state.TargetProgress);
|
||||
|
||||
percentComplete = Math.Min(percentComplete, 100f);
|
||||
|
||||
CultProgressBar.Value = percentComplete;
|
||||
|
||||
ProgressBarPercentage.Text = Loc.GetString("monument-interface-progress-bar", ("percentage", percentComplete.ToString("0")));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Updates the entropy fields
|
||||
/// </summary>
|
||||
|
|
@ -95,8 +76,6 @@ public sealed partial class MonumentMenu : FancyWindow
|
|||
var crewToNextStage = (int)Math.Max(Math.Round((double)entropyToNextStage / _entropyPerCultist, MidpointRounding.ToPositiveInfinity), min); //force it to be at least one
|
||||
|
||||
AvailableEntropy.Text = Loc.GetString("monument-interface-entropy-value", ("infused", availableEntropy));
|
||||
EntropyUntilNextStage.Text = Loc.GetString("monument-interface-entropy-value", ("infused", entropyToNextStage.ToString()));
|
||||
CrewToConvertUntilNextStage.Text = crewToNextStage.ToString();
|
||||
}
|
||||
|
||||
// Update all the influence thingies
|
||||
|
|
|
|||
Loading…
Reference in New Issue