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

Gateway destinations (#21040)

Browse Source 
* Gateway generation

* Gateway stuff

* gatewehs

* mercenaries

* play area

* Range fixes and tweaks

* weh

* Gateway UI polish

* Lots of fixes

* Knock some items off

* Fix dungeon spawning

Realistically we should probably be using a salvage job.

* wahwah

* wehvs

* expression

* weh

* eee

* a

* a

* WEH

* frfr

* Gatwey

* Fix gateway windows

* Fix gateway windows

* a

* a

* Better layer masking

* a

* a

* Noise fixes

* a

* Fix fractal calculations

* a

* More fixes

* Fixes

* Add layers back in

* Fixes

* namespaces and ftl

* Other TODO

* Fix distance

* Cleanup

* Fix test
This commit is contained in:
metalgearsloth
2023-11-15 13:23:40 +11:00
committed by GitHub
parent 67a3c3a6a3
commit 816ee2e1ab
51 changed files with 1562 additions and 959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
Content.Client/Gateway/UI/GatewayWindow.xaml.cs
View File

@@ -1,3 +1,4 @@
using System.Numerics;
using Content.Client.Computer;
using Content.Client.Stylesheets;
using Content.Client.UserInterface.Controls;
@@ -19,30 +20,55 @@ public sealed partial class GatewayWindow : FancyWindow,
private readonly IGameTiming _timing;
public event Action<NetEntity>? OpenPortal;
private List<(NetEntity, string, TimeSpan, bool)> _destinations = default!;
private NetEntity? _current;
private TimeSpan _nextClose;
private TimeSpan _lastOpen;
private List<Label> _readyLabels = default!;
private List<Button> _openButtons = default!;
private List<GatewayDestinationData> _destinations = new();
public GatewayWindow()
public readonly NetEntity Owner;
private NetEntity? _current;
private TimeSpan _nextReady;
private TimeSpan _cooldown;
private TimeSpan _unlockTime;
private TimeSpan _nextUnlock;
/// <summary>
/// Re-apply the state if the timer has elapsed.
/// </summary>
private GatewayBoundUserInterfaceState? _lastState;
/// <summary>
/// Are we currently waiting on an unlock timer.
/// </summary>
private bool _isUnlockPending = true;
/// <summary>
/// Are we currently waiting on a cooldown timer.
/// </summary>
private bool _isCooldownPending = true;
public GatewayWindow(NetEntity netEntity)
{
RobustXamlLoader.Load(this);
var dependencies = IoCManager.Instance!;
_timing = dependencies.Resolve<IGameTiming>();
Owner = netEntity;
NextUnlockBar.ForegroundStyleBoxOverride = new StyleBoxFlat(Color.FromHex("#C74EBD"));
}
public void UpdateState(GatewayBoundUserInterfaceState state)
{
_destinations = state.Destinations;
_current = state.Current;
_nextClose = state.NextClose;
_lastOpen = state.LastOpen;
_nextReady = state.NextReady;
_cooldown = state.Cooldown;
_unlockTime = state.UnlockTime;
_nextUnlock = state.NextUnlock;
_isUnlockPending = _nextUnlock >= _timing.CurTime;
_isCooldownPending = _nextReady >= _timing.CurTime;
Container.DisposeAllChildren();
_readyLabels = new List<Label>(_destinations.Count);
_openButtons = new List<Button>(_destinations.Count);
if (_destinations.Count == 0)
{
@@ -63,38 +89,63 @@ public sealed partial class GatewayWindow : FancyWindow,
}
var now = _timing.CurTime;
foreach (var dest in _destinations)
{
var ent = dest.Item1;
var name = dest.Item2;
var nextReady = dest.Item3;
var busy = dest.Item4;
var ent = dest.Entity;
var name = dest.Name;
var locked = dest.Locked && _nextUnlock > _timing.CurTime;
var box = new BoxContainer()
{
Orientation = BoxContainer.LayoutOrientation.Horizontal,
Margin = new Thickness(5f, 5f)
Margin = new Thickness(5f, 5f),
};
box.AddChild(new Label()
// HOW DO I ALIGN THESE GOODER
var nameLabel = new RichTextLabel()
{
Text = name
VerticalAlignment = VAlignment.Center,
SetWidth = 156f,
};
nameLabel.SetMessage(name);
box.AddChild(nameLabel);
// Buffer
box.AddChild(new Control()
{
HorizontalExpand = true,
});
var readyLabel = new Label
bool Pressable() => ent == _current || ent == Owner;
var buttonStripe = new StripeBack()
{
Text = ReadyText(now, nextReady, busy),
Margin = new Thickness(10f, 0f, 0f, 0f)
Visible = locked,
HorizontalExpand = true,
VerticalExpand = true,
Margin = new Thickness(10f, 0f, 0f, 0f),
Children =
{
new Label()
{
Text = Loc.GetString("gateway-window-locked"),
HorizontalAlignment = HAlignment.Center,
VerticalAlignment = VAlignment.Center,
}
}
};
_readyLabels.Add(readyLabel);
box.AddChild(readyLabel);
var openButton = new Button()
{
Text = Loc.GetString("gateway-window-open-portal"),
Pressed = ent == _current,
Pressed = Pressable(),
ToggleMode = true,
Disabled = _current != null || busy || now < nextReady
Disabled = now < _nextReady || Pressable(),
HorizontalAlignment = HAlignment.Right,
Margin = new Thickness(10f, 0f, 0f, 0f),
Visible = !locked,
SetHeight = 32f,
};
openButton.OnPressed += args =>
@@ -102,21 +153,22 @@ public sealed partial class GatewayWindow : FancyWindow,
OpenPortal?.Invoke(ent);
};
if (ent == _current)
if (Pressable())
{
openButton.AddStyleClass(StyleBase.ButtonCaution);
}
_openButtons.Add(openButton);
box.AddChild(new BoxContainer()
var buttonContainer = new BoxContainer()
{
HorizontalExpand = true,
Align = BoxContainer.AlignMode.End,
Children =
{
openButton
}
});
buttonStripe,
openButton,
},
SetSize = new Vector2(128f, 40f),
};
box.AddChild(buttonContainer);
Container.AddChild(new PanelContainer()
{
@@ -128,6 +180,8 @@ public sealed partial class GatewayWindow : FancyWindow,
}
});
}
_lastState = state;
}
protected override void FrameUpdate(FrameEventArgs args)
@@ -135,50 +189,66 @@ public sealed partial class GatewayWindow : FancyWindow,
base.FrameUpdate(args);
var now = _timing.CurTime;
var dirtyState = false;
// if its not going to close then show it as empty
if (_current == null)
if (_nextUnlock == TimeSpan.Zero)
{
NextCloseBar.Value = 0f;
NextUnlockBar.Value = 1f;
NextUnlockText.Text = "00:00";
}
else
{
var remaining = _nextUnlock - now;
if (remaining < TimeSpan.Zero)
{
if (_isUnlockPending)
{
dirtyState = true;
_isUnlockPending = false;
}
NextUnlockBar.Value = 1f;
NextUnlockText.Text = "00:00";
}
else
{
NextUnlockBar.Value = 1f - (float) (remaining.TotalSeconds / _unlockTime.TotalSeconds);
NextUnlockText.Text = $"{remaining.Minutes:00}:{remaining.Seconds:00}";
}
}
// if its not going to close then show it as empty
if (_current == null || _cooldown == TimeSpan.Zero)
{
NextReadyBar.Value = 1f;
NextCloseText.Text = "00:00";
}
else
{
var remaining = _nextClose - _timing.CurTime;
var remaining = _nextReady - now;
if (remaining < TimeSpan.Zero)
{
NextCloseBar.Value = 1f;
if (_isCooldownPending)
{
dirtyState = true;
_isCooldownPending = false;
}
NextReadyBar.Value = 1f;
NextCloseText.Text = "00:00";
}
else
{
var openTime = _nextClose - _lastOpen;
NextCloseBar.Value = 1f - (float) (remaining / openTime);
NextReadyBar.Value = 1f - (float) (remaining.TotalSeconds / _cooldown.TotalSeconds);
NextCloseText.Text = $"{remaining.Minutes:00}:{remaining.Seconds:00}";
}
}
for (var i = 0; i < _destinations.Count; i++)
if (dirtyState && _lastState != null)
{
var dest = _destinations[i];
var nextReady = dest.Item3;
var busy = dest.Item4;
_readyLabels[i].Text = ReadyText(now, nextReady, busy);
_openButtons[i].Disabled = _current != null || busy || now < nextReady;
// Refresh UI buttons.
UpdateState(_lastState);
}
}
private string ReadyText(TimeSpan now, TimeSpan nextReady, bool busy)
{
if (busy)
return Loc.GetString("gateway-window-already-active");
if (now < nextReady)
{
var time = nextReady - now;
return Loc.GetString("gateway-window-ready-in", ("time", $"{time.Minutes:00}:{time.Seconds:00}"));
}
return Loc.GetString("gateway-window-ready");
}
}