Add overlays for eye equipment #17859

PrPleGoo · 2023-07-06T18:39:56Z

About the PR

Add overlays for eye equipment

Media

I have added screenshots/videos to this PR showcasing its changes ingame

Changelog
🆑

add: added an overlay for the diagnostic hud that displays relative health for inorganics
add: added an overlay for the medical hud that displays relative health for biologicals

…15308)" (space-wizards#155… (space-wizards#15566)

…st (space-wizards#1662)

github-actions · 2023-07-06T18:40:45Z

RSI Diff Bot; head commit 1ed5397 merging into 805a7c7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Interface/Misc/health_bar.rsi

State	Old	New	Status
icon			Removed

Resources/Textures/Interface/Misc/health_icons.rsi

State	Old	New	Status
Fine			Added

Edit: diff updated after 1ed5397

lzk228 · 2023-07-06T18:48:40Z

that icon looking bad, and what differences between #17807 ?

Aisu9 · 2023-07-06T18:50:32Z

it's even harder to read the current health status than on the other PR

PrPleGoo · 2023-07-06T18:56:22Z

that icon looking bad

it's even harder to read the current health status than on the other PR

Thanks, I hate it too

what differences between #17807 ?

That one allows you to do this:

EmoGarbage404 · 2023-07-06T18:58:22Z

for the icon, have you considered just doing a super minimalist bar? not really having a large border around it at all? it might look a lot cleaner.

lzk228 · 2023-07-06T19:00:00Z

icon should be previous, but health line maybe bolder

PrPleGoo · 2023-07-06T19:06:34Z

for the icon, have you considered just doing a super minimalist bar? not really having a large border around it at all? it might look a lot cleaner.

Nah I'm not going to step into the domain of aesthetics.

icon should be previous, but health line maybe bolder

What do you mean "bolder"?

PrPleGoo · 2023-07-06T19:10:27Z

PrPleGoo · 2023-07-06T19:11:53Z

icon should be previous, but health line maybe bolder

This?

lzk228 · 2023-07-06T19:16:33Z

yeah

PrPleGoo · 2023-07-06T19:18:51Z

yeah

I thought 3 px was a little much so I did 2 px. Removed the center px from the icon to make it fit.

PrPleGoo · 2023-07-06T19:19:14Z

(update gif in PR desc)

github-actions · 2023-09-23T13:18:30Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

metalgearsloth · 2023-09-28T11:36:09Z

Content.Client/Commands/ToggleHealthBarsCommand.cs

+    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var player = _playerManager.LocalPlayer;
+        if (player == null)
+        {
+            shell.WriteLine("You aren't a player.");
+            return;
+        }
+
+        var playerEntity = player?.ControlledEntity;
+        if (playerEntity == null)
+        {
+            shell.WriteLine("You do not have an attached entity.");
+            return;
+        }
+
+        if (!_entityManager.HasComponent<ShowHealthBarsComponent>(playerEntity))
+        {
+            using var showHealthBarsComponent = _entityManager.AddComponentUninitialized<ShowHealthBarsComponent>(playerEntity.Value);
+            showHealthBarsComponent.Comp.DamageContainers = args.ToList();
+
+            shell.WriteLine($"Enabled health overlay for DamageContainers: {string.Join(", ", args)}.");
+            return;
+        }
+        else
+        {
+            _entityManager.RemoveComponentDeferred<ShowHealthBarsComponent>(playerEntity.Value);
+            shell.WriteLine("Disabled health overlay.");
+        }
+
+        return;
+    }
+}


Needs localisation please.

Nah, none of the other commands localize their shell output.

Okay well if you don't want to apply our code conventions to new code the pr can't be merged bud.

metalgearsloth · 2023-09-28T13:55:31Z

Content.Client/Commands/ToggleHealthBarsCommand.cs

+            using var showHealthBarsComponent = _entityManager.AddComponentUninitialized<ShowHealthBarsComponent>(playerEntity.Value);
+            showHealthBarsComponent.Comp.DamageContainers = args.ToList();
+
+            shell.WriteLine($"Enabled health overlay for DamageContainers: {string.Join(", ", args)}.");
+            return;


Please don't use the comp handles as they rely on directly calling component methods upon disposal and will be obsolete at some point.

Okay but they're not now. Do you have an alternative?

Use either a system or the other method for an uninitialized entity, or construct directly and add it.

Content.Client/Overlays/ShowHealthBarsSystem.cs

Content.Client/Overlays/ShowHealthIconsSystem.cs

Content.Shared/Inventory/Events/RefreshEquipmentHudEvent.cs

Content.Shared/Overlays/ShowHealthBarsComponent.cs

github-actions · 2023-10-19T19:36:50Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

CatMagic1 · 2023-10-30T14:32:39Z

Why is a health bar the only option? (I mean in terms of tweaking how the hud works). Why should someone else be able to glance at you and tell what your health is in greater detail than you can? It would work much better if the health was just displayed as a job icon-like visual that shows green, yellow, or red depending on your damage (maybe some kind of inner symbol for the icon so it isn't just a colored square). Health analyzers are for in-depth checkups and the hud should just be for quickly identifying people in need (more like the onion glasses and beer goggles).

Rane and others added 9 commits July 6, 2023 19:08

PR 1

83d307b

fix an error with health bar overlay (space-wizards#1292)

c03eb50

Revert "Revert "Replace ResourcePath with ResPath (space-wizards#…

809ebec

…15308)" (space-wizards#155… (space-wizards#15566)

[1612] change ShowHealthBarsComponent's DamageContainer field to a li…

cedc756

…st (space-wizards#1662)

fix build

f2509d4

no crit entities from not updating

313b7e2

cleanup

d759de5

namespace

e013b4c

undu irrelevant changes

a513bfb

PrPleGoo requested a review from PaulRitter as a code owner July 6, 2023 18:39

undo icon change

c9a0010

github-actions bot removed the Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. label Jul 6, 2023

make health bar 1 px taller and icon 1 px shorter

bab8d16

github-actions bot added the Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. label Jul 6, 2023

fix medibot

a6a1236

PrPleGoo requested a review from deltanedas September 5, 2023 18:54

github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. and removed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. labels Sep 5, 2023

Merge branch 'master' into task/upstream_healthbars

e050177

github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 5, 2023

PrPleGoo added 3 commits September 6, 2023 13:43

just use args

70cf595

Merge branch 'master' into task/upstream_healthbars

e8ff66c

Merge branch 'master' into task/upstream_healthbars

eb3f8de

github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 23, 2023

Merge branch 'master' into task/upstream_healthbars

87eff73

github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 27, 2023

metalgearsloth requested changes Sep 28, 2023

View reviewed changes

metalgearsloth added Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. and removed Status: Needs Review This PR requires new reviews before it can be merged. labels Sep 28, 2023

PrPleGoo added 2 commits October 1, 2023 17:31

rename method and append in method

68e1993

type

1ed5397

PrPleGoo requested a review from metalgearsloth October 4, 2023 10:48

github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. and removed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. labels Oct 4, 2023

github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Oct 19, 2023

metalgearsloth closed this Nov 12, 2023

metalgearsloth added Status: Derelict This PR appears to be abandoned but might contain something that can be salvaged. and removed Status: Stale This PR has been abandoned and will be closed within a week. labels Nov 12, 2023

metalgearsloth mentioned this pull request Dec 24, 2023

Add health bar overlays for eye equipment #22911

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add overlays for eye equipment #17859

Add overlays for eye equipment #17859

PrPleGoo commented Jul 6, 2023 •

edited

Loading

github-actions bot commented Jul 6, 2023 •

edited

Loading

lzk228 commented Jul 6, 2023

Aisu9 commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

EmoGarbage404 commented Jul 6, 2023

lzk228 commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

lzk228 commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

github-actions bot commented Sep 23, 2023

metalgearsloth Sep 28, 2023

PrPleGoo Oct 1, 2023

metalgearsloth Oct 25, 2023

metalgearsloth Sep 28, 2023

PrPleGoo Oct 1, 2023

metalgearsloth Oct 4, 2023 •

edited

Loading

github-actions bot commented Oct 19, 2023

CatMagic1 commented Oct 30, 2023

Add overlays for eye equipment #17859

Add overlays for eye equipment #17859

Conversation

PrPleGoo commented Jul 6, 2023 • edited Loading

About the PR

github-actions bot commented Jul 6, 2023 • edited Loading

lzk228 commented Jul 6, 2023

Aisu9 commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

EmoGarbage404 commented Jul 6, 2023

lzk228 commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

lzk228 commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

PrPleGoo commented Jul 6, 2023

github-actions bot commented Sep 23, 2023

metalgearsloth Sep 28, 2023

Choose a reason for hiding this comment

PrPleGoo Oct 1, 2023

Choose a reason for hiding this comment

metalgearsloth Oct 25, 2023

Choose a reason for hiding this comment

metalgearsloth Sep 28, 2023

Choose a reason for hiding this comment

PrPleGoo Oct 1, 2023

Choose a reason for hiding this comment

metalgearsloth Oct 4, 2023 • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Oct 19, 2023

CatMagic1 commented Oct 30, 2023

PrPleGoo commented Jul 6, 2023 •

edited

Loading

github-actions bot commented Jul 6, 2023 •

edited

Loading

metalgearsloth Oct 4, 2023 •

edited

Loading