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

Alerts System and UI (#2529)

Browse Source 
* #272 add bordered panel for effects bar

* #272 avoid mouse overlapping tooltip when near edges,
change tooltip colors to match mockups

* #272 WIP defining status effect states as YML and
sending them as encoded integers

* #272 refactor to use new alert system

* #272 refactor to use new alert system

* #272 fix various bugs with new alert system and update
alerts to have color

* #272 WIP

* #272 rename status effects to alerts

* #272 WIP reworking alert internals to avoid code dup
and eliminate enum

* #272 refactor alerts to use
categories and fix various bugs

* #272 more alert bugfixes

* #272 alert ordering

* #272 callback-based approach for alert clicks

* #272 add debug commands for alerts

* #272 utilize new GridContainer capabilities for sizing of alerts tab

* #272 scale alerts height based on
window size

* #272 fix tooltip flicker

* #272 transparent alert panel

* #272 adjust styles to match injazz mockups more, add cooldown info in tooltip

* #272 adjust styles to match injazz mockups more, add cooldown info in tooltip

* #272 alert prototype tests

* #272 alert manager tests

* #272 alert order tests

* #272 simple unit test for alerts component

* #272 integration test for alerts

* #272 rework alerts to use enums instead
of id / category

* #272 various cleanups for PR

* #272 use byte for more compact alert messages

* #272 rename StatusEffects folder to Alerts,
add missing NetSerializable
This commit is contained in:
chairbender
2020-11-09 20:22:19 -08:00
committed by GitHub
parent c82199610d
commit 5f788c3318
86 changed files with 2305 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Content.Server/GameObjects/EntitySystems/WeightlessSystem.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using Content.Server.GameObjects.Components.Mobs;
using Content.Shared.Alert;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.EntitySystemMessages.Gravity;
using Content.Shared.GameTicking;
@@ -19,7 +20,7 @@ namespace Content.Server.GameObjects.EntitySystems
{
[Dependency] private readonly IMapManager _mapManager = default!;
private readonly Dictionary<GridId, List<ServerStatusEffectsComponent>> _statuses = new Dictionary<GridId, List<ServerStatusEffectsComponent>>();
private readonly Dictionary<GridId, List<ServerAlertsComponent>> _alerts = new Dictionary<GridId, List<ServerAlertsComponent>>();
public override void Initialize()
{
@@ -31,15 +32,15 @@ namespace Content.Server.GameObjects.EntitySystems
public void Reset()
{
_statuses.Clear();
_alerts.Clear();
}
public void AddStatus(ServerStatusEffectsComponent status)
public void AddAlert(ServerAlertsComponent status)
{
var gridId = status.Owner.Transform.GridID;
var statuses = _statuses.GetOrNew(gridId);
var alerts = _alerts.GetOrNew(gridId);
statuses.Add(status);
alerts.Add(status);
if (_mapManager.TryGetGrid(status.Owner.Transform.GridID, out var grid))
{
@@ -54,10 +55,10 @@ namespace Content.Server.GameObjects.EntitySystems
}
}
public void RemoveStatus(ServerStatusEffectsComponent status)
public void RemoveAlert(ServerAlertsComponent status)
{
var grid = status.Owner.Transform.GridID;
if (!_statuses.TryGetValue(grid, out var statuses))
if (!_alerts.TryGetValue(grid, out var statuses))
{
return;
}
@@ -67,7 +68,7 @@ namespace Content.Server.GameObjects.EntitySystems
private void GravityChanged(GravityChangedMessage ev)
{
if (!_statuses.TryGetValue(ev.Grid.Index, out var statuses))
if (!_alerts.TryGetValue(ev.Grid.Index, out var statuses))
{
return;
}
@@ -88,19 +89,19 @@ namespace Content.Server.GameObjects.EntitySystems
}
}
private void AddWeightless(ServerStatusEffectsComponent status)
private void AddWeightless(ServerAlertsComponent status)
{
status.ChangeStatusEffect(StatusEffect.Weightless, "/Textures/Interface/StatusEffects/Weightless/weightless.png", null);
status.ShowAlert(AlertType.Weightless);
}
private void RemoveWeightless(ServerStatusEffectsComponent status)
private void RemoveWeightless(ServerAlertsComponent status)
{
status.RemoveStatusEffect(StatusEffect.Weightless);
status.ClearAlert(AlertType.Weightless);
}
private void EntParentChanged(EntParentChangedMessage ev)
{
if (!ev.Entity.TryGetComponent(out ServerStatusEffectsComponent status))
if (!ev.Entity.TryGetComponent(out ServerAlertsComponent status))
{
return;
}
@@ -110,14 +111,14 @@ namespace Content.Server.GameObjects.EntitySystems
{
var oldGrid = mapGrid.GridIndex;
if (_statuses.TryGetValue(oldGrid, out var oldStatuses))
if (_alerts.TryGetValue(oldGrid, out var oldStatuses))
{
oldStatuses.Remove(status);
}
}
var newGrid = ev.Entity.Transform.GridID;
var newStatuses = _statuses.GetOrNew(newGrid);
var newStatuses = _alerts.GetOrNew(newGrid);
newStatuses.Add(status);
}