Skip to content

Minor HUD change: Shields blink when low #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shrizza wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Minor HUD change: Shields blink when low #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/game/CHUD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,10 @@ void CHUD::Render(NVGcontext *ctx) {
ColorManager::getEnergyGaugeColor().IntoNVG(),
ColorManager::getPlasmaGauge1Color().IntoNVG(),
ColorManager::getPlasmaGauge2Color().IntoNVG(),
ColorManager::getShieldGaugeColor().IntoNVG()
(int)shields >= (int)full/1.5 || itsGame->frameNumber == 0 || (int)shields == 0 ? ColorManager::getShieldGaugeColor().IntoNVG() :
itsGame->frameNumber % (int)shields == 0 ? ColorManager::getShieldZapColor().IntoNVG() :
itsGame->frameNumber % (int)shields == 1 ? ColorManager::getShieldDamageColor().IntoNVG() :
ColorManager::getShieldGaugeColor().IntoNVG()
};
NVGcolor g2c[] = {
ColorManager::getPinwheel1Color().IntoNVG(),
Expand Down
2 changes: 2 additions & 0 deletions src/gui/ColorManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ ARGBColor ColorManager::plasmaGauge2Color = 0xffff4e00;
ARGBColor ColorManager::plasmaSightsOffColor = 0xff008e00;
ARGBColor ColorManager::plasmaSightsOnColor = 0xffff2600;
ARGBColor ColorManager::shieldGaugeColor = 0xff0053b4;
ARGBColor ColorManager::shieldDamageColor = 0xffff0000;
ARGBColor ColorManager::shieldZapColor = 0xffffffff;
ARGBColor ColorManager::hudColor = 0xff03f5f5;
ARGBColor ColorManager::hudPositiveColor = 0xff51e87e;
ARGBColor ColorManager::hudWarningColor = 0xffedd62d;
Expand Down
10 changes: 10 additions & 0 deletions src/gui/ColorManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@ class ColorManager {
return shieldGaugeColor;
}

static inline ARGBColor getShieldDamageColor() {
return shieldDamageColor;
}

static inline ARGBColor getShieldZapColor() {
return shieldZapColor;
}

static inline ARGBColor getHUDColor() {
return hudColor;
}
Expand Down Expand Up @@ -226,6 +234,8 @@ class ColorManager {
static ARGBColor plasmaSightsOffColor;
static ARGBColor plasmaSightsOnColor;
static ARGBColor shieldGaugeColor;
static ARGBColor shieldDamageColor;
static ARGBColor shieldZapColor;
static ARGBColor teamColors[kMaxTeamColors + 1];
static ARGBColor teamTextColors[kMaxTeamColors + 1];
static std::string teamColorNames[kMaxTeamColors + 1];
Expand Down